diff --git a/user/home.nix b/user/home.nix
index 9c7a45b..a6829f9 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -3,7 +3,7 @@
     ./controller.nix
     ./waybar.nix
     ./helix.nix
-    ./kakoune.nix
+    ./kakoune
     ./fish
     ./firefox.nix
     ./hyprland.nix
diff --git a/user/kakoune.nix b/user/kakoune/default.nix
similarity index 93%
rename from user/kakoune.nix
rename to user/kakoune/default.nix
index 2699903..a1f7a92 100644
--- a/user/kakoune.nix
+++ b/user/kakoune/default.nix
@@ -22,14 +22,14 @@ in
         with colors;
         lib.concatStringsSep "\n"
           (map (lib.readFile) ([
-            ./kak/filetypes.kak
-            ./kak/hooks.kak
-            ./kak/indent.kak
-            ./kak/keys.kak
-            ./kak/plug.kak
-            ./kak/usermode.kak
-            ./kak/git-mode.kak
-          ] ++ lib.optional (dmenu == "rofi") ./kak/rofi-commands.kak)) + ''
+            ./filetypes.kak
+            ./hooks.kak
+            ./indent.kak
+            ./keys.kak
+            ./plug.kak
+            ./usermode.kak
+            ./git-mode.kak
+          ] ++ lib.optional (dmenu == "rofi") ./rofi-commands.kak)) + ''
 
         set global scrolloff 10,20
         set global autoreload yes
@@ -129,7 +129,7 @@ in
             Hint = "blue";
           }));
     };
-    home.file = { ".config/kak-lsp/kak-lsp.toml".source = ./kak/kak-lsp.toml; };
+    home.file = { ".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml; };
     home.packages = with pkgs; [
       kakoune
       terminal
diff --git a/user/kak/filetypes.kak b/user/kakoune/filetypes.kak
similarity index 100%
rename from user/kak/filetypes.kak
rename to user/kakoune/filetypes.kak
diff --git a/user/kak/git-mode.kak b/user/kakoune/git-mode.kak
similarity index 100%
rename from user/kak/git-mode.kak
rename to user/kakoune/git-mode.kak
diff --git a/user/kak/hooks.kak b/user/kakoune/hooks.kak
similarity index 100%
rename from user/kak/hooks.kak
rename to user/kakoune/hooks.kak
diff --git a/user/kak/indent.kak b/user/kakoune/indent.kak
similarity index 100%
rename from user/kak/indent.kak
rename to user/kakoune/indent.kak
diff --git a/user/kak/kak-lsp.toml b/user/kakoune/kak-lsp.toml
similarity index 100%
rename from user/kak/kak-lsp.toml
rename to user/kakoune/kak-lsp.toml
diff --git a/user/kak/kakrc b/user/kakoune/kakrc
similarity index 100%
rename from user/kak/kakrc
rename to user/kakoune/kakrc
diff --git a/user/kak/keys.kak b/user/kakoune/keys.kak
similarity index 100%
rename from user/kak/keys.kak
rename to user/kakoune/keys.kak
diff --git a/user/kak/plug.kak b/user/kakoune/plug.kak
similarity index 100%
rename from user/kak/plug.kak
rename to user/kakoune/plug.kak
diff --git a/user/kak/rofi-commands.kak b/user/kakoune/rofi-commands.kak
similarity index 100%
rename from user/kak/rofi-commands.kak
rename to user/kakoune/rofi-commands.kak
diff --git a/user/kak/usermode.kak b/user/kakoune/usermode.kak
similarity index 100%
rename from user/kak/usermode.kak
rename to user/kakoune/usermode.kak