feat: update neovim plugins, i3 rules, and shell environment
- **i3**: force Lutris windows to floating mode
- **nvim/colorizer**: switch to `catgoose/nvim-colorizer.lua` and simplify config
- **nvim/leap**: migrate source to Codeberg and expand search to visual/operator-pending modes
- **nvim/lsp**:
- add devicons and treesitter as explicit dependencies
- switch completion formatting from `kind` to `icon`
- disable cmake lsp from mason auto-install
- **nvim/treesitter**:
- refactor initialization to manually handle parser installation
- add custom FileType autocmd for treesitter starting and indentation
- **nvim/markdown**: remove language border from code blocks
- **tmux**: switch default terminal from xterm to screen-256color
- **zsh**: remove direnv hook
Signed-off-by: erick-alcachofa <erick@artichoke.dev>
This commit is contained in:
parent
4563646e25
commit
fc7236a328
@ -115,6 +115,7 @@ bindsym $mod+r mode "resize"
|
||||
|
||||
for_window [window_role="pop-up"] floating enable
|
||||
for_window [window_role="task_dialog"] floating enable
|
||||
for_window [class="Lutris"] floating enable
|
||||
|
||||
for_window [class="vol"] floating enable, resize set 800 500, move to scratchpad
|
||||
for_window [class="ttrm|sys"] floating enable, resize set 1000 680, move to scratchpad
|
||||
|
||||
@ -1,18 +1,7 @@
|
||||
return {
|
||||
"norcalli/nvim-colorizer.lua",
|
||||
"catgoose/nvim-colorizer.lua",
|
||||
config = function(_, opts)
|
||||
require('colorizer').setup(opts, {
|
||||
RGB = true,
|
||||
RRGGBB = true,
|
||||
names = false,
|
||||
RRGGBBAA = false,
|
||||
rgb_fn = false,
|
||||
hsl_fn = false,
|
||||
css = false,
|
||||
css_fn = false
|
||||
})
|
||||
require('colorizer').setup(opts)
|
||||
end,
|
||||
opts = {
|
||||
'*';
|
||||
}
|
||||
opts = {}
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
return {
|
||||
"ggandor/leap.nvim",
|
||||
url = "https://codeberg.org/andyg/leap.nvim",
|
||||
dependencies = {
|
||||
"tpope/vim-repeat"
|
||||
},
|
||||
@ -10,9 +10,7 @@ return {
|
||||
leap.opts[k] = v
|
||||
end
|
||||
|
||||
leap.add_default_mappings(true)
|
||||
|
||||
vim.keymap.set("n", "s", function()
|
||||
vim.keymap.set({ "n", "x", "o" }, "s", function()
|
||||
require("leap").leap({ target_windows = { vim.api.nvim_get_current_win() } })
|
||||
end)
|
||||
end
|
||||
|
||||
@ -5,6 +5,8 @@ return {
|
||||
"hrsh7th/cmp-path",
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
"onsails/lspkind.nvim",
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
|
||||
{
|
||||
"L3MON4D3/LuaSnip",
|
||||
@ -18,6 +20,29 @@ return {
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
}
|
||||
},
|
||||
|
||||
-- {
|
||||
-- dir = "/home/artichoke/dev/thirdparty/ziex/ziex.nvim",
|
||||
-- name = "ziex",
|
||||
-- dependencies = {
|
||||
-- "neovim/nvim-lspconfig",
|
||||
-- "nvim-treesitter/nvim-treesitter",
|
||||
-- },
|
||||
-- config = function()
|
||||
-- require("ziex").setup({
|
||||
-- lsp = {
|
||||
-- inlay_hints = false,
|
||||
-- auto_reopen = true,
|
||||
-- diagnostics_filter = true,
|
||||
-- },
|
||||
-- keymaps = {
|
||||
-- enable = true,
|
||||
-- inspect = "<leader>zh",
|
||||
-- inspect_tree = "<leader>zt",
|
||||
-- }
|
||||
-- })
|
||||
-- end,
|
||||
-- }
|
||||
},
|
||||
|
||||
config = function()
|
||||
@ -25,8 +50,6 @@ return {
|
||||
|
||||
vim.g.zig_fmt_autosave = false
|
||||
|
||||
local default_capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
|
||||
vim.diagnostic.config {
|
||||
signs = {
|
||||
text = {
|
||||
@ -69,18 +92,6 @@ return {
|
||||
end
|
||||
})
|
||||
|
||||
-- vim.api.nvim_set_hl(0, 'CmpItemAbbrDeprecated', { bg='NONE', strikethrough=true, fg='#808080' })
|
||||
-- vim.api.nvim_set_hl(0, 'CmpItemAbbrMatch', { bg='NONE', fg='#569CD6' })
|
||||
-- vim.api.nvim_set_hl(0, 'CmpItemAbbrMatchFuzzy', { link='CmpIntemAbbrMatch' })
|
||||
-- vim.api.nvim_set_hl(0, 'CmpItemKindVariable', { bg='NONE', fg='#9CDCFE' })
|
||||
-- vim.api.nvim_set_hl(0, 'CmpItemKindInterface', { link='CmpItemKindVariable' })
|
||||
-- vim.api.nvim_set_hl(0, 'CmpItemKindText', { link='CmpItemKindVariable' })
|
||||
-- vim.api.nvim_set_hl(0, 'CmpItemKindFunction', { bg='NONE', fg='#C586C0' })
|
||||
-- vim.api.nvim_set_hl(0, 'CmpItemKindMethod', { link='CmpItemKindFunction' })
|
||||
-- vim.api.nvim_set_hl(0, 'CmpItemKindKeyword', { bg='NONE', fg='#D4D4D4' })
|
||||
-- vim.api.nvim_set_hl(0, 'CmpItemKindProperty', { link='CmpItemKindKeyword' })
|
||||
-- vim.api.nvim_set_hl(0, 'CmpItemKindUnit', { link='CmpItemKindKeyword' })
|
||||
|
||||
cmp.setup {
|
||||
sources = {
|
||||
{ name = 'path' },
|
||||
@ -131,12 +142,11 @@ return {
|
||||
},
|
||||
formatting = {
|
||||
fields = {
|
||||
"kind", "abbr", "menu"
|
||||
"icon", "abbr", "menu"
|
||||
},
|
||||
format = function(entry, vim_item)
|
||||
local kind = require('lspkind').cmp_format({
|
||||
maxwidth = 50,
|
||||
mode = 'symbol',
|
||||
preset = 'default',
|
||||
menu = {
|
||||
buffer = "[Buf]",
|
||||
@ -147,7 +157,7 @@ return {
|
||||
}
|
||||
})(entry, vim_item)
|
||||
|
||||
kind.kind = " " .. kind.kind .. " "
|
||||
kind.icon = " " .. kind.icon .. " "
|
||||
|
||||
return kind
|
||||
end
|
||||
@ -270,7 +280,7 @@ return {
|
||||
require('mason-lspconfig').setup {
|
||||
ensure_installed = {
|
||||
"taplo",
|
||||
"cmake",
|
||||
-- "cmake",
|
||||
"biome",
|
||||
"gopls",
|
||||
"bashls",
|
||||
|
||||
@ -50,6 +50,9 @@ return {
|
||||
bullet = {
|
||||
icons = { '', '', '', '' },
|
||||
},
|
||||
code = {
|
||||
language_border = '',
|
||||
},
|
||||
win_options = {
|
||||
showbreak = {
|
||||
default = '',
|
||||
|
||||
@ -1,14 +1,25 @@
|
||||
return {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
lazy = false,
|
||||
branch = "main",
|
||||
build = ":TSUpdate",
|
||||
config = function(plugin, opts)
|
||||
require("nvim-treesitter.configs").setup(opts)
|
||||
config = function(_, opts)
|
||||
require("nvim-treesitter").setup(opts)
|
||||
end,
|
||||
opts = {
|
||||
modules = {},
|
||||
ignore_install = {},
|
||||
auto_install = false,
|
||||
ensure_installed = {
|
||||
sync_install = true,
|
||||
highlight = {
|
||||
enable = true,
|
||||
use_languagetree = true,
|
||||
additional_vim_regex_highlighting = false
|
||||
},
|
||||
indent = {
|
||||
enable = true
|
||||
},
|
||||
},
|
||||
init = function()
|
||||
local ensure_installed = {
|
||||
"c",
|
||||
"go",
|
||||
"asm",
|
||||
@ -30,15 +41,22 @@ return {
|
||||
"markdown",
|
||||
"dockerfile",
|
||||
"markdown_inline",
|
||||
},
|
||||
sync_install = false,
|
||||
highlight = {
|
||||
enable = true,
|
||||
use_languagetree = true,
|
||||
additional_vim_regex_highlighting = false
|
||||
},
|
||||
indent = {
|
||||
enable = true
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
local already_installed = require('nvim-treesitter.config').get_installed()
|
||||
local to_install = vim.iter(ensure_installed)
|
||||
:filter(function(parser)
|
||||
return not vim.tbl_contains(already_installed, parser)
|
||||
end)
|
||||
:totable()
|
||||
|
||||
require('nvim-treesitter').install(to_install)
|
||||
|
||||
vim.api.nvim_create_autocmd('FileType', {
|
||||
callback = function ()
|
||||
pcall(vim.treesitter.start)
|
||||
vim.bo.indentexpr = "v:lua.require 'nvim-treesitter'.indentexpr()"
|
||||
end
|
||||
})
|
||||
end
|
||||
}
|
||||
|
||||
@ -52,8 +52,8 @@ run '~/.config/tmux/plugins/tpm/tpm'
|
||||
set -g allow-passthrough on
|
||||
|
||||
set -g status-position bottom
|
||||
set -g default-terminal "xterm-256color"
|
||||
set -ag terminal-overrides ",xterm-256color:RGB"
|
||||
set -g default-terminal "screen-256color"
|
||||
set -ga terminal-overrides ",screen-256color:RGB"
|
||||
|
||||
set -ga update-environment TERM
|
||||
set -ga update-environment TERM_PROGRAM
|
||||
|
||||
@ -287,7 +287,6 @@ autoload -Uz compinit && compinit
|
||||
zinit cdreplay -q
|
||||
|
||||
eval "$(fzf --zsh)"
|
||||
eval "$(direnv hook zsh)"
|
||||
eval "$(zoxide init zsh --cmd zxd)"
|
||||
eval "$(starship init zsh)"
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user