diff --git a/modules/system/comma.nix b/modules/system/comma.nix
index 9941069..c7df872 100644
--- a/modules/system/comma.nix
+++ b/modules/system/comma.nix
@@ -3,14 +3,16 @@
     config,
     lib,
     ...
-}: {
+}: let
+    cfg = config.myConfig.comma;
+in {
     imports = [inputs.nix-index-database.nixosModules.nix-index];
 
     options.myConfig.comma.enable = lib.mkEnableOption "";
 
-    config = lib.mkIf config.myConfig.comma.enable {
-        programs.command-not-found.enable = false;
-        programs.nix-index.enable = true;
-        programs.nix-index-database.comma.enable = true;
+    config = {
+        programs.command-not-found.enable = !cfg.enable;
+        programs.nix-index.enable = cfg.enable;
+        programs.nix-index-database.comma.enable = cfg.enable;
     };
 }