From 253b05b45e1d0eb3573347578f1a7571e4f3bac2 Mon Sep 17 00:00:00 2001
From: Geir Okkenhaug Jerstad <geokkjer@gmail.com>
Date: Thu, 12 Jun 2025 21:17:44 +0200
Subject: [PATCH 1/3] Renamed hardware and disk configuration files for
 congenital-optimist

---
 flake.nix                                     | 20 ++++++++++---------
 .../congenital-optimist/configuration.nix     |  3 ++-
 ...ware-configuration.nix => disk-ram-co.nix} |  0
 .../congenital-optimist/hardware-co.nix       |  8 ++------
 4 files changed, 15 insertions(+), 16 deletions(-)
 rename machines/congenital-optimist/{hardware-configuration.nix => disk-ram-co.nix} (100%)
 rename modules/hardware/amd-workstation.nix => machines/congenital-optimist/hardware-co.nix (74%)

diff --git a/flake.nix b/flake.nix
index e7b223f..c99af01 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,10 +6,14 @@
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, ... }@inputs: 
-  let
+  outputs = {
+    self,
+    nixpkgs,
+    nixpkgs-unstable,
+    ...
+  } @ inputs: let
     system = "x86_64-linux";
-    
+
     # Create unstable package set
     unstable = import nixpkgs-unstable {
       inherit system;
@@ -20,17 +24,15 @@
     specialArgs = {
       inherit inputs unstable;
     };
-
   in {
     # NixOS system configurations
     nixosConfigurations = {
-      
       # congenital-optimist - AMD Threadripper workstation
       congenital-optimist = nixpkgs.lib.nixosSystem {
         inherit system specialArgs;
         modules = [
           ./machines/congenital-optimist/configuration.nix
-          ./machines/congenital-optimist/hardware-configuration.nix
+          ./machines/congenital-optimist/hardware-co.nix
           ./modules/common/nix.nix
           ./modules/common/base.nix
           ./modules/common/tty.nix
@@ -75,8 +77,8 @@
     };
 
     # Custom packages for the home lab
-    packages.${system} = import ./packages { 
-      pkgs = nixpkgs.legacyPackages.${system}; 
+    packages.${system} = import ./packages {
+      pkgs = nixpkgs.legacyPackages.${system};
     };
 
     # Development shells for different projects
@@ -147,4 +149,4 @@
     # Formatter for Nix files
     formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra;
   };
-}
\ No newline at end of file
+}
diff --git a/machines/congenital-optimist/configuration.nix b/machines/congenital-optimist/configuration.nix
index 68e280b..e4624ff 100644
--- a/machines/congenital-optimist/configuration.nix
+++ b/machines/congenital-optimist/configuration.nix
@@ -6,7 +6,8 @@
   ...
 }: {
   imports = [
-    ./hardware-configuration.nix
+    ./hardware-co.nix
+    ./disk-ram-co.nix
     ./network-congenital-optimist.nix
 
     # Security modules
diff --git a/machines/congenital-optimist/hardware-configuration.nix b/machines/congenital-optimist/disk-ram-co.nix
similarity index 100%
rename from machines/congenital-optimist/hardware-configuration.nix
rename to machines/congenital-optimist/disk-ram-co.nix
diff --git a/modules/hardware/amd-workstation.nix b/machines/congenital-optimist/hardware-co.nix
similarity index 74%
rename from modules/hardware/amd-workstation.nix
rename to machines/congenital-optimist/hardware-co.nix
index 6b5d5ae..5a47f70 100644
--- a/modules/hardware/amd-workstation.nix
+++ b/machines/congenital-optimist/hardware-co.nix
@@ -16,12 +16,8 @@
     powerOnBoot = true;
   };
 
-  # ZRAM swap configuration
-  zramSwap = {
-    enable = true;
-    algorithm = "zstd";
-  };
-
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   # Audio system (PipeWire)
   services.pipewire = {
     enable = true;

From fc26b3f7f2ecea8083e885fa213f386173e1f28f Mon Sep 17 00:00:00 2001
From: Geir Okkenhaug Jerstad <geokkjer@gmail.com>
Date: Thu, 12 Jun 2025 21:18:20 +0200
Subject: [PATCH 2/3] Fix lib import in hardware-co.nix

---
 machines/congenital-optimist/hardware-co.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/machines/congenital-optimist/hardware-co.nix b/machines/congenital-optimist/hardware-co.nix
index 5a47f70..3928085 100644
--- a/machines/congenital-optimist/hardware-co.nix
+++ b/machines/congenital-optimist/hardware-co.nix
@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: {
   # AMD GPU configuration

From 07903ac9e32ab81e3ab79f2a6fcda2fc89a9aec3 Mon Sep 17 00:00:00 2001
From: Geir Okkenhaug Jerstad <geokkjer@gmail.com>
Date: Thu, 12 Jun 2025 21:18:55 +0200
Subject: [PATCH 3/3] Remove duplicate hardware module import

---
 machines/congenital-optimist/configuration.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/machines/congenital-optimist/configuration.nix b/machines/congenital-optimist/configuration.nix
index e4624ff..3443521 100644
--- a/machines/congenital-optimist/configuration.nix
+++ b/machines/congenital-optimist/configuration.nix
@@ -19,9 +19,6 @@
     # Services
     ../../modules/services/nfs-client.nix
 
-    # Hardware modules
-    ../../modules/hardware/amd-workstation.nix
-
     # Desktop environments
     ../../modules/desktop/common.nix
     ../../modules/desktop/gnome.nix