diff --git a/modules/roles/base.nix b/modules/roles/base.nix
index e750b55..8da9f51 100644
--- a/modules/roles/base.nix
+++ b/modules/roles/base.nix
@@ -7,7 +7,10 @@
 }:
 {
   options.custom = {
-    base.enable = lib.mkEnableOption "base configuration for my hosts";
+    base.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+    };
     networking.guaPref = lib.mkOption {
       type = with lib.types; nullOr (strMatching "^[0-9a-zA-Z:]+$");
       default = "2001:14ba:a090:39";
@@ -15,10 +18,7 @@
     };
   };
 
-  config = {
-    custom.base.enable = lib.mkDefault true;
-  }
-  // (lib.mkIf config.custom.base.enable {
+  config = lib.mkIf config.custom.base.enable {
     ######################################## Packages ###############################################
     environment.systemPackages = with pkgs; [
       tmux
@@ -196,5 +196,5 @@
       efi.canTouchEfiVariables = lib.mkDefault true;
       timeout = lib.mkDefault 0;
     };
-  });
+  };
 }