Skip to content

Commit c138910

Browse files
committed
bring config up to date with kickstart
1 parent bb4b6c7 commit c138910

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

lua/config/autocmds.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ autocmd("TextYankPost", {
5353
desc = "Highlight when yanking text",
5454
group = augroup("highlight-yank"),
5555
callback = function()
56-
vim.highlight.on_yank()
56+
vim.hl.on_yank()
5757
end,
5858
})
5959

lua/config/options.lua

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vim.g.picker = "snacks" -- fzf or snacks
44
vim.g.prettier_tool = "prettierd" -- prettier or prettierd
55
vim.g.statusline = "lualine" -- lualine or heirline
66

7-
local opt = vim.opt
7+
local opt = vim.o
88

99
-- Sync clipboard between OS and Neovim.
1010
-- Schedule the setting after `UiEnter` because it can increase startup-time.
@@ -21,14 +21,14 @@ opt.breakindent = true -- Visually indent wrapped lines
2121
opt.conceallevel = 2 -- Hide * markup for bold and italic, but not markers with substitutions
2222
opt.confirm = true -- Confirm to save changes before exiting modified buffer
2323
opt.cursorline = true -- Show which line your cursor is on
24-
opt.diffopt:append("iwhite") -- Ignore whitespace in diff mode
24+
vim.opt.diffopt:append("iwhite") -- Ignore whitespace in diff mode
2525
opt.grepformat = "%f:%l:%c:%m" -- Set grep format
2626
opt.grepprg = "rg --vimgrep" -- Use ripgrep as grepprg
2727
opt.ignorecase = true -- Case-insensitive searching unless \C
2828
opt.inccommand = "split" -- Preview substitutions live, as you type!
2929
opt.laststatus = 3 -- Global statusline
3030
opt.list = true -- Display whitespace characters
31-
opt.listchars = { tab = "» ", trail = "·", nbsp = "" } -- Strings to use in list mode
31+
vim.opt.listchars = { tab = "» ", trail = "·", nbsp = "" } -- Strings to use in list mode
3232
opt.mouse = "a" -- Enable mouse mode
3333
opt.number = true -- Show line number
3434
opt.relativenumber = true -- Relative line numbers
@@ -50,10 +50,10 @@ opt.wrap = false -- Disable line wrap
5050

5151
-- Fold settings for ufo plugin.
5252
-- They need to be defined here instead of inside the plugin config because it causes issues with neotree.
53-
vim.o.foldcolumn = "0" -- 0 or 1
54-
vim.o.foldlevel = 99
55-
vim.o.foldlevelstart = 99
56-
vim.o.foldenable = true
53+
opt.foldcolumn = "0" -- 0 or 1
54+
opt.foldlevel = 99
55+
opt.foldlevelstart = 99
56+
opt.foldenable = true
5757

5858
-- Filetype mappings
5959
vim.filetype.add({

lua/plugins/debug.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ return {
1717
"nvim-neotest/nvim-nio",
1818

1919
-- Installs the debug adapters for you
20-
"williamboman/mason.nvim",
20+
"mason-org/mason.nvim",
2121
"jay-babu/mason-nvim-dap.nvim",
2222

2323
-- Add your own debuggers here

lua/plugins/editor.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
return {
22
{
3-
"tpope/vim-sleuth",
3+
"NMAC427/guess-indent.nvim",
44
event = "LazyFile",
55
},
66

lua/plugins/lint.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ return {
4949
-- Only run the linter in buffers that you can modify in order to
5050
-- avoid superfluous noise, notably within the handy LSP pop-ups that
5151
-- describe the hovered symbol using Markdown.
52-
if vim.opt_local.modifiable:get() then
52+
if vim.bo.modifiable then
5353
lint.try_lint()
5454
end
5555
end,

lua/plugins/neo-tree.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ return {
55
"nvim-lua/plenary.nvim",
66
"MunifTanjim/nui.nvim",
77
},
8-
cmd = "Neotree",
8+
lazy = false, -- neo-tree will lazily load itself
99
keys = {
1010
{
1111
"<leader>e",

0 commit comments

Comments
 (0)