setup more default.nix

flake.nix

@@ -41,18 +41,10 @@
             ./nixos/hardware-configuration.nix
             ./nixos/configuration.nix
             ./nixos/home.nix
-            ./modules/desktop/xorg.nix
+            ./modules/desktop
-            ./modules/desktop/i3.nix
+            ./modules/hardware
-            ./modules/desktop/fonts.nix
+            ./modules/system
-            ./modules/hardware/boot.nix
+            ./modules/shell
-            ./modules/hardware/mouse.nix
-            ./modules/hardware/keyboard.nix
-            ./modules/hardware/monitors.nix
-            ./modules/hardware/audio.nix
-            ./modules/hardware/networking.nix
-            ./modules/system/timezone.nix
-            ./modules/system/doas.nix
-            ./modules/system/user.nix
             ./modules/gaming
             ./modules/services/keybase.nix
             ./modules/applications/firefox.nix
@@ -60,10 +52,6 @@
             ./modules/applications/media.nix
             ./modules/applications/1password.nix
             ./modules/applications/discord.nix
-            ./modules/shell/fish.nix
-            ./modules/shell/utilities.nix
-            ./modules/shell/git.nix
-            ./modules/shell/github.nix
             ./modules/editor/neovim.nix
           ];
         };

modules/desktop/default.nix

@@ -0,0 +1,5 @@
+{ ... }: {
+
+  imports = [ ./xorg.nix ./fonts.nix ./i3.nix ];
+
+}

modules/desktop/fonts.nix

@@ -1,4 +1,6 @@
-{ pkgs, gui, ... }: {
+{ pkgs, lib, gui, ... }: {
+
+  config = lib.mkIf gui.enable {
 
     fonts.fonts = with pkgs;
       [
@@ -7,4 +9,6 @@
       ];
     fonts.fontconfig.defaultFonts.monospace = [ gui.font.name ];
 
+  };
+
 }

modules/desktop/xorg.nix

@@ -1,4 +1,6 @@
-{ config, pkgs, identity, gui, ... }: {
+{ config, pkgs, lib, identity, gui, ... }: {
+
+  config = lib.mkIf gui.enable {
 
     # Enable the X11 windowing system.
     services.xserver = {
@@ -30,5 +32,6 @@
       pbpaste = "xclip -selection clipboard -out";
     };
 
-}
+  };
 
+}

modules/hardware/audio.nix

@@ -1,5 +1,6 @@
-{ pkgs, ... }: {
+{ pkgs, lib, gui, ... }: {
 
+  config = lib.mkIf gui.enable {
     sound.enable = true;
     hardware.pulseaudio.enable = true;
 
@@ -7,5 +8,6 @@
       [
         pamixer # Audio control
       ];
+  };
 
 }

modules/hardware/default.nix

@@ -0,0 +1,12 @@
+{ lib, gui, ... }: {
+
+  imports = [
+    ./audio.nix
+    ./boot.nix
+    ./keyboard.nix
+    ./monitors.nix
+    ./mouse.nix
+    ./networking.nix
+  ];
+
+}

modules/hardware/monitors.nix

@@ -1,8 +1,10 @@
-{ pkgs, identity, ... }: {
+{ pkgs, lib, gui, identity, ... }: {
 
   # Timezone required for Redshift schedule
   imports = [ ../system/timezone.nix ];
 
+  config = lib.mkIf gui.enable {
+
     environment.systemPackages = with pkgs;
       [
         ddcutil # Monitor brightness control
@@ -46,4 +48,6 @@
       '';
     };
 
+  };
+
 }

modules/hardware/mouse.nix

@@ -1,4 +1,6 @@
-{ pkgs, ... }: {
+{ pkgs, lib, gui, ... }: {
+
+  config = lib.mkIf gui.enable {
 
     # Mouse config
     services.ratbagd.enable = true;
@@ -14,4 +16,6 @@
       accelSpeed = "1.15";
     };
 
+  };
+
 }

modules/shell/default.nix

@@ -1 +1 @@
-{ ... }: { imports = [ ./fish.nix ]; }
+{ ... }: { imports = [ ./fish.nix ./git.nix ./github.nix ./utilities.nix ]; }

modules/system/default.nix

@@ -0,0 +1,5 @@
+{ ... }: {
+
+  imports = [ ./user.nix ./timezone.nix ./doas.nix ];
+
+}