diff --git a/nix/configuration/configuration.nix b/nix/configuration/configuration.nix
index 93effa2..b7a8691 100644
--- a/nix/configuration/configuration.nix
+++ b/nix/configuration/configuration.nix
@@ -56,6 +56,7 @@
     ./roles/vnc_client
     ./roles/chromecast
     ./roles/memtest86
+    ./roles/kodi
   ];
 
   nix.settings.experimental-features = [
diff --git a/nix/configuration/roles/blank/default.nix b/nix/configuration/roles/blank/default.nix
index 7f220e5..0b9310b 100644
--- a/nix/configuration/roles/blank/default.nix
+++ b/nix/configuration/roles/blank/default.nix
@@ -8,6 +8,23 @@
 {
   imports = [ ];
 
-  environment.systemPackages = with pkgs; [
-  ];
+  options.me = {
+    blank.enabled = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install blank.";
+    };
+  };
+
+  config = lib.mkIf config.me.blank.enabled (
+    lib.mkMerge [
+      {
+        environment.systemPackages = with pkgs; [
+        ];
+      }
+      (lib.mkIf config.me.graphical {
+      })
+    ]
+  );
 }
diff --git a/nix/configuration/roles/kodi/default.nix b/nix/configuration/roles/kodi/default.nix
new file mode 100644
index 0000000..e2e227f
--- /dev/null
+++ b/nix/configuration/roles/kodi/default.nix
@@ -0,0 +1,30 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [ ];
+
+  options.me = {
+    kodi.enabled = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install kodi.";
+    };
+  };
+
+  config = lib.mkIf config.me.kodi.enabled (
+    lib.mkMerge [
+      {
+        environment.systemPackages = with pkgs; [
+        ];
+      }
+      (lib.mkIf config.me.graphical {
+      })
+    ]
+  );
+}
diff --git a/nix/configuration/roles/sway/default.nix b/nix/configuration/roles/sway/default.nix
index 74faeb5..634d0a9 100644
--- a/nix/configuration/roles/sway/default.nix
+++ b/nix/configuration/roles/sway/default.nix
@@ -266,6 +266,15 @@ in
     ./notification.nix
   ];
 
+  options.me = {
+    sway.enabled = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install sway.";
+    };
+  };
+
   options.me.swayIncludes = lib.mkOption {
     type = lib.types.listOf lib.types.package;
     default = [ ];