nix/configuration/hosts/odo/default.nix

@@ -36,11 +36,7 @@
   me.chromium.enable = true;
   me.docker.enable = true;
   me.emacs_flavor = "full";
-  me.firefox.enable = true;
-  me.git.config = ./roles/git/files/gitconfig_home;
   me.graphical = true;
   me.graphics_card_type = "amd";
-  me.kanshi.enable = true;
-  me.kubernetes.enable = true;
   me.sway.enable = true;
 }

nix/configuration/roles/firefox/default.nix

@@ -8,18 +8,6 @@
 {
   imports = [ ];
 
-  options.me = {
-    firefox.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install firefox.";
-    };
-  };
-
-  config = lib.mkIf config.me.firefox.enable (
-    lib.mkMerge [
-      (lib.mkIf config.me.graphical {
   programs.firefox = {
     enable = true;
     package = (pkgs.wrapFirefox (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { });
@@ -130,7 +118,4 @@
       ];
     };
   };
-      })
-    ]
-  );
 }

nix/configuration/roles/fonts/default.nix

@@ -8,7 +8,6 @@
 {
   imports = [ ];
 
-  config = lib.mkIf config.me.graphical {
   fonts = {
     enableDefaultPackages = false;
     packages = with pkgs; [
@@ -25,5 +24,4 @@
       useEmbeddedBitmaps = true;
     };
   };
-  };
 }

nix/configuration/roles/git/default.nix

@@ -8,78 +8,15 @@
 {
   imports = [ ];
 
-  options.me = {
-    git.config = lib.mkOption {
-      type = lib.types.nullOr lib.types.path;
-      default = null;
-      example = ./files/gitconfig_home;
-      description = "A git config file.";
-    };
-  };
-
-  config = lib.mkMerge [
-    {
   environment.systemPackages = with pkgs; [
     git
   ];
-    }
+
-    (lib.mkIf (config.me.git.config != null) {
   home-manager.users.talexander =
     { pkgs, ... }:
     {
       home.file.".gitconfig" = {
-            source = config.me.git.config;
+        source = ./files/gitconfig_home;
       };
     };
-    })
-    (lib.mkIf (config.me.graphical) {
-      nixpkgs.overlays = [
-        (final: prev: {
-          git = pkgs.buildEnv {
-            name = prev.git.name;
-            paths = [
-              prev.git
-            ];
-            extraOutputsToInstall = [
-              "man"
-              "doc"
-              "info"
-            ];
-            buildInputs = [ final.makeWrapper ];
-            postBuild = ''
-              wrapProgram $out/bin/git --prefix PATH : ${
-                lib.makeBinPath [
-                  final.meld
-                ]
-              }
-            '';
-          };
-        })
-      ];
-    })
-    (lib.mkIf (!config.me.graphical) {
-      nixpkgs.overlays = [
-        (final: prev: {
-          git = pkgs.buildEnv {
-            name = prev.git.name;
-            paths = [
-              prev.git
-            ];
-            extraOutputsToInstall = [
-              "man"
-              "doc"
-              "info"
-            ];
-            buildInputs = [ final.makeWrapper ];
-            postBuild = ''
-              wrapProgram $out/bin/git --prefix PATH : ${
-                lib.makeBinPath [
-                ]
-              }
-            '';
-          };
-        })
-      ];
-    })
-  ];
 }

nix/configuration/roles/kanshi/default.nix

@@ -17,22 +17,6 @@ in
 {
   imports = [ ];
 
-  options.me = {
-    kanshi.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install kanshi.";
-    };
-  };
-
-  config = lib.mkIf config.me.kanshi.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = with pkgs; [
-        ];
-      }
-      (lib.mkIf config.me.graphical {
   environment.systemPackages = with pkgs; [
     kanshi
   ];
@@ -50,7 +34,4 @@ in
         };
       };
     };
-      })
-    ]
-  );
 }

nix/configuration/roles/kubernetes/default.nix

@@ -32,18 +32,6 @@ in
 {
   imports = [ ];
 
-  options.me = {
-    kubernetes.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install kubernetes.";
-    };
-  };
-
-  config = lib.mkIf config.me.kubernetes.enable (
-    lib.mkMerge [
-      {
   environment.systemPackages = with pkgs; [
     kubectl
     kubeswitch
@@ -70,7 +58,5 @@ in
       ];
     };
   };
-      }
+
-    ]
-  );
 }