diff --git a/hosts/skadi/configuration.nix b/hosts/skadi/configuration.nix
index e87dc6a..7af15a4 100644
--- a/hosts/skadi/configuration.nix
+++ b/hosts/skadi/configuration.nix
@@ -232,7 +232,6 @@
   crony.secrets.enable = true;
   crony.boot.enable = true;
   crony.ollama.enable = true;
-  crony.kanata.enable = true;
 
   # Mount additional drive for games
   fileSystems."/mnt/games" = {
diff --git a/modules/cross-platform/home-manager/neovim.nix b/modules/cross-platform/home-manager/neovim.nix
index 94230ed..450e28a 100644
--- a/modules/cross-platform/home-manager/neovim.nix
+++ b/modules/cross-platform/home-manager/neovim.nix
@@ -289,11 +289,7 @@ in {
             helpview-nvim.package = helpview-nvim;
           };
 
-          treesitter.grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
-            qmljs
-            kdl
-            regex
-          ];
+          extraPackages = with pkgs.vimPlugins; [nvim-treesitter-parsers.qmljs];
         };
       };
     };
diff --git a/modules/linux/nixos/default.nix b/modules/linux/nixos/default.nix
index fc66e83..bc2563c 100644
--- a/modules/linux/nixos/default.nix
+++ b/modules/linux/nixos/default.nix
@@ -26,7 +26,6 @@
     ./secrets.nix
     ./oom.nix
     ./boot.nix
-    ./kanata.nix
   ];
 
   crony.bluetooth.enable = lib.mkDefault true;
@@ -55,5 +54,4 @@
   crony.secrets.enable = lib.mkDefault false;
   crony.oom.enable = lib.mkDefault true;
   crony.boot.enable = lib.mkDefault false;
-  crony.kanata.enable = lib.mkDefault false;
 }
diff --git a/modules/linux/nixos/kanata.nix b/modules/linux/nixos/kanata.nix
deleted file mode 100644
index 3c552a1..0000000
--- a/modules/linux/nixos/kanata.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: {
-  options = {
-    crony.kanata.enable = lib.mkEnableOption "Enable and setup kanata";
-  };
-
-  config = lib.mkIf config.crony.kanata.enable {
-    hardware.uinput.enable = true;
-    services.kanata = {
-      enable = true;
-      keyboards."based".config = ''
-        (defsrc
-          caps)
-
-        (deflayermap (default-layer)
-          ;; tap caps lock as caps lock, hold caps lock as left control
-          caps (tap-hold 100 100 esc lctl))
-      '';
-    };
-  };
-}