separate hardware configs

flake.lock

@@ -215,11 +215,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-SakyZnAhoToQmui5hozmLqkoLw6N/AHCgKF4tCP/sTQ=",
-        "path": "/nix/store/ifdc59y4kwjvp1gs28khrybsay4g3pky-source/disko",
+        "path": "/nix/store/wkgb9j3c0r0vkgvjd7jnip61lgrcgpw5-source/disko",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/ifdc59y4kwjvp1gs28khrybsay4g3pky-source/disko",
+        "path": "/nix/store/wkgb9j3c0r0vkgvjd7jnip61lgrcgpw5-source/disko",
         "type": "path"
       }
     },
@@ -231,11 +231,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-l1WDl+R58X4JNg/qcL3b+SiSnNGRuJg4Ou3q0Lbs9UM=",
-        "path": "/nix/store/19pqwn48qipwa4ij103bs4qfmy5lj4wj-source/external",
+        "path": "/nix/store/mbn716rsybw0i5y7jdjrjx8lrx902c0q-source/external",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/19pqwn48qipwa4ij103bs4qfmy5lj4wj-source/external",
+        "path": "/nix/store/mbn716rsybw0i5y7jdjrjx8lrx902c0q-source/external",
         "type": "path"
       }
     },
@@ -1029,11 +1029,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-7ipphehm+qDglyyFxGz2ZYf9uNbXCohPCFAGSI2QMb8=",
-        "path": "/nix/store/ifdc59y4kwjvp1gs28khrybsay4g3pky-source/impermanence",
+        "path": "/nix/store/wkgb9j3c0r0vkgvjd7jnip61lgrcgpw5-source/impermanence",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/ifdc59y4kwjvp1gs28khrybsay4g3pky-source/impermanence",
+        "path": "/nix/store/wkgb9j3c0r0vkgvjd7jnip61lgrcgpw5-source/impermanence",
         "type": "path"
       }
     },
@@ -1058,12 +1058,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-M9BHb7k0Clh1ejqkGcE5gfEivRvpzj29Saqn97nryf8=",
+        "narHash": "sha256-Hz1a2OgtlwgdQhI6hiUvityjVURsoY6oXkXq25RyiBM=",
-        "path": "/nix/store/ypmp15zvqyxl5m3wz86d7amfywndckri-source/home",
+        "path": "/nix/store/aka1g22c4sp55yjixyhfvak1ar13cfd4-source/home",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/ypmp15zvqyxl5m3wz86d7amfywndckri-source/home",
+        "path": "/nix/store/aka1g22c4sp55yjixyhfvak1ar13cfd4-source/home",
         "type": "path"
       }
     },
@@ -1433,12 +1433,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-OZU1gknSkJk5HCw6UM9CczAtsBqiVQxpLL3lTQGXczw=",
+        "narHash": "sha256-IRXgvSXAWTWKW5A8FvE7RS9S8CEX0uCPkR95DywjOHI=",
-        "path": "/nix/store/vzgnwd4r6sl8y0xdylzgqsccjzzzfgvs-source/packages",
+        "path": "/nix/store/x8abnc0ass9lqmyd216mifbyggwsbxr8-source/packages",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/vzgnwd4r6sl8y0xdylzgqsccjzzzfgvs-source/packages",
+        "path": "/nix/store/x8abnc0ass9lqmyd216mifbyggwsbxr8-source/packages",
         "type": "path"
       }
     },
@@ -1449,11 +1449,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=",
-        "path": "/nix/store/ifdc59y4kwjvp1gs28khrybsay4g3pky-source/packages",
+        "path": "/nix/store/wkgb9j3c0r0vkgvjd7jnip61lgrcgpw5-source/packages",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/ifdc59y4kwjvp1gs28khrybsay4g3pky-source/packages",
+        "path": "/nix/store/wkgb9j3c0r0vkgvjd7jnip61lgrcgpw5-source/packages",
         "type": "path"
       }
     },
@@ -1523,11 +1523,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-ZK0b6O2RkZCprYDS6kjUqodElzONOQyL5cOdZ62Lr/c=",
-        "path": "/nix/store/vzgnwd4r6sl8y0xdylzgqsccjzzzfgvs-source/programs",
+        "path": "/nix/store/x8abnc0ass9lqmyd216mifbyggwsbxr8-source/programs",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/vzgnwd4r6sl8y0xdylzgqsccjzzzfgvs-source/programs",
+        "path": "/nix/store/x8abnc0ass9lqmyd216mifbyggwsbxr8-source/programs",
         "type": "path"
       }
     },
@@ -1539,11 +1539,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-hg0wqQn6BxQXLmfBINzZoaWpdSIlwwZxKbYz+4df83o=",
-        "path": "/nix/store/ifdc59y4kwjvp1gs28khrybsay4g3pky-source/programs",
+        "path": "/nix/store/wkgb9j3c0r0vkgvjd7jnip61lgrcgpw5-source/programs",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/ifdc59y4kwjvp1gs28khrybsay4g3pky-source/programs",
+        "path": "/nix/store/wkgb9j3c0r0vkgvjd7jnip61lgrcgpw5-source/programs",
         "type": "path"
       }
     },
@@ -1604,12 +1604,12 @@
     "scripts": {
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-IdOTPxuV6bSKYI3PXYCbz6oND0eDblCCRw5M2NDvnHg=",
+        "narHash": "sha256-Xqjo17tstwvRuEesx+lptIicPq+u9IVUuSwbZidz5Yg=",
-        "path": "/nix/store/19pqwn48qipwa4ij103bs4qfmy5lj4wj-source/scripts",
+        "path": "/nix/store/mbn716rsybw0i5y7jdjrjx8lrx902c0q-source/scripts",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/19pqwn48qipwa4ij103bs4qfmy5lj4wj-source/scripts",
+        "path": "/nix/store/mbn716rsybw0i5y7jdjrjx8lrx902c0q-source/scripts",
         "type": "path"
       }
     },
@@ -1619,12 +1619,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-eNDfQyTJN5C8e2xYrvdCHbDgE1hrcm7CIO41ga0iumc=",
+        "narHash": "sha256-/+FJTRzHmHfZLb8yU/wMyGyMZFJ53mJNRzc5d4Gzwjw=",
-        "path": "/nix/store/xgwj8zwnq86vzzp6w2a78p2vfsa8cp5s-source/sddm",
+        "path": "/nix/store/dzq3nrs0fqr8l08vdkayjysh2hpapwgs-source/sddm",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/xgwj8zwnq86vzzp6w2a78p2vfsa8cp5s-source/sddm",
+        "path": "/nix/store/dzq3nrs0fqr8l08vdkayjysh2hpapwgs-source/sddm",
         "type": "path"
       }
     },
@@ -1669,12 +1669,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-+NUYQ7OLg7RlDgnDTjoaahqFutxprPSugcbVWgjNrB0=",
+        "narHash": "sha256-VZKans7CW3BgyWaVgi9mGKvJsCvyse2zLPRB5fJnlfA=",
-        "path": "/nix/store/ifdc59y4kwjvp1gs28khrybsay4g3pky-source/services",
+        "path": "/nix/store/wkgb9j3c0r0vkgvjd7jnip61lgrcgpw5-source/services",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/ifdc59y4kwjvp1gs28khrybsay4g3pky-source/services",
+        "path": "/nix/store/wkgb9j3c0r0vkgvjd7jnip61lgrcgpw5-source/services",
         "type": "path"
       }
     },
@@ -1688,12 +1688,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-EOBuv9MYEikzsgg0FFaMEzGT0vuY9GoO9i+lmRu3md4=",
+        "narHash": "sha256-eus2eesyqQomOV2FPEYy2FDbUhoamg+Xnzxn505TDW0=",
-        "path": "/nix/store/ypmp15zvqyxl5m3wz86d7amfywndckri-source/system",
+        "path": "/nix/store/aka1g22c4sp55yjixyhfvak1ar13cfd4-source/system",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/ypmp15zvqyxl5m3wz86d7amfywndckri-source/system",
+        "path": "/nix/store/aka1g22c4sp55yjixyhfvak1ar13cfd4-source/system",
         "type": "path"
       }
     },
@@ -1785,11 +1785,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-4qcgTKJv2uerh2pzxBzFRaYh12KBI1ZlMhMtkl/MI90=",
-        "path": "/nix/store/0lrc4mms913489ji50j03shymf51h6my-source/themes/tokyo-night",
+        "path": "/nix/store/98wnq5dpslj19w5m0akhbv42ml7g3w2p-source/themes/tokyo-night",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/0lrc4mms913489ji50j03shymf51h6my-source/themes/tokyo-night",
+        "path": "/nix/store/98wnq5dpslj19w5m0akhbv42ml7g3w2p-source/themes/tokyo-night",
         "type": "path"
       }
     },

flake.nix

@@ -36,7 +36,7 @@
 
             inherit system;
 	        specialArgs = { 
-                inherit core_inputs; 
+                core_inputs = (core_inputs // {inherit host;}); 
             };
 
 	        modules = [ 
@@ -49,13 +49,6 @@
                         opts = {
                             firstBoot = false;
                             inherit host username devices;
-                            openssh.enable = true;
-                            pipewire.enable = true;
-                            hyprland.enable = true;
-                            git.enable = true;
-                            ags.enable = true;
-                            nh.enable = true;
-                            steam.enable = false;
                         };
                     };
                     #disko.enable = lib.mkForce false;

home/flake.nix

@@ -40,6 +40,7 @@
                 wal.enable = true;
                 ags.enable = true;
                 hyprland.enable = true;
+                swaylock.enable = true;
             };
 
 	

home/packages/default.nix

@@ -26,6 +26,7 @@
           cava 
           gcc
           android-tools
+          neovim-remote
 
           (pkgs.python311.withPackages pypkgs)
           

home/packages/scripts/default.nix

@@ -81,6 +81,7 @@
 	            lxqt-policykit-agent &
 	            nmcli device wifi connect EagleNet password '~?C#@ZiH' &
                 hyprctl setcursor Bibata-Modern-Classic 16 &
+                wayvnc &
 	        '')
 
 	        (pkgs.writeShellScriptBin "colorPrefix" ''

system/configuration/homebox/default.nix

@@ -55,7 +55,16 @@
         environment.shells = with pkgs; [ zsh ];
         programs.zsh.enable = true;
         users.defaultUserShell = pkgs.zsh;
-        
+
+        sysconfig.opts = {
+            openssh.enable = true;
+            pipewire.enable = true;
+            hyprland.enable = true;
+            git.enable = true;
+            ags.enable = true;
+            nh.enable = true;
+            steam.enable = false;
+        };
                
         services = {
             xserver = {

system/configuration/homebox/hardware-configuration.nix

@@ -0,0 +1,39 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/efe05fe7-563d-411a-954b-317a2e7316f3";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/78F7-FFB8";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # 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.enp6s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp7s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

system/configuration/laptop/default.nix

@@ -65,6 +65,16 @@
             pulseaudio.enable = false;
         };
 
+        sysconfig.opts = {
+            openssh.enable = false;
+            steam.enable = true;
+            pipewire.enable = true;
+            ags.enable = true;
+            hyprland.enable = true;
+            git.enable = true;
+            nh.enable = true;
+        };
+
 # Enable the X11 windowing system.
         services.xserver = {
             enable = true;

system/configuration/laptop/hardware-configuration.nix

@@ -0,0 +1,39 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/78c0964d-c09e-4e31-8a73-eb719d79917a";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/AE5E-AC86";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # 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.eno1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

system/flake.nix

@@ -20,7 +20,7 @@
         nixosModule = { config, lib, pkgs, core_inputs, ... }: {
             imports = [ 
                 ./configuration
-                ./hardware-configuration.nix
+                ./configuration/${core_inputs.host}/hardware-configuration.nix
 #               inputs.diskoConfig.module
 #               inputs.impermanenceConfig.module
                 inputs.srvcs.module