diff --git a/flake.nix b/flake.nix
index b98de1a5..f614a31b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,6 +54,8 @@
               enable = true;
               servers.clangd.enable = true;
             };
+
+            plugins.treesitter.enable = true;
           };
         })
       ];
diff --git a/plugins/languages/treesitter.nix b/plugins/languages/treesitter.nix
index f95514ce..3c7e175a 100644
--- a/plugins/languages/treesitter.nix
+++ b/plugins/languages/treesitter.nix
@@ -30,19 +30,16 @@ in
       incrementalSelection = let
         keymap = default: mkOption {
           type = types.str;
-          default = default;
+          inherit default;
+        };
+      in {
+        enable = mkEnableOption "Incremental selection based on the named nodes from the grammar";
+        keymaps = {
+          initSelection = keymap "gnn";
+          nodeIncremental = keymap "grn";
+          scopeIncremental = keymap "grc";
+          nodeDecremental = keymap "grm";
         };
-      in mkOption {
-        type = types.nullOr (types.submodule {
-          enable = mkEnableOption "Incremental selection based on the named nodes from the grammar";
-          keymaps = {
-            initSelection = keymap "gnn";
-            nodeIncremental = keymap "grn";
-            scopeIncremental = keymap "grc";
-            nodeDecremental = keymap "grm";
-          };
-        });
-        default = null;
       };
 
       indent = mkEnableOption "Enable tree-sitter based indentation";
@@ -60,17 +57,17 @@ in
         custom_captures = mkIf (cfg.customCaptures != {}) cfg.customCaptures;
       };
 
-      incremental_selection = mkIf cfg.incrementalSelection.enable {
-        enable = true;
-        keymaps = {
-          init_selection = cfg.incrementalSelection.keymaps.initSelection;
-          node_incremental = cfg.incrementalSelection.keymaps.nodeIncremental;
-          scope_incremental = cfg.incrementalSelection.keymaps.scopeIncremental;
-          node_decremental = cfg.incrementalSelection.keymaps.nodeDecremental;
-        };
-      };
+      # incremental_selection = mkIf cfg.incrementalSelection.enable {
+      #   enable = true;
+      #   keymaps = {
+      #     init_selection = cfg.incrementalSelection.keymaps.initSelection;
+      #     node_incremental = cfg.incrementalSelection.keymaps.nodeIncremental;
+      #     scope_incremental = cfg.incrementalSelection.keymaps.scopeIncremental;
+      #     node_decremental = cfg.incrementalSelection.keymaps.nodeDecremental;
+      #   };
+      # };
 
-      indent = mkIf cfg.indent.enable {
+      indent = mkIf cfg.indent {
         enable = true;
       };