diff --git a/flake.nix b/flake.nix index df59f87..3121d6b 100644 --- a/flake.nix +++ b/flake.nix @@ -92,17 +92,18 @@ ]; }; #Thinkpad E15 Gen 3 Laptop (ThinkPad) - Type 20YG - Model 20YG003EUS - raziel = nixpkgs.lib.nixosSystem { + ariel = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; - hostname = "raziel"; + hostname = "ariel"; }; modules = [ ./nixos/configuration.nix ./nixos/kde-desktop.nix - ./nixos/cad.nix ./nixos/zerotier.nix ./nixos/work.nix + ./nixos/cad.nix + ./nixos/gaming.nix ]; }; hearth = nixpkgs.lib.nixosSystem { diff --git a/nixos/family.nix b/nixos/family.nix index f9988ea..5a6e642 100644 --- a/nixos/family.nix +++ b/nixos/family.nix @@ -10,6 +10,10 @@ isNormalUser = true; extraGroups = [ "networkManager" ]; }; + ingrid = { + isNormalUser = true; + extraGroups = [ "networkManager" ]; + }; bill = { isNormalUser = true; extraGroups = [ "networkManager" ]; diff --git a/nixos/hardware/ariel.nix b/nixos/hardware/ariel.nix new file mode 100644 index 0000000..19ba15e --- /dev/null +++ b/nixos/hardware/ariel.nix @@ -0,0 +1,40 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/fe5ec606-9052-463e-b402-e37dd206b87f"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/C746-7DF9"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/654049ca-318f-453d-ad70-9d2a35d42a6d"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}