6 files changed, 16 insertions, 10 deletions
diff --git a/modules/tools/editor/neovim/config/default.nix b/modules/tools/editor/neovim/config/default.nix
new file mode 100644
index 0000000..4514d2f
--- /dev/null
+++ b/modules/tools/editor/neovim/config/default.nix
@@ -0,0 +1,4 @@
+''
+${builtins.readFile ./options.lua}
+${builtins.readFile ./keybindings.lua}
+''
diff --git a/modules/tools/editor/neovim/keybindings.lua b/modules/tools/editor/neovim/config/keybindings.lua
index 3e8e0fa..3e8e0fa 100644
--- a/modules/tools/editor/neovim/keybindings.lua
+++ b/modules/tools/editor/neovim/config/keybindings.lua
diff --git a/modules/tools/editor/neovim/options.lua b/modules/tools/editor/neovim/config/options.lua
index b1fe9cb..b1fe9cb 100644
--- a/modules/tools/editor/neovim/options.lua
+++ b/modules/tools/editor/neovim/config/options.lua
diff --git a/modules/tools/editor/neovim/default.nix b/modules/tools/editor/neovim/default.nix
index 6cf3b50..87fad55 100644
--- a/modules/tools/editor/neovim/default.nix
+++ b/modules/tools/editor/neovim/default.nix
@@ -18,15 +18,8 @@
 
 		programs.neovim.extraLuaConfig =
 	''
-	${builtins.readFile ./options.lua}
-	${builtins.readFile ./keybindings.lua}
-
-	-- Plugins configuration
-	${builtins.readFile ./plugins/comment.lua}
-	${builtins.readFile ./plugins/lualine.lua}
-	${import ./plugins/treesitter.nix config}
-	${builtins.readFile ./plugins/base16.lua}
-	${builtins.readFile ./plugins/nvim-tree.lua}
+${import ./config}
+${import ./plugins { inherit config; }}
 	'';
 
 		programs.neovim.plugins = with pkgs.vimPlugins; [
diff --git a/modules/tools/editor/neovim/plugins/default.nix b/modules/tools/editor/neovim/plugins/default.nix
new file mode 100644
index 0000000..2df4e4a
--- /dev/null
+++ b/modules/tools/editor/neovim/plugins/default.nix
@@ -0,0 +1,9 @@
+{ config }:
+
+''
+${builtins.readFile ./comment.lua}
+${builtins.readFile ./lualine.lua}
+${import ./treesitter.nix { inherit config; }}
+${builtins.readFile ./base16.lua}
+${builtins.readFile ./nvim-tree.lua}
+''
diff --git a/modules/tools/editor/neovim/plugins/treesitter.nix b/modules/tools/editor/neovim/plugins/treesitter.nix
index 05f1f2a..be0bdb6 100644
--- a/modules/tools/editor/neovim/plugins/treesitter.nix
+++ b/modules/tools/editor/neovim/plugins/treesitter.nix
@@ -1,4 +1,4 @@
-config:
+{ config }:
 
 ''
 require("nvim-treesitter.configs").setup {