From bb009258411a2894555e4551a9ae151402d2c27e Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Thu, 23 May 2024 18:30:43 +0200 Subject: refactor(hosts/tiamat): Adapt to the new modules for system --- hosts/tiamat/default.nix | 51 ++++++++++++++++++++++++------ hosts/tiamat/hardware.nix | 65 +++++++++++++++++++++++++++++++++++++++ hosts/tiamat/hardware/cpu.nix | 3 -- hosts/tiamat/hardware/default.nix | 35 --------------------- hosts/tiamat/hardware/gpu.nix | 20 ------------ hosts/tiamat/networking.nix | 3 -- 6 files changed, 106 insertions(+), 71 deletions(-) create mode 100644 hosts/tiamat/hardware.nix delete mode 100644 hosts/tiamat/hardware/cpu.nix delete mode 100644 hosts/tiamat/hardware/default.nix delete mode 100644 hosts/tiamat/hardware/gpu.nix delete mode 100644 hosts/tiamat/networking.nix (limited to 'hosts') diff --git a/hosts/tiamat/default.nix b/hosts/tiamat/default.nix index c14fa325..4b5cb992 100644 --- a/hosts/tiamat/default.nix +++ b/hosts/tiamat/default.nix @@ -1,12 +1,45 @@ -{...}: { +{ + config, + lib, + pkgs, + ... +}: { imports = [ - ./hardware - ./networking.nix - - ../../sys + ./hardware.nix ]; soispha = { + boot.enable = true; + cleanup.enable = true; + documentation.enable = true; + fonts = { + enable = true; + enableEmoji = true; + }; + home-manager.enable = true; + impermanence.enable = true; + + networking = { + enable = true; + hostName = "tiamat"; + }; + + polkit.enable = true; + power.enable = true; + secrets.enable = true; + sound.enable = true; + tempfiles.enable = true; + users = { + enable = true; + enableDeprecatedPlugdev = true; + hashedPassword = "$y$jFT$qi3wS9njrMl2y55b3NOBI0$j40Qt6AAkMSfZ82KPhqMaUaPztWtPps1wOqaXaF/L.6"; + }; + version.enable = true; + nixpkgs = { + enable = true; + systemName = "x86_64-linux"; + }; + adb = { enable = true; user = "soispha"; @@ -18,14 +51,12 @@ enable = true; keyMap = "us"; }; - fs.backup = { - enable = true; + backup = { + enable = false; backupDiskUuid = "d1c6e0f6-1837-40fd-bb29-251d5ea0ddb0"; }; - users = { - hashedPassword = "$y$jFT$qi3wS9njrMl2y55b3NOBI0$j40Qt6AAkMSfZ82KPhqMaUaPztWtPps1wOqaXaF/L.6"; - }; }; + networking.hostName = "tiamat"; system.stateVersion = "23.05"; } diff --git a/hosts/tiamat/hardware.nix b/hosts/tiamat/hardware.nix new file mode 100644 index 00000000..d8e62af0 --- /dev/null +++ b/hosts/tiamat/hardware.nix @@ -0,0 +1,65 @@ +{ + modulesPath, + pkgs, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") # TODO: is this necessary? + ]; + + 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"; + + opengl = { + enable = true; + extraPackages = with pkgs; [ + vaapiVdpau + libvdpau-va-gl + + amdvlk # or directly through mesa + ]; + }; + + cpu.amd.updateMicrocode = true; # Why not? + bluetooth = { + enable = true; + powerOnBoot = true; + }; + }; + + soispha = { + hardware = { + enable = true; + moonlander = { + enableFlashing = true; + }; + }; + disks = { + enable = true; + disk = "/dev/disk/by-id/nvme-CT1000P5SSD8_21032C857568"; + ssd = true; + swap = { + uuid = "057b5041-6fee-4739-84a9-ade8f0f51519"; + resumeOffset = "533760"; + }; + }; + }; + + boot = { + kernelModules = ["kvm-amd"]; + + kernelParams = [ + # Avoid loosing the Bluetooth controller to a sleep, from which it never wakes again + "btusb.enable_autosuspend=n" + ]; + + initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; + }; +} diff --git a/hosts/tiamat/hardware/cpu.nix b/hosts/tiamat/hardware/cpu.nix deleted file mode 100644 index 70eaff6f..00000000 --- a/hosts/tiamat/hardware/cpu.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - hardware.cpu.amd.updateMicrocode = true; # Why not? -} diff --git a/hosts/tiamat/hardware/default.nix b/hosts/tiamat/hardware/default.nix deleted file mode 100644 index 47275cc4..00000000 --- a/hosts/tiamat/hardware/default.nix +++ /dev/null @@ -1,35 +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; - powerOnBoot = true; - }; - - soispha.disks = { - enable = true; - disk = "/dev/disk/by-id/nvme-CT1000P5SSD8_21032C857568"; - ssd = true; - swap = { - uuid = "057b5041-6fee-4739-84a9-ade8f0f51519"; - resumeOffset = "533760"; - }; - }; - - boot = { - kernelModules = ["kvm-amd"]; - - kernelParams = [ - # Avoid loosing the Bluetooth controller to a sleep, from which it never wakes again - "btusb.enable_autosuspend=n" - ]; - - initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; - }; -} diff --git a/hosts/tiamat/hardware/gpu.nix b/hosts/tiamat/hardware/gpu.nix deleted file mode 100644 index abb6c19f..00000000 --- a/hosts/tiamat/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/tiamat/networking.nix b/hosts/tiamat/networking.nix deleted file mode 100644 index 56771e90..00000000 --- a/hosts/tiamat/networking.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - networking.hostName = "tiamat"; -} -- cgit 1.4.1