This commit is contained in:
Zackarias Montell
2026-03-23 08:41:35 +01:00
parent 951b66eae5
commit dfa1b7c2fc
3 changed files with 126 additions and 107 deletions

View File

@@ -5,9 +5,9 @@ vim.o.tabstop = 2 -- 2 space tab width
vim.o.shiftwidth = 2 -- 2 space tab width
vim.o.swapfile = false -- Disable swap files (annoying)
vim.o.undofile = true -- Enable undo between sessions
vim.o.mouse = 'a' -- Enable mouse support
vim.o.mouse = "a" -- Enable mouse support
vim.o.showmode = false -- Don't show mode in status bar
vim.o.inccommand = 'split' -- Preview replace commands inline
vim.o.inccommand = "split" -- Preview replace commands inline
vim.o.scrolloff = 20 -- Scroll if cursor is X lines to edge
vim.o.confirm = true -- Add confirmation on some destructive actions
vim.o.ignorecase = true -- Case insensitive search
@@ -15,69 +15,90 @@ vim.o.smartcase = true -- Case sensitive when caps is used
vim.o.cursorline = true -- Highlight current line
vim.o.winborder = "single" -- Borders around popups like when you press leader for keybinds
vim.opt.signcolumn =
'yes' -- TEST: Prohibit layout shifting by always showing the sign column (left of line numbers), you should see an icon there on this row.
"yes" -- TEST: Prohibit layout shifting by always showing the sign column (left of line numbers), you should see an icon there on this row.
vim.o.updatetime = 250 -- Speed up the CursorHold autocmd event
vim.o.timeoutlen = 300 -- Speed up completion of key event
-- SECTION: Globals
vim.g.mapleader = ' ' -- Mapping leader to space.
vim.g.maplocalleader = ' ' -- Mapping leader to space.
vim.g.mapleader = " " -- Mapping leader to space.
vim.g.maplocalleader = " " -- Mapping leader to space.
vim.g.have_nerd_font = true -- Enable nerd font
-- SECTION: Lazy settings
-- INFO: Lines in this function will be executed after main event loop is free, prohibiting startup lag.
vim.schedule(function()
vim.opt.clipboard = 'unnamedplus' -- Share clipboard with system, comment if you want to keep it separate.
vim.opt.clipboard = "unnamedplus" -- Share clipboard with system, comment if you want to keep it separate.
end)
-- SECTION: Keybinds
-- Source current file, helpful when editing this file.
vim.keymap.set('n', '<leader>o', ':update<CR> :source<CR>')
vim.keymap.set("n", "<leader>o", ":update<CR> :source<CR>")
-- Restart vim completely, you can then press CTRL + o to go back to the last file you had open.
vim.keymap.set('n', '<leader>r', ':restart<CR>')
vim.keymap.set("n", "<leader>r", ":restart<CR>")
-- Lets you use ESC to stop highlighting text that you have searched with '/'
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
vim.keymap.set("n", "<Esc>", "<cmd>nohlsearch<CR>")
-- Format the current buffer using the active lsp
vim.keymap.set('n', '<leader>f', vim.lsp.buf.format, { desc = "Format buffer" })
vim.keymap.set("n", "<leader>f", vim.lsp.buf.format, { desc = "Format buffer" })
-- Start the file picker in different modes
vim.keymap.set('n', '<leader>sf', function()
require('mini.pick').builtin.files()
vim.keymap.set("n", "<leader>sf", function()
require("mini.pick").builtin.files()
end, { desc = "Search files" })
vim.keymap.set('n', '<leader>sg', ":Pick grep_live<CR>", { desc = "Search file contents" })
vim.keymap.set('n', '<leader>sh', ":Pick help<CR>", { desc = "Search help pages" })
vim.keymap.set('n', '<leader>sr', ":Pick resume<CR>", { desc = "Resume last search" })
vim.keymap.set('n', '<leader>sb', ":Pick buffers<CR>", { desc = "Search buffers" })
vim.keymap.set("n", "<leader>sg", ":Pick grep_live<CR>", { desc = "Search file contents" })
vim.keymap.set("n", "<leader>sh", ":Pick help<CR>", { desc = "Search help pages" })
vim.keymap.set("n", "<leader>sr", ":Pick resume<CR>", { desc = "Resume last search" })
vim.keymap.set("n", "<leader>sb", ":Pick buffers<CR>", { desc = "Search buffers" })
-- Get help with keybinds
vim.keymap.set('n', '<leader>?', ":WhichKey<CR>", { desc = "Show keybinds" })
vim.keymap.set("n", "<leader>?", ":WhichKey<CR>", { desc = "Show keybinds" })
-- File explorer
vim.keymap.set('n', '\\', ":Oil --float<CR>", { desc = "File explorer" })
vim.keymap.set("n", "\\", ":Oil --float<CR>", { desc = "File explorer" })
-- Ai
vim.keymap.set("n", "<leader>ac", "<cmd>ClaudeCode<cr>", { desc = "Toggle Claude" })
vim.keymap.set("n", "<leader>af", "<cmd>ClaudeCodeFocus<cr>", { desc = "Focus Claude" })
vim.keymap.set("n", "<leader>ar", "<cmd>ClaudeCode --resume<cr>", { desc = "Resume Claude" })
vim.keymap.set("n", "<leader>aC", "<cmd>ClaudeCode --continue<cr>", { desc = "Continue Claude" })
vim.keymap.set("n", "<leader>am", "<cmd>ClaudeCodeSelectModel<cr>", { desc = "Select Claude model" })
vim.keymap.set("n", "<leader>ab", "<cmd>ClaudeCodeAdd %<cr>", { desc = "Add current buffer" })
vim.keymap.set("v", "<leader>as", "<cmd>ClaudeCodeSend<cr>", { desc = "Send to Claude" })
vim.keymap.set("n", "<leader>aa", "<cmd>ClaudeCodeDiffAccept<cr>", { desc = "Accept diff" })
vim.keymap.set("n", "<leader>ad", "<cmd>ClaudeCodeDiffDeny<cr>", { desc = "Deny diff" })
-- File tree keymap (conditional on filetype)
vim.api.nvim_create_autocmd("FileType", {
pattern = { "NvimTree", "neo-tree", "oil", "minifiles", "netrw" },
callback = function(ev)
vim.keymap.set("n", "<leader>as", "<cmd>ClaudeCodeTreeAdd<cr>",
{ desc = "Add file", buffer = ev.buf })
end,
})
-- SECTION: Install packages
vim.pack.add({
'https://github.com/catppuccin/nvim', -- color scheme
'https://github.com/nvim-mini/mini.pick', -- File picker, grep
'https://github.com/nvim-mini/mini.pairs', -- Auto create {}, (), [] - pairs etc.
'https://github.com/nvim-mini/mini.notify', -- Popup notifications
'https://github.com/nvim-mini/mini.completion', -- Autocomplete, needs snippets and icons
'https://github.com/nvim-mini/mini.snippets', -- Snippets
'https://github.com/nvim-mini/mini.icons', -- Icons
'https://github.com/nvim-mini/mini.cursorword', -- Highlight word under cursor
'https://github.com/nvim-mini/mini.hipatterns', -- Highlight todos and rgb colors
'https://github.com/nvim-mini/mini.statusline', -- Statusline at the bottom
'https://github.com/neovim/nvim-lspconfig', -- Language servers
'https://github.com/mason-org/mason.nvim', -- LSP deps installer
'https://github.com/mason-org/mason-lspconfig.nvim', -- Lets you install mason tooling using lsp names
'https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim', -- Automatically install mason tooling
'https://github.com/folke/lazydev.nvim', -- Automatically resolve vim api paths.
'https://github.com/folke/which-key.nvim', -- Shortcut hints (bar at the bottom when pressing space)
'https://github.com/nvim-lua/plenary.nvim', -- Helper lua functions, dep of todo-comments.
'https://github.com/nvim-treesitter/nvim-treesitter', -- Syntax highlighting
'https://github.com/stevearc/oil.nvim', -- File explorer
"https://github.com/catppuccin/nvim", -- color scheme
"https://github.com/nvim-mini/mini.pick", -- File picker, grep
"https://github.com/nvim-mini/mini.pairs", -- Auto create {}, (), [] - pairs etc.
"https://github.com/nvim-mini/mini.notify", -- Popup notifications
"https://github.com/nvim-mini/mini.completion", -- Autocomplete, needs snippets and icons
"https://github.com/nvim-mini/mini.snippets", -- Snippets
"https://github.com/nvim-mini/mini.icons", -- Icons
"https://github.com/nvim-mini/mini.cursorword", -- Highlight word under cursor
"https://github.com/nvim-mini/mini.hipatterns", -- Highlight todos and rgb colors
"https://github.com/nvim-mini/mini.statusline", -- Statusline at the bottom
"https://github.com/neovim/nvim-lspconfig", -- Language servers
"https://github.com/mason-org/mason.nvim", -- LSP deps installer
"https://github.com/mason-org/mason-lspconfig.nvim", -- Lets you install mason tooling using lsp names
"https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim", -- Automatically install mason tooling
"https://github.com/folke/lazydev.nvim", -- Automatically resolve vim api paths.
"https://github.com/folke/which-key.nvim", -- Shortcut hints (bar at the bottom when pressing space)
"https://github.com/nvim-lua/plenary.nvim", -- Helper lua functions, dep of todo-comments.
"https://github.com/nvim-treesitter/nvim-treesitter", -- Syntax highlighting
"https://github.com/stevearc/oil.nvim", -- File explorer
"https://github.com/folke/snacks.nvim", -- Dep for claudecode
"https://github.com/coder/claudecode.nvim", -- Claude code
})
-- SECTION: Colorscheme
@@ -88,59 +109,52 @@ vim.cmd("colorscheme catppuccin-mocha")
-- Folke
require("lazydev").setup()
local wk = require('which-key')
local wk = require("which-key")
wk.setup()
wk.add({
{ '<leader>s', group = '[S]earch' },
{ '<leader>o', group = 'Source current file', mode = { 'n' } },
{ "<leader>s", group = "[S]earch" },
{ "<leader>o", group = "Source current file", mode = { "n" } },
{ "<leader>a", group = "AI/Claude Code" },
})
-- require('todo-comments').setup({
-- keywords = {
-- SECTION = {
-- icon = "󰚟 ",
-- color = "hint",
-- }
-- }
-- })
-- Mini
local MiniPicker = require('mini.pick').setup({
local MiniPicker = require("mini.pick").setup({
source = {
show = require('mini.pick').default_show,
show = require("mini.pick").default_show,
},
})
require('mini.pairs').setup()
require('mini.notify').setup()
require('mini.icons').setup()
require("mini.pairs").setup()
require("mini.notify").setup()
require("mini.icons").setup()
MiniIcons.tweak_lsp_kind()
require('mini.snippets').setup()
require('mini.completion').setup()
require('mini.cursorword').setup()
require('mini.hipatterns').setup({
require("mini.snippets").setup()
require("mini.completion").setup()
require("mini.cursorword").setup()
require("mini.hipatterns").setup({
highlighters = {
todo = { pattern = '%f[%w]()TODO()%f[%W]', group = 'MiniHipatternsTodo' },
section = { pattern = '%f[%w]()SECTION()%f[%W]', group = 'MiniHipatternsNote' },
warning = { pattern = '%f[%w]()WARNING()%f[%W]', group = 'MiniHipatternsHack' },
error = { pattern = '%f[%w]()ERROR()%f[%W]', group = 'MiniHipatternsTodo' },
}
todo = { pattern = "%f[%w]()TODO()%f[%W]", group = "MiniHipatternsTodo" },
section = { pattern = "%f[%w]()SECTION()%f[%W]", group = "MiniHipatternsNote" },
warning = { pattern = "%f[%w]()WARNING()%f[%W]", group = "MiniHipatternsHack" },
error = { pattern = "%f[%w]()ERROR()%f[%W]", group = "MiniHipatternsTodo" },
},
})
require('mini.statusline').setup()
require('oil').setup()
require("mini.statusline").setup()
require("oil").setup()
require('nvim-treesitter').setup({
auto_install = true
require("claudecode").setup()
require("nvim-treesitter").setup({
auto_install = true,
})
local vue_language_server_path = vim.fn.stdpath('data') ..
"/mason/packages/vue-language-server/node_modules/@vue/language-server"
local tsserver_filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' }
local vue_language_server_path = vim.fn.stdpath("data")
.. "/mason/packages/vue-language-server/node_modules/@vue/language-server"
local tsserver_filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" }
local vue_plugin = {
name = '@vue/typescript-plugin',
name = "@vue/typescript-plugin",
location = vue_language_server_path,
languages = { 'vue' },
configNamespace = 'typescript',
languages = { "vue" },
configNamespace = "typescript",
}
local vtsls_config = {
settings = {
@@ -166,39 +180,38 @@ local ts_ls_config = {
local vue_ls_config = {}
-- If you are on most recent `nvim-lspconfig`
-- nvim 0.11 or above
vim.lsp.config('vtsls', vtsls_config)
vim.lsp.config('vue_ls', vue_ls_config)
vim.lsp.config('ts_ls', ts_ls_config)
vim.lsp.config("vtsls", vtsls_config)
vim.lsp.config("vue_ls", vue_ls_config)
vim.lsp.config("ts_ls", ts_ls_config)
-- LSP Language Server
require("mason").setup()
require("mason-lspconfig").setup({
-- Install lsp deps here
ensure_installed = {
'lua_ls',
'ts_ls',
'vue_ls',
'ansiblels',
'eslint',
"lua_ls",
"ts_ls",
"vue_ls",
"ansiblels",
"eslint",
},
automatic_enable = {
exclude = { 'ts_ls', 'vue_ls' }
}
exclude = { "ts_ls", "vue_ls" },
},
})
require("mason-tool-installer").setup({
-- Install deps of lsp deps here
ensure_installed = {
'tree-sitter-cli',
'markdownlint',
'vue-language-server'
}
"tree-sitter-cli",
"markdownlint",
"vue-language-server",
},
})
vim.lsp.enable({ 'ts_ls', 'vue_ls' })
vim.lsp.enable({ "ts_ls", "vue_ls" })
-- SECTION: Helpers
local function client_supports_method(client, method, bufnr)
if vim.fn.has 'nvim-0.11' == 1 then
if vim.fn.has("nvim-0.11") == 1 then
return client:supports_method(method, bufnr)
else
return client.supports_method(method, { bufnr = bufnr })
@@ -206,16 +219,16 @@ local function client_supports_method(client, method, bufnr)
end
-- SECTION: Autocommands
vim.api.nvim_create_autocmd('TextYankPost', {
desc = 'Highlight when yanking (copying) text',
group = vim.api.nvim_create_augroup('highlight-yank', { clear = true }),
vim.api.nvim_create_autocmd("TextYankPost", {
desc = "Highlight when yanking (copying) text",
group = vim.api.nvim_create_augroup("highlight-yank", { clear = true }),
callback = function()
vim.highlight.on_yank()
end,
})
-- Actions on LspAttach
vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('my.lsp', {}),
vim.api.nvim_create_autocmd("LspAttach", {
group = vim.api.nvim_create_augroup("my.lsp", {}),
callback = function(ev)
local client = assert(vim.lsp.get_client_by_id(ev.data.client_id))
@@ -233,20 +246,20 @@ vim.api.nvim_create_autocmd('LspAttach', {
-- end
-- Swap out the icons in the leftmost column and show inlay hints
vim.diagnostic.config {
vim.diagnostic.config({
severity_sort = true,
float = { border = 'rounded', source = 'if_many' },
float = { border = "rounded", source = "if_many" },
underline = { severity = vim.diagnostic.severity.ERROR },
signs = vim.g.have_nerd_font and {
text = {
[vim.diagnostic.severity.ERROR] = '󰅚 ',
[vim.diagnostic.severity.WARN] = '󰀪 ',
[vim.diagnostic.severity.INFO] = '󰋽 ',
[vim.diagnostic.severity.HINT] = '󰌶 ',
[vim.diagnostic.severity.ERROR] = "󰅚 ",
[vim.diagnostic.severity.WARN] = "󰀪 ",
[vim.diagnostic.severity.INFO] = "󰋽 ",
[vim.diagnostic.severity.HINT] = "󰌶 ",
},
} or {},
virtual_text = {
source = 'if_many',
source = "if_many",
spacing = 2,
format = function(diagnostic)
local diagnostic_message = {
@@ -258,6 +271,6 @@ vim.api.nvim_create_autocmd('LspAttach', {
return diagnostic_message[diagnostic.severity]
end,
},
}
})
end,
})