From 478081af928e1557b325f4a4cbd5b67f079660d2 Mon Sep 17 00:00:00 2001
From: Arpit Chakladar <54011232+arpitchakladar@users.noreply.github.com>
Date: Wed, 25 Sep 2024 19:41:02 +0530
Subject: Adding nnn file manager.

Adding bspwm bindings to sxhkd only if the module is enabled.
---
 modules/tools/editor/neovim/config/default.nix     |  4 ++++
 modules/tools/editor/neovim/config/keybindings.lua |  8 ++++++++
 modules/tools/editor/neovim/config/options.lua     | 21 +++++++++++++++++++++
 modules/tools/editor/neovim/default.nix            | 11 ++---------
 modules/tools/editor/neovim/keybindings.lua        |  8 --------
 modules/tools/editor/neovim/options.lua            | 21 ---------------------
 modules/tools/editor/neovim/plugins/default.nix    |  9 +++++++++
 modules/tools/editor/neovim/plugins/treesitter.nix |  2 +-
 8 files changed, 45 insertions(+), 39 deletions(-)
 create mode 100644 modules/tools/editor/neovim/config/default.nix
 create mode 100644 modules/tools/editor/neovim/config/keybindings.lua
 create mode 100644 modules/tools/editor/neovim/config/options.lua
 delete mode 100644 modules/tools/editor/neovim/keybindings.lua
 delete mode 100644 modules/tools/editor/neovim/options.lua
 create mode 100644 modules/tools/editor/neovim/plugins/default.nix

(limited to 'modules/tools/editor')

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/config/keybindings.lua b/modules/tools/editor/neovim/config/keybindings.lua
new file mode 100644
index 0000000..3e8e0fa
--- /dev/null
+++ b/modules/tools/editor/neovim/config/keybindings.lua
@@ -0,0 +1,8 @@
+-- Navigate splits
+vim.keymap.set("n", "<C-h>", ":wincmd h<CR>", { silent = true });
+vim.keymap.set("n", "<C-j>", ":wincmd j<CR>", { silent = true });
+vim.keymap.set("n", "<C-k>", ":wincmd k<CR>", { silent = true });
+vim.keymap.set("n", "<C-l>", ":wincmd l<CR>", { silent = true });
+
+-- NvimTree
+vim.keymap.set("n", "<C-n>", ":NvimTreeToggle<CR>", { silent = true });
diff --git a/modules/tools/editor/neovim/config/options.lua b/modules/tools/editor/neovim/config/options.lua
new file mode 100644
index 0000000..b1fe9cb
--- /dev/null
+++ b/modules/tools/editor/neovim/config/options.lua
@@ -0,0 +1,21 @@
+vim.g.mapleader = " ";
+vim.g.maplocalleader = " ";
+
+vim.o.clipboard = "unnamedplus";
+
+vim.o.number = true;
+vim.o.list = true;
+vim.o.listchars = "tab:| ,trail:_,lead:_";
+
+vim.o.laststatus = 3;
+
+vim.o.signcolumn = "auto";
+vim.opt.fillchars = { eob = " " };
+
+vim.o.tabstop = 2;
+vim.o.shiftwidth = 2;
+vim.o.expandtab = false;
+
+vim.o.updatetime = 300;
+
+vim.o.mouse = "a";
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/keybindings.lua b/modules/tools/editor/neovim/keybindings.lua
deleted file mode 100644
index 3e8e0fa..0000000
--- a/modules/tools/editor/neovim/keybindings.lua
+++ /dev/null
@@ -1,8 +0,0 @@
--- Navigate splits
-vim.keymap.set("n", "<C-h>", ":wincmd h<CR>", { silent = true });
-vim.keymap.set("n", "<C-j>", ":wincmd j<CR>", { silent = true });
-vim.keymap.set("n", "<C-k>", ":wincmd k<CR>", { silent = true });
-vim.keymap.set("n", "<C-l>", ":wincmd l<CR>", { silent = true });
-
--- NvimTree
-vim.keymap.set("n", "<C-n>", ":NvimTreeToggle<CR>", { silent = true });
diff --git a/modules/tools/editor/neovim/options.lua b/modules/tools/editor/neovim/options.lua
deleted file mode 100644
index b1fe9cb..0000000
--- a/modules/tools/editor/neovim/options.lua
+++ /dev/null
@@ -1,21 +0,0 @@
-vim.g.mapleader = " ";
-vim.g.maplocalleader = " ";
-
-vim.o.clipboard = "unnamedplus";
-
-vim.o.number = true;
-vim.o.list = true;
-vim.o.listchars = "tab:| ,trail:_,lead:_";
-
-vim.o.laststatus = 3;
-
-vim.o.signcolumn = "auto";
-vim.opt.fillchars = { eob = " " };
-
-vim.o.tabstop = 2;
-vim.o.shiftwidth = 2;
-vim.o.expandtab = false;
-
-vim.o.updatetime = 300;
-
-vim.o.mouse = "a";
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 {
-- 
cgit v1.2.3