From 0c5694c4c06e3fc973c1078b46cc69787c35f317 Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Fri, 12 Apr 2024 02:29:11 +1200
Subject: [PATCH] feat(ooksdesk): swap ooksdesk to new hardware

---
 home/user/ooks/ooksdesk/default.nix           |  4 +---
 system/hosts/ooksdesk/default.nix             |  7 ++++++-
 .../hosts/ooksdesk/hardware-configuration.nix | 21 +++++++++----------
 system/modules/default.nix                    | 11 +++++-----
 system/modules/hardware/gpu/amd/default.nix   |  2 +-
 system/profiles/base/default.nix              |  1 -
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/home/user/ooks/ooksdesk/default.nix b/home/user/ooks/ooksdesk/default.nix
index d5f2a34..ad567cd 100644
--- a/home/user/ooks/ooksdesk/default.nix
+++ b/home/user/ooks/ooksdesk/default.nix
@@ -7,7 +7,7 @@
 
   activeProfiles = ["base" "hyprland" "productivity" "gaming"];
 
-  theme = "minimal";
+  theme.minimal.enable = true;
 
   home.sessionVariables.HN = "ooksdesk";
 
@@ -21,7 +21,5 @@
     workspace = "1";
     primary = true;
   }];
-
-  colorscheme = inputs.nix-colors.colorSchemes.gruvbox-material-dark-soft;
 }
 
diff --git a/system/hosts/ooksdesk/default.nix b/system/hosts/ooksdesk/default.nix
index d2f9df6..9ff7e7a 100644
--- a/system/hosts/ooksdesk/default.nix
+++ b/system/hosts/ooksdesk/default.nix
@@ -6,12 +6,17 @@
     ../../profiles
 		];
 
-    activeProfiles = ["base" "nvidia" "mediaServer" "gaming"];
+    activeProfiles = ["base" "gaming"];
 
 		systemModules.user = {
 			ooks.enable = true;
 			shell.fish.enable = true;
 		};
+
+		systemModules.hardware = {
+			cpu.type = "amd";
+			gpu.type = "amd";
+		};
   	
 		networking = {
   		hostName = "ooksdesk"; 		
diff --git a/system/hosts/ooksdesk/hardware-configuration.nix b/system/hosts/ooksdesk/hardware-configuration.nix
index 4e79a8a..e62aba0 100644
--- a/system/hosts/ooksdesk/hardware-configuration.nix
+++ b/system/hosts/ooksdesk/hardware-configuration.nix
@@ -8,39 +8,39 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "uas" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/68e9e662-69af-47cd-85ad-c44025a6d214";
+    { device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
       fsType = "btrfs";
       options = [ "subvol=root" ];
     };
 
-  boot.initrd.luks.devices."cryptnix".device = "/dev/disk/by-uuid/18ed0a3c-8ae6-42c2-8ae5-f1b07a2649f5";
+  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/b5d09a8b-54a9-4f72-828c-5cceea2ec287";
 
   fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/68e9e662-69af-47cd-85ad-c44025a6d214";
+    { device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
       fsType = "btrfs";
       options = [ "subvol=nix" ];
     };
 
   fileSystems."/persist" =
-    { device = "/dev/disk/by-uuid/68e9e662-69af-47cd-85ad-c44025a6d214";
+    { device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
       fsType = "btrfs";
       options = [ "subvol=persist" ];
     };
 
   fileSystems."/swap" =
-    { device = "/dev/disk/by-uuid/68e9e662-69af-47cd-85ad-c44025a6d214";
+    { device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
       fsType = "btrfs";
       options = [ "subvol=swap" ];
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/6575-A86A";
+    { device = "/dev/disk/by-uuid/1D01-7040";
       fsType = "vfat";
     };
 
@@ -51,9 +51,8 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp8s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
-
diff --git a/system/modules/default.nix b/system/modules/default.nix
index b8a6c41..e05aadd 100644
--- a/system/modules/default.nix
+++ b/system/modules/default.nix
@@ -8,13 +8,12 @@
     ./programs
     ./user
     ./displayManager
-    ./networking.nix
-    ./locale.nix
-    ./virtualisation.nix
-    ./pipewire.nix
-    ./security.nix
+    ./networking
+    ./locale
+    ./virtualisation
+    ./security
     ./services
-    ./ssh.nix
+    ./audio
   ];
 
 
diff --git a/system/modules/hardware/gpu/amd/default.nix b/system/modules/hardware/gpu/amd/default.nix
index d0b1b57..e44a074 100644
--- a/system/modules/hardware/gpu/amd/default.nix
+++ b/system/modules/hardware/gpu/amd/default.nix
@@ -13,7 +13,7 @@ in
         vulkan-tools
         vulkan-loader
         vulkan-extension-layer
-        vulkan-validation-layer
+        vulkan-validation-layers
         amdvlk
         mesa
       ];
diff --git a/system/profiles/base/default.nix b/system/profiles/base/default.nix
index 4085f90..d332b25 100644
--- a/system/profiles/base/default.nix
+++ b/system/profiles/base/default.nix
@@ -30,7 +30,6 @@ in
       bootloader.systemd.enable = true;
       programs.gnomeServices.enable = true;
       displayManager.tuigreet.enable = true;
-      openssh.enable = true;
       hardware.ssd.enable = true;
       services.system76Scheduler.enable = true;
     };