diff --git a/flake.nix b/flake.nix
index 98ceea6..c19e441 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,6 +73,16 @@
             inherit inputs outputs lib;
           };
         };
+
+      mkHomeConfiguration =
+        system: modules:
+        home-manager.lib.homeManagerConfiguration {
+          pkgs = nixpkgs.legacyPackages.${system};
+          modules = [ ./users/sid/home ] + modules;
+          extraSpecialArgs = {
+            inherit inputs outputs;
+          };
+        };
     in
     {
       packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
@@ -89,17 +99,6 @@
         in
         {
           default = import ./shell.nix { inherit pkgs; };
-          kicad = pkgs.mkShell {
-            buildInputs = [
-              (pkgs.python313.withPackages (
-                p: with p; [
-                  kicad
-                  requests
-                  wxpython
-                ]
-              ))
-            ];
-          };
         }
       );
 
@@ -111,46 +110,10 @@
       };
 
       homeConfigurations = {
-        "sid@16ach6" = home-manager.lib.homeManagerConfiguration {
-          pkgs = nixpkgs.legacyPackages.x86_64-linux;
-          extraSpecialArgs = {
-            inherit inputs outputs;
-          };
-          modules = [
-            ./users/sid/home
-            ./users/sid/home/hosts/16ach6
-          ];
-        };
-        "sid@nuc8" = home-manager.lib.homeManagerConfiguration {
-          pkgs = nixpkgs.legacyPackages.x86_64-linux;
-          extraSpecialArgs = {
-            inherit inputs outputs;
-          };
-          modules = [
-            ./users/sid/home
-            ./users/sid/home/hosts/nuc8
-          ];
-        };
-        "sid@pc" = home-manager.lib.homeManagerConfiguration {
-          pkgs = nixpkgs.legacyPackages.x86_64-linux;
-          extraSpecialArgs = {
-            inherit inputs outputs;
-          };
-          modules = [
-            ./users/sid/home
-            ./users/sid/home/hosts/pc
-          ];
-        };
-        "sid@rv2" = home-manager.lib.homeManagerConfiguration {
-          pkgs = nixpkgs.legacyPackages.x86_64-linux;
-          extraSpecialArgs = {
-            inherit inputs outputs;
-          };
-          modules = [
-            ./users/sid/home
-            ./users/sid/home/hosts/rv2
-          ];
-        };
+        "sid@16ach6" = mkHomeConfiguration "x86_64-linux" [ ./users/sid/home/hosts/16ach6 ];
+        "sid@nuc8" = mkHomeConfiguration "x86_64-linux" [ ./users/sid/home/hosts/nuc8 ];
+        "sid@pc" = mkHomeConfiguration "x86_64-linux" [ ./users/sid/home/hosts/pc ];
+        "sid@rv2" = mkHomeConfiguration "x86_64-linux" [ ./users/sid/home/hosts/rv2 ];
       };
 
       formatter = forAllSystems (