pnx/dotfiles
1
0
Fork 0
mirror of https://github.com/pnx/dotfiles synced 2026-08-24 03:58:13 +02:00
Code Activity

more nvim

Browse source
This commit is contained in:
Henrik Hautakoski 2024-06-08 16:50:16 +02:00
parent 48ddc29db1
commit fc6be19a2d
10 changed files with 337 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nvim/.luarc.json Normal file
View file

@ -0,0 +1,7 @@
{
"runtime.version": "LuaJIT",
"runtime.path": ["lua/?.lua", "lua/?/init.lua"],
"diagnostics.globals": ["vim"],
"workspace.checkThirdParty": false,
"workspace.library": ["$VIMRUNTIME", "./lua"]
}

39
nvim/lazy-lock.json
View file

@ -1,32 +1,33 @@
{ {
"LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" }, "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" },
"catppuccin": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" }, "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "conform.nvim": { "branch": "master", "commit": "069e971295a34a810484b7b2ef54b3c735214181" },
"conform.nvim": { "branch": "master", "commit": "b8f3ed3903430033f638b17f7455b8fd3d6a85b5" }, "fd": { "branch": "master", "commit": "be815c261ace9cd0026cff5c8a579cda094e10fd" },
"fd": { "branch": "master", "commit": "29936f0fbae1e52984ab582b2b2c98685d6ad638" }, "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" },
"gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
"indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" }, "lazy.nvim": { "branch": "main", "commit": "eb4957442e3182f051b0ae11da32e06d22c190e3" },
"lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" }, "lsp-zero.nvim": { "branch": "v3.x", "commit": "16de3b18c5f7b6230d89b8e64ce9a4801b6f8d08" },
"lsp-zero.nvim": { "branch": "v3.x", "commit": "f12d50716e8e59ea9f5cf484eac6968c33a95917" },
"lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
"none-ls.nvim": { "branch": "main", "commit": "37671797d6e5f9bd0ee3ab965ab2e6de251e1930" }, "mini.nvim": { "branch": "main", "commit": "cc2f5b542c38b2af234b62196fa5a8621119fb0c" },
"none-ls.nvim": { "branch": "main", "commit": "8691504118b252d64fc5023a104aedd100ab754a" },
"nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
"nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
"nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" },
"nvim-treesitter": { "branch": "master", "commit": "73fb37ed77b18ac357ca8e6e35835a8db6602332" }, "nvim-treesitter": { "branch": "master", "commit": "c5cbd3ec74f6f5ddbac939e6f24b99fe78262b4c" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
"nvim-ts-autotag": { "branch": "main", "commit": "62db4b3054ec6847e5cb189b4dea452ce0c7ad7f" }, "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" },
"nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, "nvim-web-devicons": { "branch": "master", "commit": "b4b302d6ae229f67df7a87ef69fa79473fe788a9" },
"oil.nvim": { "branch": "master", "commit": "06a19f77f1a1da37b675635e6f9c5b5d50bcaacd" }, "oil.nvim": { "branch": "master", "commit": "e5312c3a801e7274fa14e6a56aa10a618fed80c3" },
"playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "master", "commit": "4aed63995a69e343b068c7469491a8d1592c339f" }, "telescope.nvim": { "branch": "master", "commit": "dfa230be84a044e7f546a6c2b0a403c739732b86" },
"trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" }, "trouble.nvim": { "branch": "main", "commit": "38915023a777b7f2422e503dc603f6a64b465bf5" },
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
"which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }
} }

1
nvim/lua/config/autocmd.lua
View file

@ -15,3 +15,4 @@ autocmd('TextYankPost', {
autocmd('BufWritePre', { autocmd('BufWritePre', {
command = [[:exe 'norm m`' | %s/\s\+$//eg | norm ``]] command = [[:exe 'norm m`' | %s/\s\+$//eg | norm ``]]
}) })

3
nvim/lua/config/cmp.lua
View file

@ -11,7 +11,6 @@ return function()
local windowstyle = { local windowstyle = {
border = vim.g.float_border or "none", border = vim.g.float_border or "none",
winhighlight = "Normal:Pmenu,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None", winhighlight = "Normal:Pmenu,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None",
} }
return { return {
@ -53,7 +52,7 @@ return function()
}, },
sources = { sources = {
{ name = "nvim_lsp" }, { name = "nvim_lsp" },
{ name = "luasnip" }, -- { name = "luasnip" },
{ name = "buffer" }, { name = "buffer" },
{ name = "path" }, { name = "path" },
{ {

11
nvim/lua/config/keymaps.lua
View file

@ -113,9 +113,18 @@ return {
{ '<leader>ff', "<cmd>Format<cr>", desc = 'Format file' }, { '<leader>ff', "<cmd>Format<cr>", desc = 'Format file' },
{ '<leader>ff', "<cmd>Format<cr>", mode = 'x', desc = 'Format selection' }, { '<leader>ff', "<cmd>Format<cr>", mode = 'x', desc = 'Format selection' },
}, },
fugitive = {
{ '<leader>gB', '<cmd>Git blame<cr>', desc = 'Git blame' },
{ '<leader>gs', '<cmd>Git status<cr>', desc = 'Git status' },
{ '<leader>gl', '<cmd>Git log<cr>', desc = 'Git log' },
{ '<leader>gL', '<cmd>Git log %<cr>', desc = 'Git log current file' },
},
gitsigns = { gitsigns = {
{ '<leader>gp', '<cmd>Gitsigns preview_hunk<cr>', desc = 'Git preview diff' }, { '<leader>gp', '<cmd>Gitsigns preview_hunk<cr>', desc = 'Git preview diff' },
{ '<leader>gb', '<cmd>Gitsigns blame_line<cr>', desc = 'Git blame' } { '<leader>gb', '<cmd>Gitsigns blame_line<cr>', desc = 'Git blame line' }
},
trouble = {
{ '<leader>dt', '<cmd>Trouble diagnostics toggle<cr>', desc = 'Trouble diagnostics' },
}, },
-- Keybinds for buffers with an LSP client attached -- Keybinds for buffers with an LSP client attached
lsp = { lsp = {

32
nvim/lua/config/lsp.lua
View file

@ -1,4 +1,4 @@
vim.g.lsp_zero_ui_float_border = vim.g.float_border or 'none' vim.g.lsp_zero_ui_float_border = vim.g.float_border or "none"
return { return {
document_highlight = true, document_highlight = true,
@ -21,14 +21,26 @@ return {
init_options = { init_options = {
["language_server_phpstan.enabled"] = true, ["language_server_phpstan.enabled"] = true,
["language_server_psalm.enabled"] = false, ["language_server_psalm.enabled"] = false,
}
}
}, },
-- },
-- },
-- JS,TS,VUE -- JS,TS,VUE
tsserver = {
document_highlight = false,
settings = {
tsserver_plugins = {
"@vue/typescript-plugin",
},
},
filetypes = { "javascript", "typescript", "vue" },
},
volar = { volar = {
filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue', 'json' } init_options = {
vue = {
hybridMode = false,
},
},
filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue", "json" },
}, },
-- TailwindCSS -- TailwindCSS
tailwindcss = {}, tailwindcss = {},
@ -53,7 +65,7 @@ return {
analyses = { analyses = {
unusedvariable = true, unusedvariable = true,
unusedwrite = true, unusedwrite = true,
useany = true useany = true,
}, },
gofumpt = true, gofumpt = true,
}, },
@ -61,7 +73,7 @@ return {
}, },
-- Lua -- Lua
lua_ls = { lua_ls = {
cmd = {"/opt/luals/bin/lua-language-server", "--logpath=~/.local/luals/logs"}, cmd = { "/opt/luals/bin/lua-language-server", "--logpath=~/.local/luals/logs" },
settings = { settings = {
Lua = { Lua = {
runtime = { runtime = {
@ -73,8 +85,8 @@ return {
vim.env.VIMRUNTIME vim.env.VIMRUNTIME
} }
} }
}, }
}, }
}, },
}, },
} }

3
nvim/lua/config/treesitter.lua
View file

@ -31,7 +31,8 @@ return {
"xml", "xml",
"glsl", "glsl",
"hlsl", "hlsl",
"markdown" "markdown",
"markdown_inline"
}, },
-- Install parsers synchronously (only applied to `ensure_installed`) -- Install parsers synchronously (only applied to `ensure_installed`)

120
nvim/lua/plugins/core.lua
View file

@ -1,4 +1,4 @@
local keys = require('config.keymaps') local keys = require("config.keymaps")
return { return {
-- colorscheme -- colorscheme
@ -7,9 +7,9 @@ return {
name = "catppuccin", name = "catppuccin",
priority = 1000, priority = 1000,
config = function() config = function()
require("catppuccin").setup(require('config.colorscheme')) require("catppuccin").setup(require("config.colorscheme"))
vim.cmd.colorscheme("catppuccin") vim.cmd.colorscheme("catppuccin")
end end,
}, },
{ {
"folke/which-key.nvim", "folke/which-key.nvim",
@ -18,53 +18,55 @@ return {
vim.o.timeout = true vim.o.timeout = true
vim.o.timeoutlen = 300 vim.o.timeoutlen = 300
end, end,
opts = function() return { opts = function()
defaults = keys.whichkey return {
} end, defaults = keys.whichkey,
}
end,
config = function(_, opts) config = function(_, opts)
local wk = require("which-key") local wk = require("which-key")
wk.setup(opts) wk.setup(opts)
wk.register(opts.defaults or {}) wk.register(opts.defaults or {})
end end,
}, },
{ {
'nvim-treesitter/nvim-treesitter', "nvim-treesitter/nvim-treesitter",
build = function() build = function()
require('nvim-treesitter.install').update({ with_sync = true }) require("nvim-treesitter.install").update({ with_sync = true })
end, end,
dependencies = { dependencies = {
'nvim-treesitter/nvim-treesitter-textobjects', "nvim-treesitter/nvim-treesitter-textobjects",
'nvim-treesitter/playground' "nvim-treesitter/playground",
}, },
opts = require('config.treesitter'), opts = require("config.treesitter"),
config = function(_, opts) config = function(_, opts)
local parser_config = require('nvim-treesitter.parsers').get_parser_configs() local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
parser_config.blade = { parser_config.blade = {
install_info = { install_info = {
url = 'https://github.com/EmranMR/tree-sitter-blade', url = "https://github.com/EmranMR/tree-sitter-blade",
branch = "main", branch = "main",
files = { 'src/parser.c' }, files = { "src/parser.c" },
generate_requires_npm = true, generate_requires_npm = true,
requires_generate_from_grammar = true, requires_generate_from_grammar = true,
}, },
filetype = 'blade', filetype = "blade",
} }
require("nvim-treesitter.configs").setup(opts) require("nvim-treesitter.configs").setup(opts)
end, end,
}, },
{ {
'windwp/nvim-autopairs', "windwp/nvim-autopairs",
event = "InsertEnter", event = "InsertEnter",
config = true config = true,
}, },
{ {
"windwp/nvim-ts-autotag", "windwp/nvim-ts-autotag",
dependencies = { dependencies = {
'nvim-treesitter/nvim-treesitter' "nvim-treesitter/nvim-treesitter",
}, },
opts = require('config.autotag') opts = require("config.autotag"),
}, },
{ {
"lukas-reineke/indent-blankline.nvim", "lukas-reineke/indent-blankline.nvim",
@ -72,31 +74,39 @@ return {
opts = { opts = {
debounce = 10, debounce = 10,
indent = { indent = {
char = '▏', char = "▏",
}, },
scope = { scope = {
enabled = true, enabled = true,
show_start = false, show_start = false,
show_end = false show_end = false,
}, },
exclude = { exclude = {
filetypes = { filetypes = {
'help', "help",
'dashboard' "dashboard",
} },
} },
}, },
config = function(_, opts) config = function(_, opts)
require 'ibl'.setup(opts) require("ibl").setup(opts)
local hooks = require 'ibl.hooks' local hooks = require("ibl.hooks")
hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_tab_indent_level) hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_tab_indent_level)
hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level) hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level)
end end,
},
{
"echasnovski/mini.nvim",
version = false,
}, },
-- Git stuff -- Git stuff
{ {
'lewis6991/gitsigns.nvim', "tpope/vim-fugitive",
keys = keys.fugitive,
},
{
"lewis6991/gitsigns.nvim",
dependencies = { dependencies = {
{ {
"folke/which-key.nvim", "folke/which-key.nvim",
@ -110,29 +120,28 @@ return {
}, },
lazy = false, lazy = false,
keys = keys.gitsigns or {}, keys = keys.gitsigns or {},
opts = require('config.gitsigns') opts = require("config.gitsigns"),
}, },
{ {
'nvim-lualine/lualine.nvim', "nvim-lualine/lualine.nvim",
event = "VeryLazy", event = "VeryLazy",
dependencies = { dependencies = {
'arkav/lualine-lsp-progress', "arkav/lualine-lsp-progress",
'nvim-tree/nvim-web-devicons', "nvim-tree/nvim-web-devicons",
}, },
opts = require("config.lualine") opts = require("config.lualine"),
}, },
{ {
'nvim-telescope/telescope.nvim', "nvim-telescope/telescope.nvim",
dependencies = { dependencies = {
'nvim-lua/plenary.nvim', "nvim-lua/plenary.nvim",
'nvim-tree/nvim-web-devicons', "nvim-tree/nvim-web-devicons",
'sharkdp/fd', "sharkdp/fd",
'nvim-telescope/telescope-ui-select.nvim', "nvim-telescope/telescope-ui-select.nvim",
}, },
keys = keys.telescope, keys = keys.telescope,
opts = require('config.telescope'), opts = require("config.telescope"),
config = function (_, opts) config = function(_, opts)
local telescope = require("telescope") local telescope = require("telescope")
telescope.setup(opts) telescope.setup(opts)
@ -142,9 +151,9 @@ return {
end, end,
}, },
{ {
'stevearc/conform.nvim', "stevearc/conform.nvim",
keys = keys.conform or {}, keys = keys.conform or {},
opts = require('config.conform'), opts = require("config.conform"),
config = function(_, opts) config = function(_, opts)
vim.api.nvim_create_user_command("Format", function(args) vim.api.nvim_create_user_command("Format", function(args)
local range = nil local range = nil
@ -158,26 +167,33 @@ return {
require("conform").format({ async = true, lsp_fallback = true, range = range }) require("conform").format({ async = true, lsp_fallback = true, range = range })
end, { range = true }) end, { range = true })
require('conform').setup(opts) require("conform").setup(opts)
end, end,
}, },
{ {
'stevearc/oil.nvim', "stevearc/oil.nvim",
keys = keys.oil or {}, keys = keys.oil or {},
opts = require('config.oil'), opts = require("config.oil"),
dependencies = { "nvim-tree/nvim-web-devicons" }, dependencies = { "nvim-tree/nvim-web-devicons" },
config = function(_, opts)
require('oil').setup(opts)
-- Don't touch my CWD!
require('utils.oil').RegisterCWDHackHook()
end,
}, },
{ {
"folke/trouble.nvim", "folke/trouble.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" }, dependencies = { "nvim-tree/nvim-web-devicons" },
keys = keys.trouble or {},
opts = {}, opts = {},
}, },
{ {
'L3MON4D3/LuaSnip', "L3MON4D3/LuaSnip",
opts = {}, opts = {},
config = function (_, opts) config = function(_, opts)
require("luasnip.loaders.from_lua").load({paths = "~/.config/nvim/snippets"}) require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets" })
require("luasnip").setup(opts) require("luasnip").setup(opts)
end end,
}, },
} }

7
nvim/lua/plugins/lsp.lua
View file

@ -20,8 +20,8 @@ return {
"hrsh7th/cmp-buffer", -- autocomplete from buffer "hrsh7th/cmp-buffer", -- autocomplete from buffer
"hrsh7th/cmp-path", -- autocomplete from filesystem "hrsh7th/cmp-path", -- autocomplete from filesystem
"hrsh7th/cmp-nvim-lsp", -- autocomplete from lsp "hrsh7th/cmp-nvim-lsp", -- autocomplete from lsp
"saadparwaiz1/cmp_luasnip", -- autocomplete from snippet engine -- "saadparwaiz1/cmp_luasnip", -- autocomplete from snippet engine
"L3MON4D3/LuaSnip", -- snippet engine -- "L3MON4D3/LuaSnip", -- snippet engine
"onsails/lspkind-nvim", -- icons for kind "onsails/lspkind-nvim", -- icons for kind
}, },
opts = require("config.cmp"), opts = require("config.cmp"),
@ -48,6 +48,7 @@ return {
end) end)
for name, server_opt in pairs(opts.servers) do for name, server_opt in pairs(opts.servers) do
local on_attach = function(client, bufnr) local on_attach = function(client, bufnr)
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
@ -59,7 +60,7 @@ return {
}) })
end end
if (opts.document_highlight or false) and client.supports_method('textDocument/documentHighlight')then if (opts.document_hightlight or server_opt.document_highlight or false) and client.supports_method('textDocument/documentHighlight')then
require("utils.lsp").document_highlight(bufnr) require("utils.lsp").document_highlight(bufnr)
end end
end end

17
nvim/lua/utils/oil.lua Normal file
View file

@ -0,0 +1,17 @@
local M = {}
-- Hack for making oil.nvim return to
-- the initial cwd on save.
function M.RegisterCWDHackHook()
local cwd = vim.fn.getcwd()
local group = vim.api.nvim_create_augroup("OilCWDHack", {})
vim.api.nvim_create_autocmd("BufWritePost", {
group = group,
pattern = "oil:///*",
callback = function() vim.cmd("cd " .. cwd) end,
})
end
return M