diff --git a/configs/home-manager/common.nix b/configs/home-manager/common.nix
index f64a748..94d0450 100644
--- a/configs/home-manager/common.nix
+++ b/configs/home-manager/common.nix
@@ -12,7 +12,7 @@
 
   nixpkgs.overlays = lib.mkIf (config.targets.genericLinux.enable && (inputs ? nixpkgs-fork)) [
     (final: prev: {
-      fork = inputs.nixpkgs-fork.legacyPackages.${prev.system};
+      fork = inputs.nixpkgs-fork.legacyPackages.${prev.stdenv.hostPlatform.system};
     })
   ];
 
diff --git a/configs/home-manager/kicad.nix b/configs/home-manager/kicad.nix
new file mode 100644
index 0000000..a8aacb5
--- /dev/null
+++ b/configs/home-manager/kicad.nix
@@ -0,0 +1,12 @@
+{
+  inputs,
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+    home.packages = with pkgs; [
+      (kicad.override {compressStep=false;})
+      interactive-html-bom
+    ];
+}
diff --git a/configs/nixos/common.nix b/configs/nixos/common.nix
index 14bc1db..c2ab308 100644
--- a/configs/nixos/common.nix
+++ b/configs/nixos/common.nix
@@ -27,7 +27,7 @@ in {
 
   nixpkgs.overlays = lib.mkIf (inputs ? nixpkgs-fork) [
     (final: prev: {
-      fork = inputs.nixpkgs-fork.legacyPackages.${prev.system};
+      fork = inputs.nixpkgs-fork.legacyPackages.${prev.stdenv.hostPlatform.system};
     })
   ];
 
@@ -46,7 +46,7 @@ in {
 
   # packages that should be on every system.
   environment.systemPackages = with pkgs; [
-    inputs.nvim-config.packages.${pkgs.system}.nvim-minimal
+    inputs.nvim-config.packages.${pkgs.stdenv.hostPlatform.system}.nvim-minimal
     rsync
   ];
 
diff --git a/configs/nixos/kicad.nix b/configs/nixos/kicad.nix
deleted file mode 100644
index cf1a279..0000000
--- a/configs/nixos/kicad.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  inputs,
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  # nixpkgs.config = lib.mkIf (inputs ? nixpkgs-fork) {
-  #   kicad = {compressStep = false;};
-  # };
-  nixpkgs.overlays = [
-    (final: prev: {kicad = inputs.nixpkgs-fork.legacyPackages.${prev.system}.kicad.override {compressStep = false;};})
-  ];
-  home-manager.users.${config.host.details.user} = {config, ...}: {
-    home.packages = with pkgs; [
-      kicad
-      interactive-html-bom
-    ];
-  };
-}
diff --git a/flake.lock b/flake.lock
index 1ecbbcd..0eaece3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764566768,
-        "narHash": "sha256-nNBD9vP87t0Sfzdutg09E8zcJG/R2Vqm5qAibkAYqW4=",
+        "lastModified": 1766769718,
+        "narHash": "sha256-HUFMhHktTdcdXL31Bhhjm+35W32xhts7ki67zADYwmw=",
         "owner": "9001",
         "repo": "copyparty",
-        "rev": "a31bfe6b2b01de178d8dd17e65cc8d9689ce0cdd",
+        "rev": "4642d32366e30c131d933c8bd0a519b69f4d3fff",
         "type": "github"
       },
       "original": {
@@ -36,11 +36,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762286984,
-        "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=",
+        "lastModified": 1766051518,
+        "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f",
+        "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa",
         "type": "github"
       },
       "original": {
@@ -56,11 +56,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764350888,
-        "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=",
+        "lastModified": 1766150702,
+        "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26",
+        "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
         "type": "github"
       },
       "original": {
@@ -71,11 +71,11 @@
     },
     "flake-compat": {
       "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "lastModified": 1766661267,
+        "narHash": "sha256-QN1r/zNqvXHwWqlRAnRtFf4CQwIOJx58PtdExIzAw94=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "f275e157c50c3a9a682b4c9b4aa4db7a4cd3b5f2",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764544324,
-        "narHash": "sha256-GVBGjO7UsmzLrlOJV8NlKSxukHaHencrJqWkCA6FkqI=",
+        "lastModified": 1766850854,
+        "narHash": "sha256-asWZx7X5FRrna8ntfE0+vTBUIPLth8R8bckbOpfT3Us=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e4e25a8c310fa45f2a8339c7972dc43d2845a612",
+        "rev": "2d36a6de2fee5cd232b0a28137d95541c21eb7f0",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1764440730,
-        "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
+        "lastModified": 1766568855,
+        "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
+        "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80",
         "type": "github"
       },
       "original": {
@@ -180,11 +180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764591717,
-        "narHash": "sha256-T/HMA0Bb/O6UnlGQ0Xt+wGe1j8m7eyyQ5+vVcCJslsM=",
+        "lastModified": 1765841014,
+        "narHash": "sha256-55V0AJ36V5Egh4kMhWtDh117eE3GOjwq5LhwxDn9eHg=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "84d1dab290feb4865d0cfcffc7aa0cf9bc65c3b7",
+        "rev": "be4af8042e7a61fa12fda58fe9a3b3babdefe17b",
         "type": "github"
       },
       "original": {
@@ -196,11 +196,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764517877,
-        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
+        "lastModified": 1766651565,
+        "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
+        "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
         "type": "github"
       },
       "original": {
@@ -210,22 +210,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-fork": {
-      "locked": {
-        "lastModified": 1762695280,
-        "narHash": "sha256-AxkzIUAd0XA+Ju21lmnsVEvKH3HXe/s/XMWoputxWs0=",
-        "owner": "gabevenberg",
-        "repo": "nixpkgs",
-        "rev": "554c865ae8c7ba8031359ac30638102b8d379610",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gabevenberg",
-        "ref": "kicad-step-fix",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nvim-config": {
       "inputs": {
         "nixCats": "nixCats",
@@ -260,7 +244,6 @@
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-fork": "nixpkgs-fork",
         "nvim-config": "nvim-config",
         "sops-nix": "sops-nix"
       }
@@ -272,11 +255,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764483358,
-        "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
+        "lastModified": 1766289575,
+        "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=",
         "owner": "mic92",
         "repo": "sops-nix",
-        "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
+        "rev": "9836912e37aef546029e48c8749834735a6b9dad",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a0f845d..f580922 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
     # Nixpkgs
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    nixpkgs-fork.url="github:gabevenberg/nixpkgs/kicad-step-fix";
+    # nixpkgs-fork.url="github:gabevenberg/nixpkgs/nixos-unstable";
     # nixpkgs-fork.url = "git+file:///home/gabe/dev/nixpkgs";
 
     nixos-wsl = {
diff --git a/hosts/altostratus/default.nix b/hosts/altostratus/default.nix
index 3696bfd..3fc49be 100644
--- a/hosts/altostratus/default.nix
+++ b/hosts/altostratus/default.nix
@@ -4,7 +4,6 @@
   ...
 }:
 inputs.nixpkgs.lib.nixosSystem {
-  system = "x86_64-linux";
   specialArgs = {inherit inputs myLib;};
   modules = [
     inputs.home-manager.nixosModules.home-manager
@@ -25,6 +24,7 @@ inputs.nixpkgs.lib.nixosSystem {
       ...
     }: {
       hardware.enableRedistributableFirmware = true;
+      nixpkgs.hostPlatform ="x86_64-linux";
       host.details = {
         user = "gabe";
         fullName = "Gabe Venberg";
diff --git a/hosts/cirrostratus/default.nix b/hosts/cirrostratus/default.nix
index 8cf6251..8c0875c 100644
--- a/hosts/cirrostratus/default.nix
+++ b/hosts/cirrostratus/default.nix
@@ -5,7 +5,6 @@
 }:
 # Karp site server.
 inputs.nixpkgs.lib.nixosSystem {
-  system = "x86_64-linux";
   specialArgs = {inherit inputs myLib;};
   # > Our main nixos configuration file <
   modules = [
@@ -42,6 +41,7 @@ inputs.nixpkgs.lib.nixosSystem {
         fullName = "Gabe Venberg";
         gui.enable = false;
       };
+      nixpkgs.hostPlatform ="x86_64-linux";
       boot.zfs.extraPools = ["storage"];
       networking.hostName = "cirrostratus"; # Define your hostname.
       networking.hostId = "1b9da0b9";
diff --git a/hosts/cirrus/default.nix b/hosts/cirrus/default.nix
index 0c50c41..8a82edd 100644
--- a/hosts/cirrus/default.nix
+++ b/hosts/cirrus/default.nix
@@ -5,7 +5,6 @@
 }:
 # Hetzner cloud multipurpouse server
 inputs.nixpkgs.lib.nixosSystem {
-  system = "x86_64-linux";
   specialArgs = {inherit inputs myLib;};
   # > Our main nixos configuration file <
   modules = [
@@ -36,6 +35,7 @@ inputs.nixpkgs.lib.nixosSystem {
         gui.enable = false;
         isVm = true;
       };
+      nixpkgs.hostPlatform ="x86_64-linux";
       networking.hostName = "cirrus"; # Define your hostname.
       networking.hostId = "908b80b6";
       networking.useNetworkd = true;
diff --git a/hosts/cumulus/default.nix b/hosts/cumulus/default.nix
index 80ae240..30fb2ae 100644
--- a/hosts/cumulus/default.nix
+++ b/hosts/cumulus/default.nix
@@ -4,7 +4,6 @@
   ...
 }:
 inputs.nixpkgs.lib.nixosSystem {
-  system = "aarch64-linux";
   specialArgs = {inherit inputs myLib;};
   modules = [
     inputs.home-manager.nixosModules.home-manager
@@ -33,6 +32,7 @@ inputs.nixpkgs.lib.nixosSystem {
         "rockchipdrm"
         "phy_rockchip_pcie"
       ];
+      nixpkgs.hostPlatform ="x86_64-linux";
       hardware.enableRedistributableFirmware = true;
       host.details = {
         user = "gabe";
diff --git a/hosts/harmatan/default.nix b/hosts/harmatan/default.nix
index 61c0f3c..00abab6 100644
--- a/hosts/harmatan/default.nix
+++ b/hosts/harmatan/default.nix
@@ -4,7 +4,6 @@
   ...
 }:
 inputs.nixpkgs.lib.nixosSystem {
-  system = "x86_64-linux";
   specialArgs = {inherit inputs myLib;};
   modules = [
     inputs.home-manager.nixosModules.home-manager
@@ -22,7 +21,6 @@ inputs.nixpkgs.lib.nixosSystem {
     ../../configs/nixos/touchpad.nix
     ../../configs/nixos/i3
     ../../configs/nixos/bluetooth.nix
-    ../../configs/nixos/kicad.nix
     ../../roles/nixos/gaming.nix
     ../../roles/nixos/power-saving.nix
     ../../roles/nixos/embedded-dev
@@ -32,6 +30,7 @@ inputs.nixpkgs.lib.nixosSystem {
       lib,
       ...
     }: {
+      nixpkgs.hostPlatform ="x86_64-linux";
       host.details = {
         user = "gabe";
         fullName = "Gabe Venberg";
@@ -104,6 +103,7 @@ inputs.nixpkgs.lib.nixosSystem {
           ../../configs/home-manager/tiny-irc.nix
           ../../configs/home-manager/senpai-irc.nix
           ../../configs/home-manager/halloy-irc.nix
+          ../../configs/home-manager/kicad.nix
         ];
 
         sops = lib.mkIf (inputs ? nix-secrets) {
diff --git a/packages/aarch64-iso.nix b/packages/aarch64-iso.nix
index 3943d95..c208e63 100644
--- a/packages/aarch64-iso.nix
+++ b/packages/aarch64-iso.nix
@@ -5,7 +5,6 @@
   ...
 }:
 (inputs.nixpkgs.lib.nixosSystem {
-  system = "aarch64-linux";
   specialArgs = {inherit inputs myLib;};
   # > Our main nixos configuration file <
   modules = [
@@ -37,6 +36,7 @@
         "${modulesPath}/installer/scan/detected.nix"
         "${modulesPath}/installer/scan/not-detected.nix"
       ];
+      nixpkgs.hostPlatform ="aarch64-linux";
       host.details = {
         user = "gabe";
         fullName = "Gabe Venberg";
diff --git a/packages/iso.nix b/packages/iso.nix
index abdbedb..292cc8d 100644
--- a/packages/iso.nix
+++ b/packages/iso.nix
@@ -4,7 +4,6 @@
   ...
 }:
 (inputs.nixpkgs.lib.nixosSystem {
-  system = "x86_64-linux";
   specialArgs = {inherit inputs myLib;};
   # > Our main nixos configuration file <
   modules = [
@@ -34,6 +33,7 @@
         "${modulesPath}/installer/scan/detected.nix"
         "${modulesPath}/installer/scan/not-detected.nix"
       ];
+      nixpkgs.hostPlatform ="x86_64-linux";
       host.details = {
         user = "gabe";
         fullName = "Gabe Venberg";
diff --git a/packages/proxmox.nix b/packages/proxmox.nix
index 0318d4f..fc2d727 100644
--- a/packages/proxmox.nix
+++ b/packages/proxmox.nix
@@ -4,7 +4,6 @@
   ...
 }:
 (inputs.nixpkgs.lib.nixosSystem {
-  system = "x86_64-linux";
   specialArgs = {inherit inputs myLib;};
   modules = [
     inputs.home-manager.nixosModules.home-manager
@@ -18,6 +17,7 @@
       ...
     }: {
       imports = ["${modulesPath}/virtualisation/proxmox-lxc.nix"];
+      nixpkgs.hostPlatform ="x86_64-linux";
       proxmoxLXC.manageHostName = false;
       boot.loader.grub.enable = lib.mkForce false;
       boot.loader.systemd-boot.enable = lib.mkForce false;
diff --git a/packages/rpi3-sd-image.nix b/packages/rpi3-sd-image.nix
index e333537..a644f9a 100644
--- a/packages/rpi3-sd-image.nix
+++ b/packages/rpi3-sd-image.nix
@@ -4,7 +4,6 @@
   ...
 }:
 (inputs.nixpkgs.lib.nixosSystem {
-  system = "aarch64-linux";
   specialArgs = {inherit inputs myLib;};
   modules = [
     inputs.home-manager.nixosModules.home-manager
@@ -24,6 +23,7 @@
       ...
     }: {
       imports = ["${modulesPath}/installer/sd-card/sd-image-aarch64.nix"];
+      nixpkgs.hostPlatform ="aarch64-linux";
       hardware.enableRedistributableFirmware = true;
       host.details = {
         user = "gabe";
diff --git a/roles/home-manager/minimal-terminal.nix b/roles/home-manager/minimal-terminal.nix
index 1372766..5aec744 100644
--- a/roles/home-manager/minimal-terminal.nix
+++ b/roles/home-manager/minimal-terminal.nix
@@ -31,7 +31,7 @@
     curl
     rsync
     p7zip
-    inputs.nvim-config.packages.${pkgs.system}.nvim-minimal
+    inputs.nvim-config.packages.${pkgs.stdenv.hostPlatform.system}.nvim-minimal
   ];
 
   home.sessionVariables = {
diff --git a/roles/home-manager/terminal.nix b/roles/home-manager/terminal.nix
index 43b77f3..a4e4266 100644
--- a/roles/home-manager/terminal.nix
+++ b/roles/home-manager/terminal.nix
@@ -18,7 +18,7 @@
     fclones
     libqalculate
     f2
-    inputs.nvim-config.packages.${pkgs.system}.nvim
+    inputs.nvim-config.packages.${pkgs.stdenv.hostPlatform.system}.nvim
     #TODO! move this to graphics module? This provides a drag and drop interface from the CLI.
     dragon-drop
   ];