Improve modularity

hosts/default/configuration.nix

@@ -8,7 +8,13 @@
   imports =
     [ # Hardware-related
       ./hardware-configuration.nix
-      ../../modules/nixos/alienware/alienware.nix
+      ../../modules/hardware
+
+      # NH
+      ../../modules/nh
+
+      # Gaming
+      ../../modules/gaming
 
       # Gnome customization
       ../../modules/nixos/gnome.nix
@@ -35,6 +41,24 @@
     };
   };
 
+  swapDevices = [{
+    device = "/var/lib/swapfile";
+    size = 20*1024;
+  }];
+
+  hardware = {
+    enableRedistributableFirmware = lib.mkDefault true;
+  };
+
+  services = {
+    fwupd = {
+      enable = lib.mkDefault true;
+    };
+    thermald = {
+      enable = lib.mkDefault true;
+    };
+  };
+
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   networking.hostName = "alienware"; # Define your hostname.

hosts/default/home.nix

@@ -65,10 +65,7 @@
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
   home.file = {
-    ".config/awesome" = {
-      recursive = true;
-      source = ../../modules/nixos/alienware/awesomewm;
-    };
+
   };
 
   # Home Manager can also manage your environment variables through

modules/gaming/default.nix

@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+    imports = [
+        ./steam
+        ./lutris
+        ./gayshit
+    ];
+}

modules/gaming/gayshit/default.nix

@@ -1,22 +1,6 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
-    # Enable Steam
-    programs.steam = {
-        enable = true;
-        remotePlay.openFirewall = true;
-        dedicatedServer.openFirewall = true;
-        localNetworkGameTransfers.openFirewall = true;
-    };
-
-    # Enable wine
-    environment.systemPackages = with pkgs; [
-        wineWowPackages.stable
-        wineWowPackages.staging
-        winetricks
-        lutris
-    ];
-
     # Aagl config
     nix.settings = {
         substituters = [ "https://ezkea.cachix.org" ];

modules/gaming/lutris/default.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+    # Enable wine
+    environment.systemPackages = with pkgs; [
+        wineWowPackages.stable
+        wineWowPackages.staging
+        winetricks
+        lutris
+    ];
+}

modules/gaming/steam/default.nix

@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+    # Enable Steam
+    programs.steam = {
+        enable = true;
+        remotePlay.openFirewall = true;
+        dedicatedServer.openFirewall = true;
+        localNetworkGameTransfers.openFirewall = true;
+    };
+}

modules/hardware/cpu/default.nix

@@ -1,4 +1,8 @@
 { config, lib, ... }:
 {
+  imports = [
+    ./tiger-lake.nix
+  ];
+
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

modules/hardware/cpu/tiger-lake.nix

@@ -1,7 +1,6 @@
 { config, lib, ... }:
 {
   imports = [
-    ./intel.nix
     ../gpu/intel.nix
    ];
   config = lib.mkMerge [

modules/hardware/default.nix

@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+    imports = [
+        ./cpu
+        ./gpu
+        ./ssd
+    ];
+}

modules/hardware/gpu/default.nix

@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+    imports = [
+        ./nvidia.nix
+    ];
+}

modules/nh/default.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+    programs.nh = {
+        enable = true;
+        clean.enable = true;
+        clean.extraArgs = "--keep-since 4d --keep 3";
+    };
+}

modules/nixos/alienware/alienware.nix

@@ -2,10 +2,6 @@
 
 {
     imports = [
-        ./hardware/cpu/tiger-lake.nix
-        ./hardware/gpu/nvidia.nix
-        ./hardware/ssd/ssd.nix
-        ./gaming.nix
         ./nh.nix
     ];