diff --git a/hosts/work/home-config.nix b/hosts/work/home-config.nix index 4ba15cc..e1b4578 100644 --- a/hosts/work/home-config.nix +++ b/hosts/work/home-config.nix @@ -14,8 +14,9 @@ git = { enable = true; userEmail = "ybarbanneau@sellsy.com"; - signingKey = "6E1A834E282FBD98B48069444447A19BBEDB8DBA"; + signingKey ="6E1A834E282FBD98B48069444447A19BBEDB8DBA"; signByDefault = true; + signingKey="6E1A834E282FBD98B48069444447A19BBEDB8DBA"; }; neovim.enable = true; starship.enable = true; diff --git a/modules/home-manager/cli/neovim/default.nix b/modules/home-manager/cli/neovim/default.nix index 1932b2e..507e21f 100644 --- a/modules/home-manager/cli/neovim/default.nix +++ b/modules/home-manager/cli/neovim/default.nix @@ -177,6 +177,20 @@ in config = ( builtins.readFile ./files/plugins/treesitter_context.lua); } + { + plugin = lspsaga-nvim; + type = "lua"; + config = '' + require('lspsaga').setup { + ui = { + code_action = '' + }, + lightbulb = { + virtual_text = false + } + } + ''; + } { plugin = which-key-nvim; type = "lua"; diff --git a/modules/home-manager/cli/neovim/files/options.lua b/modules/home-manager/cli/neovim/files/options.lua index b683e0a..bee83db 100644 --- a/modules/home-manager/cli/neovim/files/options.lua +++ b/modules/home-manager/cli/neovim/files/options.lua @@ -66,16 +66,16 @@ vim.opt.completeopt = {'menu', 'menuone', 'noselect'} vim.cmd('au BufWinLeave *.* mkview') vim.cmd('au BufWinEnter *.* silent! loadview') --- local signs = { Error = "", Warn = "", Hint = "󰌶", Info = "" } --- for type, icon in pairs(signs) do --- local hl = "DiagnosticSign" .. type --- vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl }) --- end +local signs = { Error = "", Warn = "", Hint = "󰌶", Info = "" } +for type, icon in pairs(signs) do + local hl = "DiagnosticSign" .. type + vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl }) +end -- You will likely want to reduce updatetime which affects CursorHold -- note: this setting is global and should be set only once vim.o.updatetime = 250 --- vim.cmd [[autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {scope='cursor', header = "", prefix = "", focus=false})]] +vim.cmd [[autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {scope='cursor', header = "", prefix = "", focus=false})]] -- Autotype vim.cmd('au BufRead,BufNewFile *.nix setlocal tabstop=2 shiftwidth=2 ') @@ -124,13 +124,12 @@ vim.g.matchparen_insert_timeout = 2 -- activate virtual lines for diagnistics -- no more plugins needed -local x = vim.diagnostic.severity vim.diagnostic.config({ - virtual_lines = true, + virtual_lines = true + -- Alternatively, customize specific options -- virtual_lines = { -- -- Only show virtual line diagnostics for the current cursor line -- current_line = true, -- }, - signs = { text = { [x.ERROR] = "󰅙", [x.WARN] = "", [x.INFO] = "󰋼", [x.HINT] = "󰌵" } }, }) diff --git a/modules/home-manager/cli/neovim/files/plugins/blink-cmp.lua b/modules/home-manager/cli/neovim/files/plugins/blink-cmp.lua index f5aad60..1d42f63 100644 --- a/modules/home-manager/cli/neovim/files/plugins/blink-cmp.lua +++ b/modules/home-manager/cli/neovim/files/plugins/blink-cmp.lua @@ -1,14 +1,8 @@ require("blink.cmp").setup({ keymap = { - preset = "none", + preset = "cmdline", [''] = { 'scroll_documentation_up', 'fallback' }, [''] = { 'scroll_documentation_down', 'fallback' }, - [''] = { 'select_next', 'fallback' }, - [''] = { 'select_prev', 'fallback' }, - [''] = { 'show', 'fallback' }, - [''] = { 'select_and_accept' }, - [''] = { 'cancel' }, - }, completion = { menu = { @@ -44,16 +38,6 @@ require("blink.cmp").setup({ "dictionary", }, providers = { - path = { - module = 'blink.cmp.sources.path', - score_offset = 3, - opts = { - trailing_slash = false, - label_trailing_slash = false, - get_cwd = function(context) return vim.fn.expand(('#%d:p:h'):format(context.bufnr)) end, - show_hidden_files_by_default = true, - } - }, emoji = { module = "blink-emoji", name = "Emoji", @@ -77,26 +61,8 @@ require("blink.cmp").setup({ end, }, }, - buffer = { - module = 'blink.cmp.sources.buffer', - score_offset = -3, - min_keyword_length = 4, - opts = { - -- default to all visible buffers - get_bufnrs = function() - return vim - .iter(vim.api.nvim_list_wins()) - :map(function(win) return vim.api.nvim_win_get_buf(win) end) - :filter(function(buf) return vim.bo[buf].buftype ~= 'nofile' end) - :totable() - end, - } - }, }, }, - fuzzy = { - max_typos = function() return 0 end, - }, cmdline = { enabled = false, }, diff --git a/modules/home-manager/cli/starship/default.nix b/modules/home-manager/cli/starship/default.nix index 65db136..e04bc4c 100644 --- a/modules/home-manager/cli/starship/default.nix +++ b/modules/home-manager/cli/starship/default.nix @@ -22,9 +22,9 @@ in format = "[$read_only]($read_only_style)[$path]($style) "; }; character = { - success_symbol = "[](green)"; + success_symbol = "[](purple)"; error_symbol = "[](red)"; - vimcmd_symbol = "[](blue)"; + vimcmd_symbol = "[](green)"; }; git_branch = { format = "[$branch]($style)";