start rewrite nvim config for v0.11 from scratch
This commit is contained in:
parent
cbf59bea4b
commit
895b404943
9 changed files with 365 additions and 0 deletions
57
config/nvim_unstable/lua/aleidk/plugins/colorscheme.lua
Normal file
57
config/nvim_unstable/lua/aleidk/plugins/colorscheme.lua
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
return { -- Change colors.none if not using a transparent background
|
||||
"catppuccin/nvim",
|
||||
name = "catppuccin",
|
||||
priority = 1000,
|
||||
config = function()
|
||||
local utils = require("catppuccin.utils.colors")
|
||||
|
||||
local opts = {
|
||||
flavour = "macchiato",
|
||||
transparent_background = true,
|
||||
integrations = {
|
||||
aerial = true,
|
||||
blink_cmp = true,
|
||||
cmp = true,
|
||||
gitsigns = true,
|
||||
indent_blankline = { enabled = true, scope_color = "text", },
|
||||
lsp_trouble = true,
|
||||
mason = true,
|
||||
noice = true,
|
||||
notify = true,
|
||||
},
|
||||
custom_highlights = function(colors)
|
||||
return {
|
||||
-- Fix colors for cmp
|
||||
Pmenu = { bg = colors.none, blend = 0 },
|
||||
FloatBorder = { bg = colors.none },
|
||||
CmpItemMenu = { fg = colors.text, bg = colors.none },
|
||||
-- dadbod-ui
|
||||
NotificationInfo = { bg = colors.none, fg = colors.text },
|
||||
NotificationWarning = { bg = colors.none, fg = colors.yellow },
|
||||
NotificationError = { bg = colors.none, fg = colors.red },
|
||||
|
||||
-- for word diff in previews
|
||||
GitSignsAddInline = {
|
||||
fg = colors.teal,
|
||||
bg = utils.darken(colors.teal, 0.4),
|
||||
style = { "bold" },
|
||||
},
|
||||
GitSignsDeleteInline = {
|
||||
fg = colors.red,
|
||||
bg = utils.darken(colors.red, 0.4),
|
||||
style = { "bold" },
|
||||
},
|
||||
GitSignsChangeInline = {
|
||||
fg = colors.mauve,
|
||||
bg = utils.darken(colors.mauve, 0.4),
|
||||
style = { "bold" },
|
||||
},
|
||||
GitSignsDeleteVirtLn = { bg = colors.none, fg = colors.red },
|
||||
}
|
||||
end,
|
||||
}
|
||||
|
||||
require("catppuccin").setup(opts)
|
||||
vim.cmd.colorscheme("catppuccin-macchiato")
|
||||
end,
|
||||
}
|
||||
6
config/nvim_unstable/lua/aleidk/plugins/init.lua
Normal file
6
config/nvim_unstable/lua/aleidk/plugins/init.lua
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
return {
|
||||
'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
|
||||
|
||||
|
||||
|
||||
}
|
||||
84
config/nvim_unstable/lua/aleidk/plugins/treesitter.lua
Normal file
84
config/nvim_unstable/lua/aleidk/plugins/treesitter.lua
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
return {
|
||||
-- Highlight, edit, and navigate code
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
event = { "BufReadPost", "BufNewFile", "BufWritePre", "VeryLazy" },
|
||||
dependencies = {
|
||||
"nvim-treesitter/nvim-treesitter-textobjects",
|
||||
"JoosepAlviste/nvim-ts-context-commentstring",
|
||||
"nvim-treesitter/nvim-treesitter-context",
|
||||
{ "windwp/nvim-ts-autotag", opts = {} },
|
||||
},
|
||||
build = ":TSUpdate",
|
||||
config = function()
|
||||
---@diagnostic disable-next-line: missing-fields
|
||||
require("nvim-treesitter.configs").setup({
|
||||
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
|
||||
auto_install = true,
|
||||
highlight = { enable = true },
|
||||
indent = { enable = true },
|
||||
incremental_selection = {
|
||||
enable = true,
|
||||
},
|
||||
textobjects = {
|
||||
select = {
|
||||
enable = true,
|
||||
lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
|
||||
keymaps = {
|
||||
-- You can use the capture groups defined in textobjects.scm
|
||||
["aa"] = "@parameter.outer",
|
||||
["ia"] = "@parameter.inner",
|
||||
["af"] = "@function.outer",
|
||||
["if"] = "@function.inner",
|
||||
["ac"] = "@class.outer",
|
||||
["ic"] = "@class.inner",
|
||||
},
|
||||
},
|
||||
move = {
|
||||
enable = true,
|
||||
set_jumps = true, -- whether to set jumps in the jumplist
|
||||
goto_previous = { -- current or last start of object
|
||||
["[["] = { query = "@local.scope", query_group = "locals", desc = "Next scope" },
|
||||
["[f"] = "@function.outer",
|
||||
["[c"] = "@class.outer",
|
||||
},
|
||||
goto_next = { -- next object end
|
||||
["]]"] = { query = "@local.scope", query_group = "locals", desc = "Next scope" },
|
||||
["]f"] = "@function.outer", -- current function end
|
||||
["]c"] = "@class.outer",
|
||||
},
|
||||
},
|
||||
swap = {
|
||||
enable = true,
|
||||
swap_next = {
|
||||
["<leader>ln"] = "@parameter.inner",
|
||||
},
|
||||
swap_previous = {
|
||||
["<leader>lN"] = "@parameter.inner",
|
||||
},
|
||||
},
|
||||
},
|
||||
-- autotag = { enable = true },
|
||||
})
|
||||
|
||||
require('ts_context_commentstring').setup {
|
||||
enable_autocmd = false,
|
||||
}
|
||||
|
||||
local ts_repeat_move = require "nvim-treesitter.textobjects.repeatable_move"
|
||||
|
||||
-- Repeat movement with ; and ,
|
||||
-- ensure , goes forward and ; goes backward regardless of the last direction
|
||||
vim.keymap.set({ "n", "x", "o" }, ",", ts_repeat_move.repeat_last_move_next)
|
||||
vim.keymap.set({ "n", "x", "o" }, ";", ts_repeat_move.repeat_last_move_previous)
|
||||
|
||||
-- Optionally, make builtin f, F, t, T also repeatable with ; and ,
|
||||
vim.keymap.set({ "n", "x", "o" }, "f", ts_repeat_move.builtin_f_expr, { expr = true })
|
||||
vim.keymap.set({ "n", "x", "o" }, "F", ts_repeat_move.builtin_F_expr, { expr = true })
|
||||
vim.keymap.set({ "n", "x", "o" }, "t", ts_repeat_move.builtin_t_expr, { expr = true })
|
||||
vim.keymap.set({ "n", "x", "o" }, "T", ts_repeat_move.builtin_T_expr, { expr = true })
|
||||
|
||||
vim.keymap.set("n", "[u", function()
|
||||
require("treesitter-context").go_to_context()
|
||||
end, { silent = true, noremap = true, desc = "Go up when context is out of view" })
|
||||
end,
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue