diff --git a/README.md b/README.md new file mode 100644 index 0000000..345e6ae --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +Test diff --git a/modules/editor/neovim/lua/packer/completion.lua b/modules/editor/neovim/lua/packer/completion.lua index ef331a8..be8fc1c 100644 --- a/modules/editor/neovim/lua/packer/completion.lua +++ b/modules/editor/neovim/lua/packer/completion.lua @@ -52,6 +52,15 @@ M.packer = function(use) cmp.setup({ + -- Only enable on non-prompt buffers + -- So don't use in telescope + enabled = function() + if vim.bo.buftype == "prompt" then + return false + end + return true + end, + -- Setup snippet completion snippet = { expand = function(args) @@ -65,6 +74,7 @@ M.packer = function(use) [""] = cmp.mapping(cmp.mapping.select_prev_item(), { "i", "c" }), [""] = cmp.mapping(cmp.mapping.scroll_docs(-4), { "i", "c" }), [""] = cmp.mapping(cmp.mapping.scroll_docs(4), { "i", "c" }), + [""] = cmp.mapping(cmp.mapping.abort(), { "i", "c" }), [""] = function(_) cmp.mapping({ i = cmp.mapping.abort(), diff --git a/modules/editor/neovim/lua/packer/lsp.lua b/modules/editor/neovim/lua/packer/lsp.lua index 981124b..d0f31aa 100644 --- a/modules/editor/neovim/lua/packer/lsp.lua +++ b/modules/editor/neovim/lua/packer/lsp.lua @@ -48,6 +48,9 @@ M.packer = function(use) capabilities = capabilities, }) end + if on_path("rnix-lsp") then + require("lspconfig").rnix.setup({ capabilities = capabilities }) + end vim.keymap.set("n", "gd", vim.lsp.buf.definition) vim.keymap.set("n", "gT", vim.lsp.buf.type_definition) diff --git a/modules/editor/neovim/lua/packer/visuals.lua b/modules/editor/neovim/lua/packer/visuals.lua index c83583e..df9a52d 100644 --- a/modules/editor/neovim/lua/packer/visuals.lua +++ b/modules/editor/neovim/lua/packer/visuals.lua @@ -80,6 +80,21 @@ M.packer = function(use) error = "", }, }, + renderer = { + icons = { + glyphs = { + git = { + unstaged = "~", + staged = "+", + unmerged = "", + renamed = "➜", + deleted = "", + untracked = "?", + ignored = "◌", + }, + }, + }, + }, view = { width = 30, height = 30, diff --git a/modules/programming/nix.nix b/modules/programming/nix.nix index 34f7502..f928118 100644 --- a/modules/programming/nix.nix +++ b/modules/programming/nix.nix @@ -2,10 +2,10 @@ home-manager.users.${config.user} = { - home.packages = with pkgs; - [ - nixfmt # Nix file formatter - ]; + home.packages = with pkgs; [ + nixfmt # Nix file formatter + rnix-lsp # Nix language server + ]; };