This commit is contained in:
Alexander Navarro 2023-04-07 20:27:11 -04:00
parent 65b6905417
commit 4197317adf
5 changed files with 156 additions and 124 deletions

View file

@ -1,74 +1,74 @@
return { return {
"catppuccin/nvim", "catppuccin/nvim",
name = "catppuccin", name = "catppuccin",
-- configure it -- configure it
opts = { opts = {
transparent_background = true, transparent_background = true,
term_colors = false, term_colors = false,
styles = { styles = {
comments = { "italic" }, comments = { "italic" },
conditionals = { "italic" }, conditionals = { "italic" },
loops = { "italic" }, loops = { "italic" },
functions = { "italic" }, functions = { "italic" },
keywords = { "italic" }, keywords = { "italic" },
strings = { "italic" }, strings = { "italic" },
variables = { "italic" }, variables = { "italic" },
numbers = {}, numbers = {},
booleans = {}, booleans = {},
properties = {}, properties = {},
types = {}, types = {},
operators = {}, operators = {},
}, },
integrations = { integrations = {
treesitter = true, treesitter = true,
native_lsp = { native_lsp = {
enabled = true, enabled = true,
virtual_text = { virtual_text = {
errors = { "italic" }, errors = { "italic" },
hints = { "italic" }, hints = { "italic" },
warnings = { "italic" }, warnings = { "italic" },
information = { "italic" }, information = { "italic" },
}, },
underlines = { underlines = {
errors = { "underline" }, errors = { "underline" },
hints = { "underline" }, hints = { "underline" },
warnings = { "underline" }, warnings = { "underline" },
information = { "underline" }, information = { "underline" },
}, },
}, },
lsp_trouble = true, lsp_trouble = true,
cmp = true, cmp = true,
lsp_saga = true, lsp_saga = true,
gitgutter = false, gitgutter = false,
gitsigns = true, gitsigns = true,
telescope = true, telescope = true,
nvimtree = { nvimtree = {
enabled = true, enabled = true,
show_root = true, show_root = true,
transparent_panel = true, transparent_panel = true,
}, },
indent_blankline = { enabled = true, colored_indent_levels = true }, indent_blankline = { enabled = true, colored_indent_levels = true },
neotree = { neotree = {
enabled = false, enabled = false,
show_root = true, show_root = true,
transparent_panel = false, transparent_panel = false,
}, },
dap = { enabled = true, enable_ui = false }, dap = { enabled = true, enable_ui = false },
which_key = true, which_key = true,
dashboard = true, dashboard = true,
neogit = true, neogit = true,
vim_sneak = false, vim_sneak = false,
fern = false, fern = false,
barbar = true, barbar = true,
bufferline = true, bufferline = true,
markdown = true, markdown = true,
lightspeed = false, lightspeed = false,
ts_rainbow = true, ts_rainbow = true,
hop = false, hop = false,
notify = true, notify = true,
telekasten = false, telekasten = false,
symbols_outline = true, symbols_outline = true,
mini = false, mini = false,
}, },
}, },
} }

View file

@ -1,68 +1,69 @@
return { return {
"ThePrimeagen/harpoon", "ThePrimeagen/harpoon",
config = function() lazy = false,
require("harpoon").setup({ config = function()
global_settings = { require("harpoon").setup({
-- sets the marks upon calling `toggle` on the ui, instead of require `:w`. global_settings = {
save_on_toggle = true, -- sets the marks upon calling `toggle` on the ui, instead of require `:w`.
save_on_toggle = true,
-- saves the harpoon file upon every change. disabling is unrecommended. -- saves the harpoon file upon every change. disabling is unrecommended.
save_on_change = true, save_on_change = true,
-- sets harpoon to run the command immediately as it's passed to the terminal when calling `sendCommand`. -- sets harpoon to run the command immediately as it's passed to the terminal when calling `sendCommand`.
enter_on_sendcmd = true, enter_on_sendcmd = true,
-- closes any tmux windows harpoon that harpoon creates when you close Neovim. -- closes any tmux windows harpoon that harpoon creates when you close Neovim.
tmux_autoclose_windows = false, tmux_autoclose_windows = false,
-- filetypes that you want to prevent from adding to the harpoon list menu. -- filetypes that you want to prevent from adding to the harpoon list menu.
excluded_filetypes = { "harpoon" }, excluded_filetypes = { "harpoon" },
-- set marks specific to each git branch inside git repository -- set marks specific to each git branch inside git repository
mark_branch = false, mark_branch = false,
}, },
projects = { projects = {
-- Yes $HOME works -- Yes $HOME works
["$HOME/personal/vim-with-me/server"] = { ["$HOME/personal/vim-with-me/server"] = {
term = { term = {
cmds = { cmds = {
"./env && npx ts-node src/index.ts", "./env && npx ts-node src/index.ts",
}, },
}, },
}, },
}, },
}) })
local mark = require("harpoon.mark") local mark = require("harpoon.mark")
local ui = require("harpoon.ui") local ui = require("harpoon.ui")
local telescope = require("telescope") local telescope = require("telescope")
telescope.load_extension("harpoon") telescope.load_extension("harpoon")
local function map(key, func, desc) local function map(key, func, desc)
vim.keymap.set("n", "<leader><leader>" .. key, func, { desc = desc }) vim.keymap.set("n", "<leader><leader>" .. key, func, { desc = desc })
end end
map("n", mark.add_file, "Add mark") map("n", mark.add_file, "Add mark")
map("t", ui.toggle_quick_menu, "Toogle UI") map("t", ui.toggle_quick_menu, "Toogle UI")
map("j", function() map("j", function()
ui.nav_file(1) ui.nav_file(1)
end, "Navigate to file 1") end, "Navigate to file 1")
map("k", function() map("k", function()
ui.nav_file(2) ui.nav_file(2)
end, "Navigate to file 2") end, "Navigate to file 2")
map("l", function() map("l", function()
ui.nav_file(3) ui.nav_file(3)
end, "Navigate to file 3") end, "Navigate to file 3")
map("ñ", function() map("ñ", function()
ui.nav_file(4) ui.nav_file(4)
end, "Navigate to file 4") end, "Navigate to file 4")
map("T", "<CMD>Telescope harpoon marks<CR>", "Open marks in telescope") map("T", "<CMD>Telescope harpoon marks<CR>", "Open marks in telescope")
end, end,
} }

View file

@ -36,4 +36,26 @@ return {
}) })
end, end,
}, },
{
"chrisgrieser/nvim-various-textobjs",
lazy = false,
opts = { useDefaultKeymaps = true },
},
{
"RRethy/nvim-treesitter-textsubjects",
lazy = false,
config = function()
require("nvim-treesitter.configs").setup({
textsubjects = {
enable = true,
prev_selection = ",", -- (Optional) keymap to select the previous selection
keymaps = {
["."] = "textsubjects-smart",
[";"] = "textsubjects-container-outer",
["i;"] = "textsubjects-container-inner",
},
},
})
end,
},
} }

View file

@ -8,7 +8,6 @@ return {
"fixjson", "fixjson",
"gitlint", "gitlint",
"intelephense", "intelephense",
"luacheck",
"markdownlint", "markdownlint",
"php-cs-fixer", "php-cs-fixer",
"prettierd", "prettierd",

View file

@ -0,0 +1,10 @@
return {
"chrisgrieser/nvim-spider",
event = "VeryLazy",
config = function()
vim.keymap.set({ "n", "o", "x" }, "w", "<cmd>lua require('spider').motion('w')<CR>", { desc = "Spider-w" })
vim.keymap.set({ "n", "o", "x" }, "e", "<cmd>lua require('spider').motion('e')<CR>", { desc = "Spider-e" })
vim.keymap.set({ "n", "o", "x" }, "b", "<cmd>lua require('spider').motion('b')<CR>", { desc = "Spider-b" })
vim.keymap.set({ "n", "o", "x" }, "ge", "<cmd>lua require('spider').motion('ge')<CR>", { desc = "Spider-ge" })
end,
}