hm modules: gate behind enable options, always import

homeConfigurations/muede/default.nix

@@ -23,6 +23,15 @@
   ];
 
   config = {
+    my = {
+      # keep-sorted start
+      gnome-extensions.enable = true;
+      nano.enable = true;
+      templates.enable = true;
+      zsh.enable = true;
+      # keep-sorted end
+    };
+
     programs = {
       home-manager.enable = true;
       fzf.enable = true;

homeConfigurations/ronja/default.nix

@@ -2,6 +2,14 @@
 {
   imports = [ ./vscode.nix ];
   config = {
+    my = {
+      # keep-sorted start
+      nano.enable = true;
+      templates.enable = true;
+      zsh.enable = true;
+      # keep-sorted end
+    };
+
     home.packages = with pkgs; [
       ## Apps
       telegram-desktop

homeModules/gnome-extensions.nix

@@ -18,7 +18,7 @@
         };
     in
     {
-      enable = mkDefaultEnabledOption "gnome extended options";
+      enable = lib.mkEnableOption "gnome extended options";
       appindicator.enable = mkDefaultEnabledOption "appindicator";
       caffeine.enable = mkDefaultEnabledOption "caffeine";
       tailscale-qs.enable = lib.mkOption {

homeModules/nano.nix

@@ -1,9 +1,14 @@
+{ lib, config, ... }:
 {
-  home = {
+  options.my.nano.enable = lib.mkEnableOption "nano editor config";
-    sessionVariables.EDITOR = "nano";
+
-    file.".nanorc".text = ''
+  config = lib.mkIf config.my.nano.enable {
-      set linenumbers
+    home = {
-      set mouse
+      sessionVariables.EDITOR = "nano";
-    '';
+      file.".nanorc".text = ''
+        set linenumbers
+        set mouse
+      '';
+    };
   };
 }

homeModules/tailscale.nix

@@ -1,4 +1,12 @@
-{ osConfig, thisDevice, ... }:
+{ lib, config, osConfig, thisDevice, ... }:
 {
-  services.tailscale-systray.enable = (thisDevice.isDesktop or false) && osConfig.my.tailscale.enable;
+  options.my.tailscale.enable = lib.mkOption {
+    type = lib.types.bool;
+    default = (thisDevice.isDesktop or false) && osConfig.my.tailscale.enable;
+    description = "Whether to enable the Tailscale system tray applet. Defaults to true on desktops with Tailscale enabled.";
+  };
+
+  config = lib.mkIf config.my.tailscale.enable {
+    services.tailscale-systray.enable = true;
+  };
 }

homeModules/templates.nix

@@ -1,12 +1,17 @@
+{ lib, config, ... }:
 {
-  home.file = {
+  options.my.templates.enable = lib.mkEnableOption "file templates";
-    "Templates/Empty file".text = "";
+
-    "Templates/Empty bash script".text = ''
+  config = lib.mkIf config.my.templates.enable {
-      #!/usr/bin/env bash
+    home.file = {
-      # abort on error, undefined variables
+      "Templates/Empty file".text = "";
-      set -eu
+      "Templates/Empty bash script".text = ''
-      # print commands before execution
+        #!/usr/bin/env bash
-      set -x
+        # abort on error, undefined variables
-    '';
+        set -eu
+        # print commands before execution
+        set -x
+      '';
+    };
   };
 }

homeModules/zsh-basics.nix

@@ -1,13 +1,18 @@
+{ lib, config, ... }:
 {
-  programs = {
+  options.my.zsh.enable = lib.mkEnableOption "zsh with basic settings";
-    command-not-found.enable = true;
-    dircolors.enable = true;
 
-    zsh = {
+  config = lib.mkIf config.my.zsh.enable {
-      enable = true;
+    programs = {
-      syntaxHighlighting.enable = true;
+      command-not-found.enable = true;
-      autosuggestion.enable = true;
+      dircolors.enable = true;
-      enableVteIntegration = true;
+
+      zsh = {
+        enable = true;
+        syntaxHighlighting.enable = true;
+        autosuggestion.enable = true;
+        enableVteIntegration = true;
+      };
     };
   };
 }

nixosConfigurations.nix

@@ -96,16 +96,7 @@ forDevice (
           useGlobalPkgs = true;
           useUserPackages = true;
           users = home-manager-users;
-          sharedModules = [
+          sharedModules = [ { home.stateVersion = "22.11"; } ] ++ builtins.attrValues self.homeModules;
-            { home.stateVersion = "22.11"; }
-            # keep-sorted start
-            self.homeModules.gnome-extensions
-            self.homeModules.nano
-            self.homeModules.tailscale
-            self.homeModules.templates
-            self.homeModules.zsh-basics
-            # keep-sorted end
-          ];
         };
 
         time.timeZone = "Europe/Berlin";