Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ nvim

spell/
lazy-lock.json

.DS_Store
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `<your_github_username>` in the commands below
> `rez1coder` with `<your_github_username>` in the commands below

<details><summary> Linux and Mac </summary>

```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
```

</details>
Expand All @@ -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"
```

</details>
Expand Down
2 changes: 1 addition & 1 deletion lua/keymaps.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { 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
Expand Down
22 changes: 21 additions & 1 deletion lua/kickstart/plugins/blink-cmp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
-- },
},
},

Expand Down
1 change: 1 addition & 0 deletions lua/kickstart/plugins/which-key.lua
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ return {
{ '<leader>s', group = '[S]earch', mode = { 'n', 'v' } },
{ '<leader>t', group = '[T]oggle' },
{ '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
{ 'gr', group = 'LSP Actions', mode = { 'n' } },
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion lua/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '␣' }

Expand Down