diff options
| -rw-r--r-- | hosts/apzu/default.nix | 48 | ||||
| -rw-r--r-- | hosts/apzu/hardware.nix | 51 | ||||
| -rw-r--r-- | hosts/apzu/hardware/cpu.nix | 3 | ||||
| -rw-r--r-- | hosts/apzu/hardware/default.nix | 31 | ||||
| -rw-r--r-- | hosts/apzu/hardware/gpu.nix | 20 | ||||
| -rw-r--r-- | hosts/apzu/networking.nix | 12 |
6 files changed, 91 insertions, 74 deletions
diff --git a/hosts/apzu/default.nix b/hosts/apzu/default.nix index b45987cf..5b3d23f8 100644 --- a/hosts/apzu/default.nix +++ b/hosts/apzu/default.nix @@ -1,27 +1,59 @@ {...}: { imports = [ - ./hardware - ./networking.nix - - ../../sys + ./hardware.nix ]; soispha = { - services.steam = { - enable = false; + boot.enable = true; + cleanup.enable = true; + documentation.enable = true; + fonts = { + enable = true; + enableEmoji = true; }; + home-manager.enable = true; + impermanence.enable = true; laptop = { enable = true; backlight = "intel_backlight"; }; locale.enable = true; - fs.backup = { + networking = { + enable = true; + mode = "NetworkManager"; + hostName = "apzu"; + }; + nixpkgs = { enable = true; - backupDiskUuid = "d1c6e0f6-1837-40fd-bb29-251d5ea0ddb0"; + systemName = "x86_64-linux"; + }; + polkit.enable = true; + power.enable = true; + secrets.enable = true; + services = { + adb = { + enable = true; + user = "soispha"; + }; + backup = { + enable = true; + backupDiskUuid = "d1c6e0f6-1837-40fd-bb29-251d5ea0ddb0"; + }; + fwupd.enable = true; + postgresql.enable = false; + printing.enable = true; + scanning.enable = true; + snapper.enable = true; + steam.enable = false; }; + sound.enable = true; + tempfiles.enable = true; users = { + enable = true; + enableDeprecatedPlugdev = true; hashedPassword = "$y$jFT$3qI9MYLDHPUdGKsVa8skV0$TOjX0SFHWuj52zd7/kmkNtG5EqQwYcqv0FKXWbLaro6"; }; + version.enable = true; }; system.stateVersion = "23.05"; diff --git a/hosts/apzu/hardware.nix b/hosts/apzu/hardware.nix new file mode 100644 index 00000000..29223e29 --- /dev/null +++ b/hosts/apzu/hardware.nix @@ -0,0 +1,51 @@ +{ + modulesPath, + pkgs, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") # TODO: is this necessary? + ]; + + soispha.disks = { + enable = true; + disk = "/dev/disk/by-id/nvme-INTEL_SSDPEKNU512GZH_PHKA1481032A512A_1"; + ssd = true; + swap = { + uuid = "c94cd20a-dd3c-436f-9841-6fe92e5c8719"; + resumeOffset = "533760"; + }; + }; + + boot = { + kernelModules = ["kvm-intel" "rtw89"]; + + initrd.availableKernelModules = ["xhci_pci" "vmd" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; + }; + + hardware = { + bluetooth = { + enable = true; + # Avoid some battery drain, requires a `power on` in bluetoothctl + powerOnBoot = false; + }; + + # opengl.extraPackages = with pkgs; [ + # rocm-opencl-icd # open-cl + # amdvlk # or directly through mesa + # amd-media-driver # libva + # ]; + # + # # Force radv, TODO: is this logical? + # environment.variables.AMD_VULKAN_ICD = "RADV"; + + cpu.intel.updateMicrocode = true; # Why not? + opengl = { + enable = true; + extraPackages = with pkgs; [ + vaapiVdpau + libvdpau-va-gl + ]; + }; + }; +} diff --git a/hosts/apzu/hardware/cpu.nix b/hosts/apzu/hardware/cpu.nix deleted file mode 100644 index 3bc6184f..00000000 --- a/hosts/apzu/hardware/cpu.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - hardware.cpu.intel.updateMicrocode = true; # Why not? -} diff --git a/hosts/apzu/hardware/default.nix b/hosts/apzu/hardware/default.nix deleted file mode 100644 index 2cbf3254..00000000 --- a/hosts/apzu/hardware/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{modulesPath, ...}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") # TODO: is this necessary? - ./cpu.nix - ./gpu.nix - ]; - - nixpkgs.hostPlatform = "x86_64-linux"; - - hardware.bluetooth = { - enable = true; - # Avoid some battery drain, requires a `power on` in bluetoothctl - powerOnBoot = false; - }; - - soispha.disks = { - enable = true; - disk = "/dev/disk/by-id/nvme-INTEL_SSDPEKNU512GZH_PHKA1481032A512A_1"; - ssd = true; - swap = { - uuid = "c94cd20a-dd3c-436f-9841-6fe92e5c8719"; - resumeOffset = "533760"; - }; - }; - - boot = { - kernelModules = ["kvm-intel" "rtw89"]; - - initrd.availableKernelModules = ["xhci_pci" "vmd" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; - }; -} diff --git a/hosts/apzu/hardware/gpu.nix b/hosts/apzu/hardware/gpu.nix deleted file mode 100644 index 74e146e2..00000000 --- a/hosts/apzu/hardware/gpu.nix +++ /dev/null @@ -1,20 +0,0 @@ -{pkgs, ...}: { - # hardware.opengl.extraPackages = with pkgs; [ - # rocm-opencl-icd # open-cl - # amdvlk # or directly through mesa - # amd-media-driver # libva - # ]; - # - # # Force radv, TODO: is this logical? - # environment.variables.AMD_VULKAN_ICD = "RADV"; - - hardware.opengl = { - enable = true; - extraPackages = with pkgs; [ - vaapiVdpau - libvdpau-va-gl - - #amdvlk # or directly through mesa - ]; - }; -} diff --git a/hosts/apzu/networking.nix b/hosts/apzu/networking.nix deleted file mode 100644 index 79d693f9..00000000 --- a/hosts/apzu/networking.nix +++ /dev/null @@ -1,12 +0,0 @@ -{...}: { - networking = { - networkmanager = { - enable = true; - dns = "default"; - wifi = { - powersave = true; - }; - }; - hostName = "apzu"; - }; -} |