fix lap config

system/dev/dn-lap/default.nix

@@ -1,32 +1,11 @@
-{ lib, pkgs, inputs, nix-version, ... }:
+{ lib, system, inputs, nix-version, ... }:
 
 {
   imports = [
-    ./hardware-configuration.nix
     inputs.home-manager.nixosModules.default
-
-    # Modules
+    ./hardware-configuration.nix
     ./boot.nix
-    ../../modules/dn-ca.nix
-    ../../modules/fonts.nix
-    ../../modules/hardware.nix
-    ../../modules/hyprland.nix
-    ../../modules/internationalisation.nix
-    ../../modules/misc.nix
-    ../../modules/networking.nix
-    ../../modules/nixsettings.nix
-    ../../modules/packages.nix
-    ../../modules/plymouth.nix
-    ../../modules/polkit.nix
-    ../../modules/programs.nix
-    ../../modules/security.nix
-    ../../modules/services.nix
-    ../../modules/sound.nix
-    ../../modules/theme.nix
-    ../../modules/time.nix
-    ../../modules/users.nix
-    ../../modules/virtualization.nix
-    ../../modules/wireguard.nix
+    ../../modules
   ];
 
   # Overrides
@@ -35,7 +14,7 @@
 
   system.stateVersion = nix-version;
   home-manager = {
-    backupFileExtension = "backup";
+    backupFileExtension = "hm-backup";
     extraSpecialArgs = { inherit inputs system nix-version; };
     users = { "danny" = import ../../../home; };
   };

system/dev/dn-pre7780/default.nix

@@ -4,9 +4,10 @@
   imports = [
     inputs.home-manager.nixosModules.default
     ./hardware-configuration.nix
+    ./boot.nix
     ../../modules
     ../../modules/nvidia.nix
-    ./boot.nix
+    ../../modules/gaming.nix
   ];
 
   # Overrides

system/modules/default.nix

@@ -4,7 +4,6 @@
   imports = [
     ./plymouth.nix # Boot splash
     ./fonts.nix
-    ./gaming.nix
     ./hardware.nix
     ./hyprland.nix
     ./internationalisation.nix

system/modules/gaming.nix

@@ -13,6 +13,16 @@
     };
   };
 
+  programs = {
+    steam = {
+      enable = true;
+      extest.enable = true;
+      remotePlay.openFirewall = true;
+      dedicatedServer.openFirewall = true;
+      localNetworkGameTransfers.openFirewall = true;
+    };
+  };
+
   hardware.steam-hardware.enable = true;
 
   nixpkgs.config.allowUnfree = true;

system/modules/programs.nix

@@ -2,14 +2,6 @@
 
 {
   programs = {
-    steam = {
-      enable = true;
-      extest.enable = true;
-      remotePlay.openFirewall = true;
-      dedicatedServer.openFirewall = true;
-      localNetworkGameTransfers.openFirewall = true;
-    };
-
     gnupg = {
       agent = {
         enable = true;