Compare commits
5 commits
93389b7a1c
...
62cb65276c
Author | SHA1 | Date | |
---|---|---|---|
62cb65276c | |||
81c2991ba7 | |||
2f1c6bc03d | |||
9c48f4f610 | |||
7ed7144c97 |
10 changed files with 89 additions and 53 deletions
|
@ -1,42 +1,41 @@
|
||||||
{
|
{
|
||||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||||
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
|
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
|
||||||
"SchemaStore.nvim": { "branch": "main", "commit": "c183ec0ee5847642f3e8a2de881fc9cfebec1536" },
|
"SchemaStore.nvim": { "branch": "main", "commit": "f293a809fc93e972fcc71fde473f55606cadb091" },
|
||||||
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
|
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
|
||||||
"auto-session": { "branch": "main", "commit": "9c3f977aafb56bd73ba0d082c4dcbdba5666faf3" },
|
"auto-session": { "branch": "main", "commit": "317412742990371f8e4709074da5c378456a27ff" },
|
||||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||||
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
|
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
|
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
|
||||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||||
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
||||||
"cosmic-ui": { "branch": "main", "commit": "ab7de388576eaac02ce7bc2389e55b8e207aad12" },
|
|
||||||
"dracula.nvim": { "branch": "main", "commit": "96c9d19ce81b26053055ad6f688277d655b3f7d2" },
|
"dracula.nvim": { "branch": "main", "commit": "96c9d19ce81b26053055ad6f688277d655b3f7d2" },
|
||||||
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
|
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "4c40357994f386e72be92a46f41fc1664c84c87d" },
|
"gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||||
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
|
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
|
"lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" },
|
||||||
"luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" },
|
"luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" },
|
||||||
"none-ls-extras.nvim": { "branch": "main", "commit": "6557f20e631d2e9b2a9fd27a5c045d701a3a292c" },
|
"none-ls-extras.nvim": { "branch": "main", "commit": "6557f20e631d2e9b2a9fd27a5c045d701a3a292c" },
|
||||||
"none-ls-shellcheck.nvim": { "branch": "main", "commit": "0f84461241e76e376a95fb7391deac82dc3efdbf" },
|
"none-ls-shellcheck.nvim": { "branch": "main", "commit": "0f84461241e76e376a95fb7391deac82dc3efdbf" },
|
||||||
"none-ls.nvim": { "branch": "main", "commit": "a117163db44c256d53c3be8717f3e1a2a28e6299" },
|
"none-ls.nvim": { "branch": "main", "commit": "a117163db44c256d53c3be8717f3e1a2a28e6299" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
|
"nvim-autopairs": { "branch": "master", "commit": "6522027785b305269fa17088395dfc0f456cedd2" },
|
||||||
"nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" },
|
"nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
|
||||||
"nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" },
|
|
||||||
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
|
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "fd26f8626c03b424f7140d454031d1dcb8d23513" },
|
"nvim-lspconfig": { "branch": "master", "commit": "fb733ac734249ccf293e5c8018981d4d8f59fa8f" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "ffd284c4706d91c0d94916995f584b22ce89afcb" },
|
"nvim-treesitter": { "branch": "master", "commit": "20a7e40203dab3454686e057adecd805f3d6d334" },
|
||||||
"nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
|
"nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
|
||||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "143856b1cee509a190cc8c17ddb0638002171235" },
|
"nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" },
|
||||||
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
|
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
|
||||||
"nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
|
"nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" },
|
"nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
|
||||||
"oil.nvim": { "branch": "master", "commit": "548587d68b55e632d8a69c92cefd981f360634fa" },
|
"oil.nvim": { "branch": "master", "commit": "ab887d926c2665a708fbe9e6c4654042cc5f4c60" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||||
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
|
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
|
||||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "2a5ceff981501cff8f46871d5402cd3378a8ab6a" },
|
"tabby.nvim": { "branch": "main", "commit": "21b01d26627ee5fe94c8ae560bd1b0797dff3c40" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "814f102cd1da3dc78c7d2f20f2ef3ed3cdf0e6e4" },
|
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
|
||||||
|
"telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
||||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||||
"vim-eunuch": { "branch": "master", "commit": "e86bb794a1c10a2edac130feb0ea590a00d03f1e" },
|
"vim-eunuch": { "branch": "master", "commit": "e86bb794a1c10a2edac130feb0ea590a00d03f1e" },
|
||||||
|
@ -44,5 +43,6 @@
|
||||||
"vim-heritage": { "branch": "main", "commit": "574baeb0679681a710adce5110a0d8b2ae1c2637" },
|
"vim-heritage": { "branch": "main", "commit": "574baeb0679681a710adce5110a0d8b2ae1c2637" },
|
||||||
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
|
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
|
||||||
"vim-tmux-navigator": { "branch": "master", "commit": "791dacfcfc8ccb7f6eb1c853050883b03e5a22fe" },
|
"vim-tmux-navigator": { "branch": "master", "commit": "791dacfcfc8ccb7f6eb1c853050883b03e5a22fe" },
|
||||||
|
"vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" },
|
||||||
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
||||||
}
|
}
|
||||||
|
|
|
@ -88,8 +88,6 @@ vim.filetype.add({
|
||||||
xrl = 'erlang',
|
xrl = 'erlang',
|
||||||
yrl = 'erlang',
|
yrl = 'erlang',
|
||||||
src = 'erlang',
|
src = 'erlang',
|
||||||
},
|
config = 'erlang',
|
||||||
filename = {
|
|
||||||
['rebar.config'] = 'erlang',
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
|
@ -40,8 +40,8 @@ function M.init(client, bufnr)
|
||||||
|
|
||||||
-- code actions
|
-- code actions
|
||||||
buf_map('n', '<leader>r', '<cmd>lua vim.lsp.buf.rename()<cr>', { desc = 'Rename' })
|
buf_map('n', '<leader>r', '<cmd>lua vim.lsp.buf.rename()<cr>', { desc = 'Rename' })
|
||||||
buf_map('n', '<leader>la', '<cmd>lua vim.lsp.buf.code_actions()<cr>', { desc = 'Code Actions' })
|
buf_map('n', '<leader>a', '<cmd>lua vim.lsp.buf.code_action()<cr>', { desc = 'Code Actions' })
|
||||||
buf_map('v', '<leader>la', '<cmd>lua vim.lsp.buf.range_code_actions()<cr>', { desc = 'Range Code Actions' })
|
buf_map('v', '<leader>a', '<cmd>lua vim.lsp.buf.range_code_action()<cr>', { desc = 'Range Code Actions' })
|
||||||
|
|
||||||
-- formatting
|
-- formatting
|
||||||
if client.supports_method('textDocument/formatting') then
|
if client.supports_method('textDocument/formatting') then
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
return {
|
return {
|
||||||
rust_analyzer = true,
|
rust_analyzer = true,
|
||||||
|
zls = true,
|
||||||
|
clangd = true,
|
||||||
erlangls = true,
|
erlangls = true,
|
||||||
lua_ls = {
|
lua_ls = {
|
||||||
format_on_save = false,
|
format_on_save = false,
|
||||||
|
@ -11,5 +13,8 @@ return {
|
||||||
ts_ls = {
|
ts_ls = {
|
||||||
format_on_save = false,
|
format_on_save = false,
|
||||||
},
|
},
|
||||||
|
tailwindcss = {
|
||||||
|
format_on_save = false,
|
||||||
|
},
|
||||||
svelte = true,
|
svelte = true,
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,9 +16,11 @@ map('n', '<leader>kc', ':new<cr>', { desc = 'New buffer' })
|
||||||
map('n', '<leader>ko', '<cmd>%bd|e#<cr>', { desc = 'Close all buffers but the current one' }) -- https://stackoverflow.com/a/42071865/516188
|
map('n', '<leader>ko', '<cmd>%bd|e#<cr>', { desc = 'Close all buffers but the current one' }) -- https://stackoverflow.com/a/42071865/516188
|
||||||
|
|
||||||
-- tab navigation
|
-- tab navigation
|
||||||
map('n', '<leader>tp', ':tabprevious<cr>', { desc = 'Prev tab' })
|
map('n', '<leader>tn', ':tabnew<cr>', { desc = 'New tab' })
|
||||||
map('n', '<leader>tn', ':tabnext<cr>', { desc = 'Next tab' })
|
map('n', '<leader>th', ':tabprevious<cr>', { desc = 'Prev tab' })
|
||||||
|
map('n', '<leader>tl', ':tabnext<cr>', { desc = 'Next tab' })
|
||||||
map('n', '<leader>td', ':tabclose<cr>', { desc = 'Close tab' })
|
map('n', '<leader>td', ':tabclose<cr>', { desc = 'Close tab' })
|
||||||
|
map('n', '<leader>tc', ':tcd', { desc = 'Change working directory for tab' })
|
||||||
|
|
||||||
-- plugin management
|
-- plugin management
|
||||||
map('n', '<leader>pc', ':Lazy check<cr>', { desc = 'Check plugins' })
|
map('n', '<leader>pc', ':Lazy check<cr>', { desc = 'Check plugins' })
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
local config = require('config')
|
|
||||||
local utils = require('utils')
|
|
||||||
|
|
||||||
local plugin_config = {
|
|
||||||
border_style = 'single',
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
'CosmicNvim/cosmic-ui',
|
|
||||||
dependencies = {
|
|
||||||
'MunifTanjim/nui.nvim',
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
require('cosmic-ui').setup(plugin_config)
|
|
||||||
|
|
||||||
config.lsp.add_on_attach_mapping(function(client, bufnr)
|
|
||||||
local buf_map = utils.create_buf_map(bufnr)
|
|
||||||
|
|
||||||
buf_map('n', '<leader>r', '<cmd>lua require("cosmic-ui").rename()<cr>', { desc = 'Rename' })
|
|
||||||
buf_map('n', '<leader>la', '<cmd>lua require("cosmic-ui").code_actions()<cr>', { desc = 'Code Actions' })
|
|
||||||
buf_map(
|
|
||||||
'v',
|
|
||||||
'<leader>la',
|
|
||||||
'<cmd>lua require("cosmic-ui").range_code_actions()<cr>',
|
|
||||||
{ desc = 'Range Code Actions' }
|
|
||||||
)
|
|
||||||
end)
|
|
||||||
end,
|
|
||||||
event = 'VeryLazy',
|
|
||||||
}
|
|
|
@ -11,6 +11,7 @@ return {
|
||||||
overrides = {
|
overrides = {
|
||||||
CursorLine = { bg = '#1e1e2e' },
|
CursorLine = { bg = '#1e1e2e' },
|
||||||
LineNr = { fg = '#45475a' },
|
LineNr = { fg = '#45475a' },
|
||||||
|
TabLineSel = { bg = '#181825' },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,27 @@ local snippet = {
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
-- check if the cursor is inside a snippet.
|
||||||
|
local function in_snippet()
|
||||||
|
local session = luasnip.session
|
||||||
|
local node = session.current_nodes[vim.api.nvim_get_current_buf()]
|
||||||
|
if not node then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local snippet = node.parent.snippet
|
||||||
|
local snip_begin_pos, snip_end_pos = snippet.mark:pos_begin_end()
|
||||||
|
local pos = vim.api.nvim_win_get_cursor(0)
|
||||||
|
if pos[1] - 1 >= snip_begin_pos[1] and pos[1] - 1 <= snip_end_pos[1] then
|
||||||
|
return true -- not on row inside snippet
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- check if snippet is expandable or jumpable.
|
||||||
|
-- Only jumping if the cursor is inside the snippet
|
||||||
|
local function expandable_or_locally_jumpable()
|
||||||
|
return luasnip.expandable() or (in_snippet() and luasnip.jumpable())
|
||||||
|
end
|
||||||
|
|
||||||
local cmp_opts = {
|
local cmp_opts = {
|
||||||
enabled = function()
|
enabled = function()
|
||||||
-- disable completion in comments
|
-- disable completion in comments
|
||||||
|
@ -44,7 +65,7 @@ local cmp_opts = {
|
||||||
['<Tab>'] = cmp.mapping(function(fallback)
|
['<Tab>'] = cmp.mapping(function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.select_next_item()
|
cmp.select_next_item()
|
||||||
elseif luasnip.expand_or_jumpable() then
|
elseif expandable_or_locally_jumpable() then
|
||||||
luasnip.expand_or_jump()
|
luasnip.expand_or_jump()
|
||||||
elseif has_words_before() then
|
elseif has_words_before() then
|
||||||
cmp.complete()
|
cmp.complete()
|
||||||
|
|
29
lua/plugins/tabby.lua
Normal file
29
lua/plugins/tabby.lua
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
local theme = {
|
||||||
|
fill = 'TabLineFill',
|
||||||
|
current_tab = 'TabLineSel',
|
||||||
|
tab = 'TabLine',
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
'nanozuki/tabby.nvim',
|
||||||
|
config = function()
|
||||||
|
require('tabby').setup({
|
||||||
|
line = function(line)
|
||||||
|
return {
|
||||||
|
line.tabs().foreach(function(tab)
|
||||||
|
local hl = tab.is_current() and theme.current_tab or theme.tab
|
||||||
|
return {
|
||||||
|
' ',
|
||||||
|
tab.name(),
|
||||||
|
' ',
|
||||||
|
hl = hl,
|
||||||
|
}
|
||||||
|
end),
|
||||||
|
line.spacer(),
|
||||||
|
hl = theme.fill,
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
lazy = false,
|
||||||
|
}
|
10
lua/plugins/vimwiki.lua
Normal file
10
lua/plugins/vimwiki.lua
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
return {
|
||||||
|
'vimwiki/vimwiki',
|
||||||
|
init = function()
|
||||||
|
vim.g.vimwiki_list = {
|
||||||
|
{ path = '~/wiki', syntax = 'markdown', ext = '.md', links_space_char = '-' },
|
||||||
|
}
|
||||||
|
vim.g.vimwiki_global_ext = 0
|
||||||
|
end,
|
||||||
|
lazy = false,
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue