Make zsh install conditional.

nix/configuration/hosts/neelix/default.nix

@@ -30,4 +30,6 @@
   me.kodi.enable = true;
   me.lvfs.enable = true;
   me.sound.enable = true;
+  me.zrepl.enable = true;
+  me.zsh.enable = true;
 }

nix/configuration/hosts/odo/default.nix

@@ -54,4 +54,9 @@
   me.sway.enable = true;
   me.terraform.enable = true;
   me.vnc_client.enable = true;
+  me.vscode.enable = true;
+  me.wasm.enable = true;
+  me.waybar.enable = true;
+  me.zrepl.enable = true;
+  me.zsh.enable = true;
 }

nix/configuration/roles/vscode/default.nix

@@ -8,42 +8,55 @@
 {
   imports = [ ];
 
-  config = lib.mkIf config.me.graphical {
-    allowedUnfree = [
-      "vscode"
-      "vscode-with-extensions"
-      "vscode-extension-ms-vscode-remote-remote-ssh"
-    ];
-
-    environment.systemPackages = with pkgs; [
-      (vscode-with-extensions.override {
-        vscodeExtensions = with vscode-extensions; [
-          bbenoist.nix
-          ms-python.python
-          ms-azuretools.vscode-docker
-          ms-vscode-remote.remote-ssh
-        ]
-        # ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-        #   {
-        #     name = "remote-ssh-edit";
-        #     publisher = "ms-vscode-remote";
-        #     version = "0.47.2";
-        #     sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
-        #   }
-        # ]
-        ;
-      })
-    ];
-
-    home-manager.users.talexander =
-      { pkgs, ... }:
-      {
-        home.file.".config/Code/User/settings.json" = {
-          source = ./files/settings.json;
-        };
-        home.file.".config/Code/User/keybindings.json" = {
-          source = ./files/keybindings.json;
-        };
-      };
+  options.me = {
+    vscode.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install vscode.";
+    };
   };
+
+  config = lib.mkIf config.me.vscode.enable (
+    lib.mkMerge [
+      (lib.mkIf config.me.graphical {
+        allowedUnfree = [
+          "vscode"
+          "vscode-with-extensions"
+          "vscode-extension-ms-vscode-remote-remote-ssh"
+        ];
+
+        environment.systemPackages = with pkgs; [
+          (vscode-with-extensions.override {
+            vscodeExtensions = with vscode-extensions; [
+              bbenoist.nix
+              ms-python.python
+              ms-azuretools.vscode-docker
+              ms-vscode-remote.remote-ssh
+            ]
+            # ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+            #   {
+            #     name = "remote-ssh-edit";
+            #     publisher = "ms-vscode-remote";
+            #     version = "0.47.2";
+            #     sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
+            #   }
+            # ]
+            ;
+          })
+        ];
+
+        home-manager.users.talexander =
+          { pkgs, ... }:
+          {
+            home.file.".config/Code/User/settings.json" = {
+              source = ./files/settings.json;
+            };
+            home.file.".config/Code/User/keybindings.json" = {
+              source = ./files/keybindings.json;
+            };
+          };
+      })
+    ]
+  );
 }

nix/configuration/roles/wasm/default.nix

@@ -8,9 +8,24 @@
 {
   imports = [ ];
 
-  environment.systemPackages = with pkgs; [
-    wabt
-    wasm-bindgen-cli
-    binaryen # for wasm-opt
-  ];
+  options.me = {
+    wasm.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install wasm.";
+    };
+  };
+
+  config = lib.mkIf config.me.wasm.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = with pkgs; [
+          wabt
+          wasm-bindgen-cli
+          binaryen # for wasm-opt
+        ];
+      }
+    ]
+  );
 }

nix/configuration/roles/waybar/default.nix

@@ -4,6 +4,7 @@
   pkgs,
   ...
 }:
+
 let
   waybar_sway_config = pkgs.writeTextFile {
     name = "waybar.conf";
@@ -79,38 +80,52 @@ in
 {
   imports = [ ];
 
-  environment.systemPackages = with pkgs; [
-    waybar
-    waybar_available_memory
-    waybar_battery
-    waybar_clock
-    waybar_night_mode
-    waybar_sound
-    waybar_temperature
-    python3 # for clock TODO python should not be in the system packages, maybe switch to a venv? ref https://nixos.wiki/wiki/Python
-    bc # for temperature and sound
-    jq # for memory, battery, sound, night mode, and temperature
-    upower # for battery
-    wlsunset # for night mode
-  ];
-
-  me.swayIncludes = [
-    waybar_sway_config
-  ];
-
-  services.upower.enable = true; # for battery
-
-  home-manager.users.talexander =
-    { pkgs, ... }:
-    {
-      home.file = {
-        ".config/waybar/config" = {
-          source = ./files/waybar_config.json;
-        };
-        ".config/waybar/style.css" = {
-          source = ./files/style.css;
-        };
-      };
+  options.me = {
+    waybar.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install waybar.";
     };
+  };
 
+  config = lib.mkIf config.me.waybar.enable (
+    lib.mkMerge [
+      (lib.mkIf config.me.graphical {
+        environment.systemPackages = with pkgs; [
+          waybar
+          waybar_available_memory
+          waybar_battery
+          waybar_clock
+          waybar_night_mode
+          waybar_sound
+          waybar_temperature
+          python3 # for clock TODO python should not be in the system packages, maybe switch to a venv? ref https://nixos.wiki/wiki/Python
+          bc # for temperature and sound
+          jq # for memory, battery, sound, night mode, and temperature
+          upower # for battery
+          wlsunset # for night mode
+        ];
+
+        me.swayIncludes = [
+          waybar_sway_config
+        ];
+
+        services.upower.enable = true; # for battery
+
+        home-manager.users.talexander =
+          { pkgs, ... }:
+          {
+            home.file = {
+              ".config/waybar/config" = {
+                source = ./files/waybar_config.json;
+              };
+              ".config/waybar/style.css" = {
+                source = ./files/style.css;
+              };
+            };
+          };
+      })
+    ]
+  );
 }

nix/configuration/roles/zrepl/default.nix

@@ -8,38 +8,53 @@
 {
   imports = [ ];
 
-  services.zrepl = {
-    enable = true;
-    settings = {
-      jobs = [
-        {
-          name = "snapjob";
-          type = "snap";
-          filesystems = {
-            "zroot/linux/nix/persist<" = true;
-            "zroot/bridge<" = true;
-          };
-          snapshotting = {
-            type = "periodic";
-            interval = "15m";
-            prefix = "zrepl_";
-          };
-          pruning = {
-            keep = [
+  options.me = {
+    zrepl.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install zrepl.";
+    };
+  };
+
+  config = lib.mkIf config.me.zrepl.enable (
+    lib.mkMerge [
+      {
+        services.zrepl = {
+          enable = true;
+          settings = {
+            jobs = [
               {
-                type = "grid";
-                grid = "1x1h(keep=all) | 24x1h | 14x1d";
-                regex = "^zrepl_.*";
-              }
-              {
-                type = "regex";
-                negate = true;
-                regex = "^zrepl_.*";
+                name = "snapjob";
+                type = "snap";
+                filesystems = {
+                  "zroot/linux/nix/persist<" = true;
+                  "zroot/bridge<" = true;
+                };
+                snapshotting = {
+                  type = "periodic";
+                  interval = "15m";
+                  prefix = "zrepl_";
+                };
+                pruning = {
+                  keep = [
+                    {
+                      type = "grid";
+                      grid = "1x1h(keep=all) | 24x1h | 14x1d";
+                      regex = "^zrepl_.*";
+                    }
+                    {
+                      type = "regex";
+                      negate = true;
+                      regex = "^zrepl_.*";
+                    }
+                  ];
+                };
               }
             ];
           };
-        }
-      ];
-    };
-  };
+        };
+      }
+    ]
+  );
 }

nix/configuration/roles/zsh/default.nix

@@ -55,36 +55,51 @@ in
 {
   imports = [ ];
 
-  environment.systemPackages = with pkgs; [
-    zsh
-  ];
-
-  users.users.talexander.shell = pkgs.zsh;
-  environment.shells = with pkgs; [ zsh ];
-
-  programs.zsh = {
-    enable = true;
-  };
-
-  home-manager.users.talexander =
-    { pkgs, ... }:
-    {
-      home.file.".zshrc" = {
-        source = "${zshrc}";
-      };
-    };
-
-  environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
-    hideMounts = true;
-    users.talexander = {
-      directories = [
-        {
-          directory = ".histdb";
-          user = "talexander";
-          group = "talexander";
-          mode = "0700";
-        }
-      ];
+  options.me = {
+    zsh.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install zsh.";
     };
   };
+
+  config = lib.mkIf config.me.zsh.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = with pkgs; [
+          zsh
+        ];
+
+        users.users.talexander.shell = pkgs.zsh;
+        environment.shells = with pkgs; [ zsh ];
+
+        programs.zsh = {
+          enable = true;
+        };
+
+        home-manager.users.talexander =
+          { pkgs, ... }:
+          {
+            home.file.".zshrc" = {
+              source = "${zshrc}";
+            };
+          };
+
+        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            directories = [
+              {
+                directory = ".histdb";
+                user = "talexander";
+                group = "talexander";
+                mode = "0700";
+              }
+            ];
+          };
+        };
+      }
+    ]
+  );
 }