diff options
Diffstat (limited to 'modules/tools/nixvim/plugins')
| -rw-r--r-- | modules/tools/nixvim/plugins/cmp.nix | 36 | ||||
| -rw-r--r-- | modules/tools/nixvim/plugins/comment.nix | 6 | ||||
| -rw-r--r-- | modules/tools/nixvim/plugins/default.nix | 27 | ||||
| -rw-r--r-- | modules/tools/nixvim/plugins/indent-blankline.nix | 12 | ||||
| -rw-r--r-- | modules/tools/nixvim/plugins/lsp.nix | 95 | ||||
| -rw-r--r-- | modules/tools/nixvim/plugins/lualine.nix | 70 | ||||
| -rw-r--r-- | modules/tools/nixvim/plugins/luasnip.nix | 6 | ||||
| -rw-r--r-- | modules/tools/nixvim/plugins/noice.nix | 28 | ||||
| -rw-r--r-- | modules/tools/nixvim/plugins/notify.nix | 6 | ||||
| -rw-r--r-- | modules/tools/nixvim/plugins/nvim-tree.nix | 82 | ||||
| -rw-r--r-- | modules/tools/nixvim/plugins/treesitter.nix | 20 | ||||
| -rw-r--r-- | modules/tools/nixvim/plugins/web-devicons.nix | 6 | ||||
| -rw-r--r-- | modules/tools/nixvim/plugins/which-key.nix | 22 |
13 files changed, 215 insertions, 201 deletions
diff --git a/modules/tools/nixvim/plugins/cmp.nix b/modules/tools/nixvim/plugins/cmp.nix index b02c17e..855a4d5 100644 --- a/modules/tools/nixvim/plugins/cmp.nix +++ b/modules/tools/nixvim/plugins/cmp.nix @@ -1,22 +1,22 @@ { config, lib, ... }: { - config.programs.nixvim.plugins.cmp = lib.mkIf config.tools.nixvim.enable { - enable = true; - autoEnableSources = true; - settings = { - snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end"; - mapping = { - "<C-Space>" = "cmp.mapping.complete()"; - "<CR>" = "cmp.mapping.confirm({ select = true })"; - "<Tab>" = "cmp.mapping.select_next_item()"; - "<S-Tab>" = "cmp.mapping.select_prev_item()"; - }; - sources = [ - { name = "nvim_lsp"; } - { name = "path"; } - { name = "buffer"; } - ]; - }; - }; + config.programs.nixvim.plugins.cmp = lib.mkIf config.tools.nixvim.enable { + enable = true; + autoEnableSources = true; + settings = { + snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end"; + mapping = { + "<C-Space>" = "cmp.mapping.complete()"; + "<CR>" = "cmp.mapping.confirm({ select = true })"; + "<Tab>" = "cmp.mapping.select_next_item()"; + "<S-Tab>" = "cmp.mapping.select_prev_item()"; + }; + sources = [ + { name = "nvim_lsp"; } + { name = "path"; } + { name = "buffer"; } + ]; + }; + }; } diff --git a/modules/tools/nixvim/plugins/comment.nix b/modules/tools/nixvim/plugins/comment.nix index ae53f8d..7032997 100644 --- a/modules/tools/nixvim/plugins/comment.nix +++ b/modules/tools/nixvim/plugins/comment.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { - config.programs.nixvim.plugins.comment = lib.mkIf config.tools.nixvim.enable { - enable = true; - }; + config.programs.nixvim.plugins.comment = lib.mkIf config.tools.nixvim.enable { + enable = true; + }; } diff --git a/modules/tools/nixvim/plugins/default.nix b/modules/tools/nixvim/plugins/default.nix index 7599b74..48eaf93 100644 --- a/modules/tools/nixvim/plugins/default.nix +++ b/modules/tools/nixvim/plugins/default.nix @@ -1,17 +1,18 @@ { ... }: { - imports = [ - ./cmp.nix - ./comment.nix - ./lsp.nix - ./lualine.nix - ./luasnip.nix - ./noice.nix - ./notify.nix - ./nvim-tree.nix - ./treesitter.nix - ./web-devicons.nix - ./which-key.nix - ]; + imports = [ + ./cmp.nix + ./comment.nix + ./indent-blankline.nix + ./lsp.nix + ./lualine.nix + ./luasnip.nix + ./noice.nix + ./notify.nix + ./nvim-tree.nix + ./treesitter.nix + ./web-devicons.nix + ./which-key.nix + ]; } diff --git a/modules/tools/nixvim/plugins/indent-blankline.nix b/modules/tools/nixvim/plugins/indent-blankline.nix new file mode 100644 index 0000000..0c99ee2 --- /dev/null +++ b/modules/tools/nixvim/plugins/indent-blankline.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: + +{ + config.programs.nixvim.plugins.indent-blankline = lib.mkIf config.tools.nixvim.enable { + enable = true; + settings = { + indent = { + char = "┊"; + }; + }; + }; +} diff --git a/modules/tools/nixvim/plugins/lsp.nix b/modules/tools/nixvim/plugins/lsp.nix index f11cf00..f2b7b2b 100644 --- a/modules/tools/nixvim/plugins/lsp.nix +++ b/modules/tools/nixvim/plugins/lsp.nix @@ -1,51 +1,52 @@ { config, lib, ... }: { - config.programs.nixvim.plugins.lsp = lib.mkIf config.tools.nixvim.enable { - enable = true; - keymaps.lspBuf = { - K = "hover"; - gD = "references"; - gd = "definition"; - gi = "implementation"; - gt = "type_definition"; - }; - servers = { - nil_ls = { - enable = true; - }; - lua_ls = { - enable = true; - package = null; - }; - nixd = { - enable = true; - package = null; - }; - pyright = { - enable = true; - package = null; - }; - ts_ls = { - enable = true; - package = null; - }; - clangd = { - enable = true; - package = null; - }; - jsonls = { - enable = true; - package = null; - }; - yamlls = { - enable = true; - package = null; - }; - bash-language-server = { - enable = true; - package = null; - }; - }; - }; + config.programs.nixvim.plugins.lsp = lib.mkIf config.tools.nixvim.enable { + enable = true; + inlayHints = true; + keymaps.lspBuf = { + K = "hover"; + gD = "references"; + gd = "definition"; + gi = "implementation"; + gt = "type_definition"; + }; + servers = { + nil_ls = { + enable = true; + }; + lua_ls = { + enable = true; + package = null; + }; + nixd = { + enable = true; + package = null; + }; + pyright = { + enable = true; + package = null; + }; + ts_ls = { + enable = true; + package = null; + }; + clangd = { + enable = true; + package = null; + }; + jsonls = { + enable = true; + package = null; + }; + yamlls = { + enable = true; + package = null; + }; + bash-language-server = { + enable = true; + package = null; + }; + }; + }; } diff --git a/modules/tools/nixvim/plugins/lualine.nix b/modules/tools/nixvim/plugins/lualine.nix index 8d13399..3138887 100644 --- a/modules/tools/nixvim/plugins/lualine.nix +++ b/modules/tools/nixvim/plugins/lualine.nix @@ -1,39 +1,39 @@ { config, lib, ... }: { - config.programs.nixvim.plugins.lualine = lib.mkIf config.tools.nixvim.enable { - enable = true; - settings = { - options = { - theme = with config.scheme.withHashtag; { - normal = { - a = { fg = base00; bg = base0D; gui = "bold"; }; - b = { fg = base05; bg = base01; }; - c = { fg = base05; bg = base00; }; - }; - insert = { - a = { fg = base00; bg = base0B; gui = "bold"; }; - b = { fg = base05; bg = base01; }; - c = { fg = base05; bg = base00; }; - }; - visual = { - a = { fg = base00; bg = base0A; gui = "bold"; }; - b = { fg = base05; bg = base01; }; - c = { fg = base05; bg = base00; }; - }; - replace = { - a = { fg = base00; bg = base08; gui = "bold"; }; - b = { fg = base05; bg = base01; }; - c = { fg = base05; bg = base00; }; - }; - inactive = { - a = { fg = base04; bg = base00; gui = "bold"; }; - b = { fg = base04; bg = base00; }; - c = { fg = base04; bg = base00; }; - }; - }; - icons_enabled = true; - }; - }; - }; + config.programs.nixvim.plugins.lualine = lib.mkIf config.tools.nixvim.enable { + enable = true; + settings = { + options = { + theme = with config.scheme.withHashtag; { + normal = { + a = { fg = base00; bg = base0D; gui = "bold"; }; + b = { fg = base05; bg = base01; }; + c = { fg = base05; bg = base00; }; + }; + insert = { + a = { fg = base00; bg = base0B; gui = "bold"; }; + b = { fg = base05; bg = base01; }; + c = { fg = base05; bg = base00; }; + }; + visual = { + a = { fg = base00; bg = base0A; gui = "bold"; }; + b = { fg = base05; bg = base01; }; + c = { fg = base05; bg = base00; }; + }; + replace = { + a = { fg = base00; bg = base08; gui = "bold"; }; + b = { fg = base05; bg = base01; }; + c = { fg = base05; bg = base00; }; + }; + inactive = { + a = { fg = base04; bg = base00; gui = "bold"; }; + b = { fg = base04; bg = base00; }; + c = { fg = base04; bg = base00; }; + }; + }; + icons_enabled = true; + }; + }; + }; } diff --git a/modules/tools/nixvim/plugins/luasnip.nix b/modules/tools/nixvim/plugins/luasnip.nix index 80483a7..dfa0618 100644 --- a/modules/tools/nixvim/plugins/luasnip.nix +++ b/modules/tools/nixvim/plugins/luasnip.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { - config.programs.nixvim.plugins.luasnip = lib.mkIf config.tools.nixvim.enable { - enable = true; - }; + config.programs.nixvim.plugins.luasnip = lib.mkIf config.tools.nixvim.enable { + enable = true; + }; } diff --git a/modules/tools/nixvim/plugins/noice.nix b/modules/tools/nixvim/plugins/noice.nix index a149ee8..313df4b 100644 --- a/modules/tools/nixvim/plugins/noice.nix +++ b/modules/tools/nixvim/plugins/noice.nix @@ -1,18 +1,18 @@ { config, lib, ... }: { - config.programs.nixvim.plugins.noice = lib.mkIf config.tools.nixvim.enable { - enable = true; - cmdline = { - enabled = true; - view = "cmdline_popup"; - }; - popupmenu = { - enabled = true; - backend = "cmp"; - }; - presets = { - command_palette = true; - }; - }; + config.programs.nixvim.plugins.noice = lib.mkIf config.tools.nixvim.enable { + enable = true; + cmdline = { + enabled = true; + view = "cmdline_popup"; + }; + popupmenu = { + enabled = true; + backend = "cmp"; + }; + presets = { + command_palette = true; + }; + }; } diff --git a/modules/tools/nixvim/plugins/notify.nix b/modules/tools/nixvim/plugins/notify.nix index 09ac9cb..7f77536 100644 --- a/modules/tools/nixvim/plugins/notify.nix +++ b/modules/tools/nixvim/plugins/notify.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { - config.programs.nixvim.plugins.notify = lib.mkIf config.tools.nixvim.enable { - enable = false; - }; + config.programs.nixvim.plugins.notify = lib.mkIf config.tools.nixvim.enable { + enable = false; + }; } diff --git a/modules/tools/nixvim/plugins/nvim-tree.nix b/modules/tools/nixvim/plugins/nvim-tree.nix index 9e2e55e..813bd30 100644 --- a/modules/tools/nixvim/plugins/nvim-tree.nix +++ b/modules/tools/nixvim/plugins/nvim-tree.nix @@ -1,45 +1,45 @@ { config, lib, ... }: { - config.programs.nixvim.plugins.nvim-tree = lib.mkIf config.tools.nixvim.enable { - enable = true; - settings = { - filters = { - dotfiles = false; - git_clean = false; - no_buffer = false; - custom = {}; - }; - git = { - enable = true; - ignore = false; - }; - view = { - width = { - padding = 0; - }; - }; - renderer = { - indent_markers = { - enable = true; - inline_arrows = false; - icons = { - corner = "└"; - edge = "│"; - item = "├"; - bottom = "─"; - none = " "; - }; - }; - icons = { - show = { - folder = true; - folder_arrow = false; - file = true; - git = true; - }; - }; - }; - }; - }; + config.programs.nixvim.plugins.nvim-tree = lib.mkIf config.tools.nixvim.enable { + enable = true; + settings = { + filters = { + dotfiles = false; + git_clean = false; + no_buffer = false; + custom = {}; + }; + git = { + enable = true; + ignore = false; + }; + view = { + width = { + padding = 0; + }; + }; + renderer = { + indent_markers = { + enable = true; + inline_arrows = false; + icons = { + corner = "└"; + edge = "│"; + item = "├"; + bottom = "─"; + none = " "; + }; + }; + icons = { + show = { + folder = true; + folder_arrow = false; + file = true; + git = true; + }; + }; + }; + }; + }; } diff --git a/modules/tools/nixvim/plugins/treesitter.nix b/modules/tools/nixvim/plugins/treesitter.nix index f13c84e..7100ba1 100644 --- a/modules/tools/nixvim/plugins/treesitter.nix +++ b/modules/tools/nixvim/plugins/treesitter.nix @@ -1,14 +1,14 @@ { config, lib, ... }: { - config.programs.nixvim.plugins.treesitter = lib.mkIf config.tools.nixvim.enable { - enable = true; - folding = { - enable = true; - }; - settings = { - highlight = { enable = true; }; - indent = { enable = true; }; - }; - }; + config.programs.nixvim.plugins.treesitter = lib.mkIf config.tools.nixvim.enable { + enable = true; + folding = { + enable = true; + }; + settings = { + highlight = { enable = true; }; + indent = { enable = true; }; + }; + }; } diff --git a/modules/tools/nixvim/plugins/web-devicons.nix b/modules/tools/nixvim/plugins/web-devicons.nix index 6cbfcd0..4d70fcb 100644 --- a/modules/tools/nixvim/plugins/web-devicons.nix +++ b/modules/tools/nixvim/plugins/web-devicons.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { - config.programs.nixvim.plugins.web-devicons = lib.mkIf config.tools.nixvim.enable { - enable = true; - }; + config.programs.nixvim.plugins.web-devicons = lib.mkIf config.tools.nixvim.enable { + enable = true; + }; } diff --git a/modules/tools/nixvim/plugins/which-key.nix b/modules/tools/nixvim/plugins/which-key.nix index 99f4393..e5b96a5 100644 --- a/modules/tools/nixvim/plugins/which-key.nix +++ b/modules/tools/nixvim/plugins/which-key.nix @@ -1,15 +1,15 @@ { config, lib, ... }: { - config.programs.nixvim.plugins.which-key = lib.mkIf config.tools.nixvim.enable { - enable = true; - settings = { - plugins = { - marks = true; - registers = true; - spelling = { enabled = true; suggestions = 20; }; - }; - win = { border = "single"; }; - }; - }; + config.programs.nixvim.plugins.which-key = lib.mkIf config.tools.nixvim.enable { + enable = true; + settings = { + plugins = { + marks = true; + registers = true; + spelling = { enabled = true; suggestions = 20; }; + }; + win = { border = "single"; }; + }; + }; } |
