nix/configuration/hosts/neelix/default.nix

@@ -30,6 +30,4 @@
   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,9 +54,4 @@
   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,18 +8,7 @@
 {
   imports = [ ];
 
-  options.me = {
+  config = lib.mkIf config.me.graphical {
-    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"
@@ -56,7 +45,5 @@
           source = ./files/keybindings.json;
         };
       };
-      })
+  };
-    ]
-  );
 }

nix/configuration/roles/wasm/default.nix

@@ -8,24 +8,9 @@
 {
   imports = [ ];
 
-  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,7 +4,6 @@
   pkgs,
   ...
 }:
-
 let
   waybar_sway_config = pkgs.writeTextFile {
     name = "waybar.conf";
@@ -80,18 +79,6 @@ in
 {
   imports = [ ];
 
-  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
@@ -125,7 +112,5 @@ in
         };
       };
     };
-      })
+
-    ]
-  );
 }

nix/configuration/roles/zrepl/default.nix

@@ -8,18 +8,6 @@
 {
   imports = [ ];
 
-  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 = {
@@ -55,6 +43,3 @@
     };
   };
 }
-    ]
-  );
-}

nix/configuration/roles/zsh/default.nix

@@ -55,18 +55,6 @@ in
 {
   imports = [ ];
 
-  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
   ];
@@ -100,6 +88,3 @@ in
     };
   };
 }
-    ]
-  );
-}