nix/configuration/hosts/odo/default.nix

@@ -31,9 +31,6 @@
 
   me.alacritty.enable = true;
   me.ansible.enable = true;
-  me.ares.enable = true;
-  me.chromecast.enable = true;
-  me.chromium.enable = true;
   me.emacs_flavor = "full";
   me.graphical = true;
   me.graphicsCardType = "amd";

nix/configuration/roles/ares/default.nix

@@ -8,23 +8,7 @@
 {
   imports = [ ];
 
-  options.me = {
+  environment.systemPackages = with pkgs; [
-    ares.enable = lib.mkOption {
+    ares
-      type = lib.types.bool;
+  ];
-      default = false;
-      example = true;
-      description = "Whether we want to install ares.";
-    };
-  };
-
-  config = lib.mkIf config.me.ares.enable (
-    lib.mkMerge [
-      { }
-      (lib.mkIf config.me.graphical {
-        environment.systemPackages = with pkgs; [
-          ares
-        ];
-      })
-    ]
-  );
 }

nix/configuration/roles/chromecast/default.nix

@@ -8,24 +8,7 @@
 {
   imports = [ ];
 
-  options.me = {
+  environment.systemPackages = with pkgs; [
-    chromecast.enable = lib.mkOption {
+    catt
-      type = lib.types.bool;
+  ];
-      default = false;
-      example = true;
-      description = "Whether we want to install chromecast.";
-    };
-  };
-
-  config = lib.mkIf config.me.chromecast.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = with pkgs; [
-          catt
-        ];
-      }
-      (lib.mkIf config.me.graphical {
-      })
-    ]
-  );
 }

nix/configuration/roles/chromium/default.nix

@@ -8,58 +8,45 @@
 {
   imports = [ ];
 
-  options.me = {
+  # TODO: Read https://bbs.archlinux.org/viewtopic.php?pid=2209507#p2209507 and apply desired settings.
-    chromium.enable = lib.mkOption {
+
-      type = lib.types.bool;
+  environment.systemPackages = with pkgs; [
-      default = false;
+    (chromium.override { enableWideVine = true; })
-      example = true;
+  ];
-      description = "Whether we want to install chromium.";
+
+  allowedUnfree = [
+    "chromium"
+    "chromium-unwrapped"
+    "widevine-cdm"
+  ];
+
+  environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+    hideMounts = true;
+    users.talexander = {
+      directories = [
+        {
+          directory = ".config/chromium";
+          user = "talexander";
+          group = "talexander";
+          mode = "0700";
+        }
+      ];
+    };
+  };
+  environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
+    hideMounts = true;
+    users.talexander = {
+      directories = [
+        {
+          directory = ".cache/chromium";
+          user = "talexander";
+          group = "talexander";
+          mode = "0700";
+        }
+      ];
     };
   };
 
-  config = lib.mkIf config.me.chromium.enable (
+  # Enabling vulkan causes video to render as white
-    lib.mkMerge [
+  # nixpkgs.config.chromium.commandLineArgs = "--enable-features=Vulkan";
-      { }
-      (lib.mkIf config.me.graphical {
-        environment.systemPackages = with pkgs; [
-          (chromium.override { enableWideVine = true; })
-        ];
-        allowedUnfree = [
-          "chromium"
-          "chromium-unwrapped"
-          "widevine-cdm"
-        ];
-
-        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
-          hideMounts = true;
-          users.talexander = {
-            directories = [
-              {
-                directory = ".config/chromium";
-                user = "talexander";
-                group = "talexander";
-                mode = "0700";
-              }
-            ];
-          };
-        };
-        environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
-          hideMounts = true;
-          users.talexander = {
-            directories = [
-              {
-                directory = ".cache/chromium";
-                user = "talexander";
-                group = "talexander";
-                mode = "0700";
-              }
-            ];
-          };
-        };
-
-        # Enabling vulkan causes video to render as white
-        # nixpkgs.config.chromium.commandLineArgs = "--enable-features=Vulkan";
-      })
-    ]
-  );
 }