refactor(modules): make sure nothing is added without setting enable

README.md

@@ -8,6 +8,8 @@ TODO: add directory structure info and enforce it
     - if there is non nix code, it will be in a `config` folder
     - redo docs
     - every module should not do anything if imported
+    - all nix files that represent a module should be `default.nix` (a nix file
+      which is imported directly can be called anything alongside `default.nix`)
 
 ## AGS
 

configurations/bbsteamie/default.nix

@@ -47,6 +47,7 @@
   };
 
   roles.server = {
+    enable = true;
     user = mainUser;
     sshd.enable = true;
   };

configurations/binto/default.nix

@@ -55,6 +55,7 @@
   };
 
   roles.desktop = {
+    enable = true;
     user = mainUser;
 
     ags.enable = true;
@@ -65,6 +66,7 @@
   };
 
   roles.server = {
+    enable = true;
     user = mainUser;
     tailscale.enable = true;
     sshd.enable = true;

configurations/cluster/default.nix

@@ -58,6 +58,7 @@ in {
   };
 
   roles.server = {
+    enable = true;
     user = mainUser;
     tailscale.enable = true;
     sshd.enable = true;

configurations/homie/default.nix

@@ -48,6 +48,7 @@
   };
 
   roles.server = {
+    enable = true;
     user = mainUser;
     tailscale.enable = true;
     sshd.enable = true;

configurations/homie/modules/music/default.nix

@@ -52,8 +52,9 @@
     "ueboom.service"
   ];
 
+  services = {
     # Allow pulseaudio to be managed by MPD
-  hardware.pulseaudio = {
+    pulseaudio = {
       enable = true;
 
       zeroconf = {
@@ -66,7 +67,6 @@
       '';
     };
 
-  services = {
     upower.enable = true;
 
     mpd = {

configurations/live-image/default.nix

@@ -23,6 +23,7 @@
   };
 
   roles.server = {
+    enable = true;
     user = mainUser;
     sshd.enable = true;
   };

configurations/nos/default.nix

@@ -49,6 +49,7 @@
   };
 
   roles.server = {
+    enable = true;
     user = mainUser;
     tailscale.enable = true;
     sshd.enable = true;

configurations/servivi/default.nix

@@ -62,6 +62,7 @@
   };
 
   roles.server = {
+    enable = true;
     user = mainUser;
     tailscale.enable = true;
     sshd.enable = true;

configurations/wim/default.nix

@@ -65,6 +65,7 @@
   };
 
   roles.desktop = {
+    enable = true;
     user = mainUser;
 
     ags.enable = true;
@@ -76,6 +77,7 @@
   };
 
   roles.server = {
+    enable = true;
     user = mainUser;
     tailscale.enable = true;
   };

modules/ags/hyprland.nix

@@ -1,7 +1,16 @@
-self: {...}: let
+self: {
+  lib,
+  osConfig,
+  ...
+}: let
   inherit (self.lib.hypr) mkAnimation mkBezier mkBind mkLayerRule;
+
+  inherit (lib) mkIf;
+
+  cfgDesktop = osConfig.roles.desktop;
 in {
-  config.wayland.windowManager.hyprland = {
+  config = mkIf cfgDesktop.ags.enable {
+    wayland.windowManager.hyprland = {
       settings = {
         general = {
           gaps_in = 5;
@@ -192,6 +201,7 @@ in {
         ];
       };
     };
+  };
 
   # For accurate stack trace
   _file = ./default.nix;

modules/ags/packages.nix

@@ -9,7 +9,7 @@ self: {
 
   gtkSessionLock = gtk-session-lock.packages.${pkgs.system}.default;
 
-  inherit (lib) attrValues boolToString filter getExe optionalAttrs optionals;
+  inherit (lib) attrValues boolToString filter getExe mkIf optionalAttrs optionals;
 
   inherit (osConfig.networking) hostName;
 
@@ -29,7 +29,7 @@ self: {
     '';
   };
 in {
-  config = {
+  config = mkIf cfgDesktop.ags.enable {
     # Make these accessible outside these files
     programs.ags = {
       package = ags.packages.${pkgs.system}.ags.override {

modules/base/locale/default.nix

@@ -7,8 +7,8 @@
   inherit (lib) mkIf;
 
   cfg = config.roles.base;
-in
+in {
-  mkIf cfg.enable {
+  config = mkIf cfg.enable {
     fonts = {
       fontconfig = {
         enable = true;
@@ -45,4 +45,8 @@ in
     # Select internationalisation properties.
     i18n.defaultLocale = "en_CA.UTF-8";
     console.useXkbConfig = true;
+  };
+
+  # For accurate stack trace
+  _file = ./default.nix;
 }

modules/base/locate/default.nix

@@ -23,8 +23,8 @@
     ${updatedb} -o ${database} --prunefs "${pruneFS}" \
       --prunepaths "${prunePaths}" --prunenames "${pruneNames}"
   '';
-in
+in {
-  mkIf (baseCfg.enable) {
+  config = mkIf baseCfg.enable {
     users.users.${baseCfg.user}.extraGroups = [
       locateGroup
     ];
@@ -79,4 +79,8 @@ in
         ".svn"
       ];
     };
+  };
+
+  # For accurate stack trace
+  _file = ./default.nix;
 }

modules/base/packages/default.nix

@@ -8,7 +8,7 @@ self: {
 
   cfg = config.roles.base;
 in {
-  config = mkIf (cfg.enable) {
+  config = mkIf cfg.enable {
     nixpkgs.overlays =
       (map (i: self.inputs.${i}.overlays.default) [
         "discord-overlay"

modules/base/substituters/default.nix

@@ -14,8 +14,8 @@
       then unique (a ++ b)
       else b)) {}
     list;
-in
+in {
-  mkIf cfg.enable {
+  config = mkIf cfg.enable {
     environment.systemPackages = [
       (pkgs.writeShellApplication {
         name = "rebuild-no-cache";
@@ -50,4 +50,8 @@ in
             (mkSubstituterConf 10 "https://cache-apt.nelim.org" "cache-apt.nelim.org:NLAsWxa2Qbm4b+hHimjCpZfm48a4oN4O/GPZY9qpjNw=")
           ]);
     };
+  };
+
+  # For accurate stack trace
+  _file = ./default.nix;
 }

modules/borgbackup/default.nix

@@ -1,7 +1,16 @@
-{...}: {
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfg = config.services.borgbackup;
+in {
   imports = [./module.nix];
 
-  config.services.borgbackup = {
+  config = mkIf (cfg.configs != {}) {
+    services.borgbackup = {
       existingRepos = [
         {
           name = "docker";
@@ -28,6 +37,7 @@
         }
       ];
     };
+  };
 
   # For accurate stack trace
   _file = ./default.nix;

modules/caddy-plus/default.nix

@@ -92,7 +92,7 @@ self: {
     }/Caddyfile";
 in {
   options.services.caddy.virtualHosts = mkOption {
-    type = types.attrsOf (types.submodule (import ./vhost-options.nix {inherit cfg;}));
+    type = types.attrsOf (types.submodule (import ./vhost-options.nix cfg));
   };
 
   config = mkIf cfg.enable {

modules/caddy-plus/sub-dir-options.nix

@@ -1,4 +1,4 @@
-{cfg}: {
+cfg: {
   lib,
   name,
   ...

modules/caddy-plus/sub-domain-options.nix

@@ -1,4 +1,4 @@
-{cfg}: {
+cfg: {
   lib,
   name,
   ...
@@ -22,7 +22,7 @@ in {
     };
 
     subDirectories = mkOption {
-      type = types.attrsOf (types.submodule (import ./sub-dir-options.nix {inherit cfg;}));
+      type = types.attrsOf (types.submodule (import ./sub-dir-options.nix cfg));
       default = {};
       example = literalExpression ''
         {

modules/caddy-plus/vhost-options.nix

@@ -1,4 +1,4 @@
-{cfg}: {lib, ...}: let
+cfg: {lib, ...}: let
   inherit (lib) literalExpression mkOption types;
 in {
   options = {
@@ -12,7 +12,7 @@ in {
     };
 
     subDomains = mkOption {
-      type = types.attrsOf (types.submodule (import ./sub-domain-options.nix {inherit cfg;}));
+      type = types.attrsOf (types.submodule (import ./sub-domain-options.nix cfg));
       default = {};
       example = literalExpression ''
         {
@@ -30,7 +30,7 @@ in {
     };
 
     subDirectories = mkOption {
-      type = types.attrsOf (types.submodule (import ./sub-dir-options.nix {inherit cfg;}));
+      type = types.attrsOf (types.submodule (import ./sub-dir-options.nix cfg));
       default = {};
       example = literalExpression ''
         {

modules/desktop/default.nix

@@ -3,10 +3,10 @@ self: {
   lib,
   ...
 }: let
-  inherit (lib) elemAt mkOption types;
-
   inherit (self.inputs) home-manager;
 
+  inherit (lib) elemAt mkIf mkOption types;
+
   cfg = config.roles.desktop;
   flakeDir = config.environment.variables.FLAKE;
 in {
@@ -18,7 +18,8 @@ in {
     home-manager.nixosModules.home-manager
   ];
 
-  config.assertions = [
+  config = mkIf cfg.enable {
+    assertions = [
       {
         assertion = lib.hasPrefix "/home/${cfg.user}/" flakeDir;
         message = ''
@@ -27,8 +28,14 @@ in {
         '';
       }
     ];
+  };
 
   options.roles.desktop = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+    };
+
     user = mkOption {
       type = types.str;
       description = ''

modules/desktop/environment/default.nix

@@ -6,20 +6,8 @@ self: {
 }: let
   inherit (self.inputs) hyprland;
   inherit (self.lib.hypr) mkBind;
-in {
-  imports = [
-    (import ../../ags self)
 
-    ./modules/dconf.nix
+  inherit (lib) concatStringsSep mkIf optionals;
-    ./modules/printer.nix
-    (import ./modules/audio.nix self)
-    (import ./modules/packages.nix self)
-    (import ./modules/ratbag-mice.nix self)
-    (import ./modules/security.nix self)
-  ];
-
-  config = let
-    inherit (lib) concatStringsSep optionals;
 
   cfg = config.roles.desktop;
 
@@ -32,6 +20,18 @@ in {
     .windowManager
     .hyprland;
 in {
+  imports = [
+    (import ../../ags self)
+
+    ./modules/dconf.nix
+    ./modules/printer.nix
+    (import ./modules/audio.nix self)
+    (import ./modules/packages.nix self)
+    (import ./modules/ratbag-mice.nix self)
+    (import ./modules/security.nix self)
+  ];
+
+  config = mkIf cfg.enable {
     services = {
       dbus.enable = true;
       gvfs.enable = true;

modules/desktop/environment/home/dev.nix

@@ -1,5 +1,14 @@
-{pkgs, ...}: {
+{
-  config = {
+  lib,
+  osConfig,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfg = osConfig.roles.desktop;
+in {
+  config = mkIf cfg.enable {
     programs.bash.shellAliases = {
       # https://wiki.hyprland.org/Contributing-and-Debugging/#lsp-and-formatting
       "mkCMakeFiles" = "${pkgs.cmake}/bin/cmake -S . -B build/ -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON";

modules/desktop/environment/home/foot.nix

@@ -2,10 +2,12 @@
   lib,
   osConfig,
   ...
-}: {
+}: let
-  config = let
+  inherit (lib) mkIf;
+
   cfg = osConfig.roles.desktop;
 in {
+  config = mkIf cfg.enable {
     programs = {
       # https://codeberg.org/dnkl/foot/wiki#spawning-new-terminal-instances-in-the-current-working-directory
       bash.bashrcExtra =

modules/desktop/environment/home/hyprexpo.nix

@@ -1,7 +1,16 @@
-self: {pkgs, ...}: let
+self: {
+  lib,
+  osConfig,
+  pkgs,
+  ...
+}: let
   inherit (self.lib.hypr) mkBind;
+
+  inherit (lib) mkIf;
+
+  cfg = osConfig.roles.desktop;
 in {
-  config = {
+  config = mkIf cfg.enable {
     wayland.windowManager.hyprland = {
       plugins = [self.inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo];
 

modules/desktop/environment/home/hyprgrass.nix

@@ -4,12 +4,13 @@ self: {
   pkgs,
   ...
 }: let
-  inherit (lib) map mkIf;
   inherit (self.lib.hypr) mkBind;
 
+  inherit (lib) map mkIf;
+
   cfg = osConfig.roles.desktop;
 in {
-  config = mkIf cfg.isTouchscreen {
+  config = mkIf (cfg.enable && cfg.isTouchscreen) {
     wayland.windowManager.hyprland = {
       plugins = [self.inputs.hyprgrass.packages.${pkgs.system}.default];
 

modules/desktop/environment/home/inputs.nix

@@ -2,13 +2,14 @@ self: {
   osConfig,
   lib,
   ...
-}: {
+}: let
-  config = let
-    inherit (lib) map;
   inherit (self.lib.hypr) mkBind;
 
+  inherit (lib) mkIf;
+
+  cfg = osConfig.roles.desktop;
+
   inherit (osConfig.services.xserver) xkb;
-    inherit (osConfig.roles.desktop) mainMonitor;
 
   miceNames = [
     "logitech-g502-x"
@@ -21,6 +22,7 @@ self: {
     accel_profile = "flat";
   };
 in {
+  config = mkIf cfg.enable {
     wayland.windowManager.hyprland = {
       settings = {
         device = map mkConf miceNames;
@@ -31,8 +33,8 @@ self: {
         };
 
         exec-once =
-          if mainMonitor != null
+          if cfg.mainMonitor != null
-          then ["hyprctl dispatch focusmonitor ${mainMonitor}"]
+          then ["hyprctl dispatch focusmonitor ${cfg.mainMonitor}"]
           else [];
 
         input = {

modules/desktop/environment/home/mpv.nix

@@ -1,7 +1,16 @@
-self: {pkgs, ...}: {
+self: {
-  config = let
+  lib,
+  osConfig,
+  pkgs,
+  ...
+}: let
   inherit (self.scopedPackages.${pkgs.system}) mpvScripts;
+
+  inherit (lib) mkIf;
+
+  cfg = osConfig.roles.desktop;
 in {
+  config = mkIf cfg.enable {
     # For kdialog-open-files
     home.packages = [
       pkgs.kdialog

modules/desktop/environment/home/obs.nix

@@ -1,9 +1,18 @@
-self: {pkgs, ...}: let
+self: {
+  lib,
+  osConfig,
+  pkgs,
+  ...
+}: let
   inherit (self.inputs) nixpkgs-wayland;
-in {
+
-  config = let
   waypkgs = nixpkgs-wayland.packages.${pkgs.system};
+
+  inherit (lib) mkIf;
+
+  cfg = osConfig.roles.desktop;
 in {
+  config = mkIf cfg.enable {
     programs = {
       obs-studio = {
         enable = true;

modules/desktop/environment/modules/audio.nix

@@ -1,9 +1,17 @@
-self: {...}: let
+self: {
+  config,
+  lib,
+  ...
+}: let
   inherit (self.inputs) nix-gaming;
+
+  inherit (lib) mkIf;
+
+  cfg = config.roles.desktop;
 in {
   imports = [nix-gaming.nixosModules.pipewireLowLatency];
 
-  config = {
+  config = mkIf cfg.enable {
     services = {
       pulseaudio.enable = false;
 

modules/desktop/environment/modules/dconf.nix

@@ -1,7 +1,13 @@
-{config, ...}: {
+{
-  config = let
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf;
+
   cfg = config.roles.desktop;
 in {
+  config = mkIf cfg.enable {
     programs.dconf.enable = true;
 
     home-manager.users.${cfg.user} = {

modules/desktop/environment/modules/dolphin.nix

@@ -1,11 +1,14 @@
 {
   config,
+  lib,
   pkgs,
   ...
-}: {
+}: let
-  config = let
+  inherit (lib) mkIf;
+
   cfg = config.roles.desktop;
 in {
+  config = mkIf cfg.enable {
     environment.systemPackages = [
       pkgs.plasma5Packages.kio-admin
     ];

modules/desktop/environment/modules/packages.nix

@@ -6,21 +6,22 @@ self: {
 }: let
   inherit (self.lib.hypr) mkBind;
   inherit (self.inputs) jellyfin-flake;
-in {
-  imports = [./dolphin.nix];
 
-  config = let
+  inherit (lib) getExe mkIf optionals;
-    inherit (lib) getExe map optionals;
   inherit (pkgs.writers) writeTOML;
 
-    flakeDir = config.environment.variables.FLAKE;
   cfg = config.roles.desktop;
+
+  flakeDir = config.environment.variables.FLAKE;
   isNvidia = config.nvidia.enable;
 
   restartTailscale = pkgs.writeShellScriptBin "restartTailscale" ''
     sudo ${pkgs.systemd}/bin/systemctl restart tailscaled.service
   '';
 in {
+  imports = [./dolphin.nix];
+
+  config = mkIf cfg.enable {
     programs.kdeconnect.enable = true;
 
     security.sudo.extraRules = [

modules/desktop/environment/modules/printer.nix

@@ -1,5 +1,14 @@
-{pkgs, ...}: {
+{
-  config = {
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfg = config.roles.desktop;
+in {
+  config = mkIf cfg.enable {
     services = {
       # Enable CUPS to print documents.
       printing = {

modules/desktop/environment/modules/ratbag-mice.nix

@@ -1,7 +1,15 @@
-self: {pkgs, ...}: let
+self: {
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (self.packages.${pkgs.system}) libratbag piper;
+  inherit (lib) mkIf;
+
+  cfg = config.roles.desktop;
 in {
-  config = {
+  config = mkIf cfg.enable {
     services.ratbagd = {
       enable = true;
 

modules/desktop/environment/modules/security.nix

@@ -3,9 +3,9 @@ self: {
   lib,
   pkgs,
   ...
-}: {
+}: let
-  config = let
   inherit (self.lib.hypr) mkBind;
+
   inherit (lib) getExe map mkIf;
 
   cfg = config.roles.desktop;
@@ -41,6 +41,7 @@ self: {
     '';
   };
 in {
+  config = mkIf cfg.enable {
     services.acpid = mkIf cfg.isLaptop {
       enable = true;
 

modules/desktop/manager/ags/default.nix

@@ -1,9 +1,11 @@
 self: {
   config,
+  lib,
   pkgs,
   ...
-}: {
+}: let
-  config = let
+  inherit (lib) mkIf;
+
   cfg = config.roles.desktop;
   agsCfg = hmCfg.programs.ags;
   hmCfg = config.home-manager.users.${cfg.user};
@@ -17,13 +19,14 @@ self: {
     varsTs = homeFiles."${agsCfg.configDir}/widgets/lockscreen/vars.ts".source;
   in
     pkgs.runCommandLocal "agsConfig" {} ''
-        cp -ar ${../../ags/config}/* ./.
+      cp -ar ${self}/modules/ags/config/* ./.
       chmod +w -R ./.
       cp -ar ${varsTs} ./widgets/lockscreen/vars.ts
       cp -ar ${nodeModules} ./node_modules
       ${agsCfg.package}/bin/ags bundle ./app.ts $out
     '';
 in {
+  config = mkIf cfg.enable {
     assertions = [
       {
         assertion = cfg.ags.enable;

modules/desktop/manager/default.nix

@@ -3,13 +3,7 @@ self: {
   lib,
   pkgs,
   ...
-}: {
+}: let
-  imports = [
-    (import ./ags.nix self)
-    (import ./hyprland.nix self)
-  ];
-
-  config = let
   inherit (lib) mkIf;
 
   cfg = config.roles.desktop;
@@ -29,8 +23,13 @@ self: {
     trap 'systemctl --user stop hyprland-session.target; sleep 1' EXIT
     exec Hyprland >/dev/null
   '');
-  in
+in {
-    mkIf cfg.displayManager.enable {
+  imports = [
+    (import ./ags self)
+    (import ./hyprland self)
+  ];
+
+  config = mkIf (cfg.enable && cfg.displayManager.enable) {
     services = {
       displayManager.sessionPackages = [hyprland];
 

modules/desktop/manager/hyprland/default.nix

@@ -3,16 +3,15 @@ self: {
   lib,
   pkgs,
   ...
-}: {
+}: let
-  config = let
-    inherit (lib) optionals;
   inherit (self.lib.hypr) mkAnimation;
 
+  inherit (lib) mkIf optionals;
+
   inherit (import ./setupMonitors.nix {inherit config pkgs;}) setupMonitors;
 
   cfg = config.roles.desktop;
 
-    # Nix stuff
   cfgHypr =
     config
     .home-manager
@@ -22,9 +21,10 @@ self: {
     .windowManager
     .hyprland;
 in {
+  config = mkIf cfg.enable {
     home-manager.users.greeter = {
       imports = [
-        (import ../theme self)
+        (import ../../theme self)
       ];
 
       wayland.windowManager.hyprland = {
@@ -73,5 +73,5 @@ self: {
   };
 
   # For accurate stack trace
-  _file = ./hyprland.nix;
+  _file = ./default.nix;
 }

modules/desktop/theme/cursors/default.nix

@@ -1,12 +1,21 @@
-self: {pkgs, ...}: {
+self: {
-  config = let
+  lib,
+  osConfig,
+  pkgs,
+  ...
+}: let
   inherit (self.scopedPackages.${pkgs.system}) dracula;
 
+  inherit (lib) mkIf;
+
+  cfg = osConfig.roles.desktop;
+
   cursorTheme = dracula.hyprcursor;
   cursorThemeName = "Dracula-cursors";
   hyprcursorThemeName = "Dracula-hyprcursor";
   cursorSize = 24;
 in {
+  config = mkIf cfg.enable {
     home.pointerCursor = {
       name = cursorThemeName;
       package = dracula.gtk;
@@ -35,5 +44,5 @@ self: {pkgs, ...}: {
   };
 
   # For accurate stack trace
-  _file = ./cursors.nix;
+  _file = ./default.nix;
 }

modules/desktop/theme/default.nix

@@ -1,14 +1,23 @@
-self: {...}: {
+self: {
+  lib,
+  osConfig,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfg = osConfig.roles.desktop;
+in {
   imports = [
     ./gtk
-    ./xresources.nix
+    ./xresources
 
-    (import ./cursors.nix self)
+    (import ./cursors self)
-    (import ./qt.nix self)
+    (import ./hyprpaper self)
-    (import ./hyprpaper.nix self)
+    (import ./qt self)
   ];
 
-  config.wayland.windowManager.hyprland = {
+  config = mkIf cfg.enable {
+    wayland.windowManager.hyprland = {
       settings = {
         windowrule = [
           "size 1231 950,title:^(Open Folder)$"
@@ -23,6 +32,7 @@ self: {...}: {
         ];
       };
     };
+  };
 
   # For accurate stack trace
   _file = ./default.nix;

modules/desktop/theme/gtk/default.nix

@@ -3,12 +3,14 @@
   lib,
   osConfig,
   ...
-}: {
+}: let
-  config = let
+  inherit (lib) mkIf;
+
   inherit (import ./gradience.nix {inherit pkgs lib;}) gradience;
 
   cfg = osConfig.roles.desktop;
 in {
+  config = mkIf cfg.enable {
     home.packages = [
       pkgs.gnomeExtensions.user-themes
     ];

modules/desktop/theme/hyprpaper/default.nix

@@ -1,12 +1,17 @@
 self: {
   lib,
+  osConfig,
   pkgs,
   ...
-}: {
+}: let
-  config = let
+  inherit (lib) mkIf;
+
+  cfg = osConfig.roles.desktop;
+
   hyprpaper = self.inputs.hyprpaper.packages.${pkgs.system}.default;
   wallpaper = toString self.scopedPackages.${pkgs.system}.dracula.wallpaper;
 in {
+  config = mkIf cfg.enable {
     home.packages = [hyprpaper];
 
     xdg.configFile."hypr/hyprpaper.conf" = {
@@ -26,5 +31,5 @@ self: {
   };
 
   # For accurate stack trace
-  _file = ./hyprpaper.nix;
+  _file = ./default.nix;
 }

modules/desktop/theme/qt/default.nix

@@ -3,12 +3,14 @@ self: {
   osConfig,
   pkgs,
   ...
-}: {
+}: let
-  config = let
   inherit (self.scopedPackages.${pkgs.system}) dracula;
 
+  inherit (lib) mkIf;
+
   cfg = osConfig.roles.desktop;
 in {
+  config = mkIf cfg.enable {
     home.packages = [
       pkgs.libsForQt5.qtstyleplugin-kvantum
       pkgs.kdePackages.qtstyleplugin-kvantum
@@ -44,5 +46,5 @@ self: {
   };
 
   # For accurate stack trace
-  _file = ./qt.nix;
+  _file = ./default.nix;
 }

modules/desktop/theme/xresources.nix

@@ -1,23 +0,0 @@
-{...}: {
-  xresources.extraConfig = ''
-    ! Dracula Xresources palette
-    *.foreground: #F8F8F2
-    *.background: #282A36
-    *.color0:     #000000
-    *.color8:     #4D4D4D
-    *.color1:     #FF5555
-    *.color9:     #FF6E67
-    *.color2:     #50FA7B
-    *.color10:    #5AF78E
-    *.color3:     #F1FA8C
-    *.color11:    #F4F99D
-    *.color4:     #BD93F9
-    *.color12:    #CAA9FA
-    *.color5:     #FF79C6
-    *.color13:    #FF92D0
-    *.color6:     #8BE9FD
-    *.color14:    #9AEDFE
-    *.color7:     #BFBFBF
-    *.color15:    #E6E6E6
-  '';
-}

modules/desktop/theme/xresources/default.nix

@@ -0,0 +1,36 @@
+{
+  lib,
+  osConfig,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfg = osConfig.roles.desktop;
+in {
+  config = mkIf cfg.enable {
+    xresources.extraConfig = ''
+      ! Dracula Xresources palette
+      *.foreground: #F8F8F2
+      *.background: #282A36
+      *.color0:     #000000
+      *.color8:     #4D4D4D
+      *.color1:     #FF5555
+      *.color9:     #FF6E67
+      *.color2:     #50FA7B
+      *.color10:    #5AF78E
+      *.color3:     #F1FA8C
+      *.color11:    #F4F99D
+      *.color4:     #BD93F9
+      *.color12:    #CAA9FA
+      *.color5:     #FF79C6
+      *.color13:    #FF92D0
+      *.color6:     #8BE9FD
+      *.color14:    #9AEDFE
+      *.color7:     #BFBFBF
+      *.color15:    #E6E6E6
+    '';
+  };
+
+  # For accurate stack trace
+  _file = ./default.nix;
+}

modules/docker/default.nix

@@ -33,7 +33,7 @@ in {
     };
   };
 
-  config = mkIf (cfg.enable) {
+  config = mkIf cfg.enable {
     virtualisation = {
       docker = {
         enable = true;

modules/esphome-plus/default.nix

@@ -51,7 +51,7 @@ in {
     };
   };
 
-  config = mkIf (cfg.enable) {
+  config = mkIf cfg.enable {
     # FIXME: https://github.com/NixOS/nixpkgs/issues/339557
     systemd.services.esphome = {
       environment.PLATFORMIO_CORE_DIR = mkForce "${stateDir}/.platformio";

modules/plymouth/default.nix

@@ -7,7 +7,8 @@
 
   cfg = config.boot.plymouth;
 in {
-  config.boot = mkIf cfg.enable {
+  config = mkIf cfg.enable {
+    boot = {
       initrd = {
         verbose = false;
         systemd.enable = true;
@@ -28,6 +29,7 @@ in {
 
       loader.timeout = 0;
     };
+  };
 
   # For accurate stack trace
   _file = ./default.nix;

modules/server/default.nix

@@ -2,11 +2,16 @@
   inherit (lib) mkOption types;
 in {
   imports = [
-    ./sshd.nix
+    ./sshd
-    ./tailscale.nix
+    ./tailscale
   ];
 
   options.roles.server = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+    };
+
     user = mkOption {
       type = types.str;
       description = ''

modules/server/sshd/default.nix

@@ -7,7 +7,7 @@
 
   cfg = config.roles.server;
 in {
-  config = mkIf cfg.sshd.enable {
+  config = mkIf (cfg.enable && cfg.sshd.enable) {
     services = {
       openssh = {
         enable = true;
@@ -29,5 +29,5 @@ in {
   };
 
   # For accurate stack trace
-  _file = ./sshd.nix;
+  _file = ./default.nix;
 }

modules/server/tailscale/default.nix

@@ -8,7 +8,7 @@
 
   cfg = config.roles.server;
 in {
-  config = mkIf cfg.tailscale.enable {
+  config = mkIf (cfg.enable && cfg.tailscale.enable) {
     services = {
       tailscale = {
         enable = true;
@@ -48,5 +48,5 @@ in {
   };
 
   # For accurate stack trace
-  _file = ./tailscale.nix;
+  _file = ./default.nix;
 }

modules/tmux/default.nix

@@ -4,14 +4,14 @@
   pkgs,
   ...
 }: let
-  inherit (lib) attrValues elemAt hasAttr mkIf mkOption types;
+  inherit (lib) attrValues hasAttr head mkIf mkOption types;
 
   cfg = config.programs.tmux;
 
   # Support NixOnDroid
   firstUser =
     if hasAttr "users" config.home-manager
-    then elemAt (attrValues config.home-manager.users) 0
+    then head (attrValues config.home-manager.users)
     else config.home-manager.config;
 in {
   options.programs.tmux = {

modules/wyoming-plus/default.nix

@@ -9,6 +9,8 @@
   inherit (lib.strings) concatMapStringsSep concatStringsSep;
 
   cfg = config.services.wyoming;
+
+  forkedPkg = pkgs.callPackage ./pkgs {};
 in {
   options.services.wyoming.openwakeword.vadThreshold = mkOption {
     type = types.float;
@@ -16,9 +18,7 @@ in {
     apply = toString;
   };
 
-  config = let
+  config = {
-    forkedPkg = pkgs.callPackage ./pkgs {};
-  in {
     systemd.services = mkIf (cfg.openwakeword.enable) {
       wyoming-openwakeword.serviceConfig = {
         MemoryDenyWriteExecute = mkForce (cfg.openwakeword.package != forkedPkg);