diff --git a/.gitignore b/.gitignore index 005b535..42cdf68 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ nvim spell/ lazy-lock.json + +.DS_Store \ No newline at end of file diff --git a/README.md b/README.md index c9c3443..ec8ce80 100644 --- a/README.md +++ b/README.md @@ -78,12 +78,12 @@ too - it's ignored in the kickstart repo to make maintenance easier, but it's > [!NOTE] > If following the recommended step above (i.e., forking the repo), replace -> `dam9000` with `` in the commands below +> `rez1coder` with `` in the commands below
Linux and Mac ```sh -git clone --branch rez1-maintained-upstream-modular --depth 1 https://github.com/rez1coder/kickstart-modular.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim +git clone --depth 1 https://github.com/rez1coder/rez1.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim ```
@@ -93,13 +93,13 @@ git clone --branch rez1-maintained-upstream-modular --depth 1 https://github.com If you're using `cmd.exe`: ``` -git clone --branch rez1-maintained-upstream-modular --depth 1 https://github.com/rez1coder/kickstart-modular.nvim.git "%localappdata%\nvim" +git clone --depth 1 https://github.com/rez1coder/rez1.nvim.git "%localappdata%\nvim" ``` If you're using `powershell.exe` ``` -git clone --branch rez1-maintained-upstream-modular --depth 1 https://github.com/rez1coder/kickstart-modular.nvim.git "${env:LOCALAPPDATA}\nvim" +git clone --depth 1 https://github.com/rez1coder/rez1.nvim.git "${env:LOCALAPPDATA}\nvim" ``` diff --git a/lua/keymaps.lua b/lua/keymaps.lua index c033be8..7636035 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -46,7 +46,7 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the upper win vim.api.nvim_create_autocmd('TextYankPost', { desc = 'Highlight when yanking (copying) text', group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), - callback = function() vim.hl.on_yank() end, + callback = function() vim.hl.on_yank { timeout = 200 } end, }) -- Better Esc key diff --git a/lua/kickstart/plugins/blink-cmp.lua b/lua/kickstart/plugins/blink-cmp.lua index 6f8694d..1bf3850 100644 --- a/lua/kickstart/plugins/blink-cmp.lua +++ b/lua/kickstart/plugins/blink-cmp.lua @@ -76,9 +76,29 @@ return { }, sources = { - default = { 'lsp', 'path', 'snippets', 'lazydev' }, + default = { 'lsp', 'path', 'snippets', 'lazydev', 'buffer' }, providers = { lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, + buffer = { + -- Make buffer compeletions appear at the end. + score_offset = -100, + enabled = function() + -- Filetypes for which buffer completions are enabled; add filetypes to extend: + local enabled_filetypes = { + 'markdown', + 'text', + } + local filetype = vim.bo.filetype + return vim.tbl_contains(enabled_filetypes, filetype) + end, + }, + -- On WSL2, blink.cmp may cause the editor to freeze due to a known limitation. + -- To address this issue, uncomment the following configuration: + -- cmdline = { + -- enabled = function() + -- return vim.fn.getcmdtype() ~= ':' or not vim.fn.getcmdline():match "^[%%0-9,'<>%-]*!" + -- end, + -- }, }, }, diff --git a/lua/kickstart/plugins/which-key.lua b/lua/kickstart/plugins/which-key.lua index c0b740d..0483741 100644 --- a/lua/kickstart/plugins/which-key.lua +++ b/lua/kickstart/plugins/which-key.lua @@ -65,6 +65,7 @@ return { { 's', group = '[S]earch', mode = { 'n', 'v' } }, { 't', group = '[T]oggle' }, { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, + { 'gr', group = 'LSP Actions', mode = { 'n' } }, }, }, }, diff --git a/lua/options.lua b/lua/options.lua index 0570a0d..1f7c19b 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -51,7 +51,7 @@ vim.o.splitbelow = true -- Notice listchars is set using `vim.opt` instead of `vim.o`. -- It is very similar to `vim.o` but offers an interface for conveniently interacting with tables. -- See `:help lua-options` --- and `:help lua-options-guide` +-- and `:help lua-guide-options` vim.o.list = true vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }