This commit is contained in:
2024-12-26 17:06:45 -05:00
parent e94f27a1c4
commit 4bc3ede0fc
7 changed files with 71 additions and 94 deletions

View File

@@ -1,3 +1,5 @@
vim.g.mapleader = " "
require("vxclutch.lazy_init")
require("vxclutch.set") require("vxclutch.set")
require("vxclutch.remap") require("vxclutch.remap")
require("vxclutch.lazy_init")

View File

@@ -16,7 +16,7 @@ return {
require("dapui").setup() require("dapui").setup()
require("dap-go").setup() require("dap-go").setup()
require("dap-python").setup() require("dap-python").setup()
require("dap-lldb").setup() -- require("dap-lldb").setup()
-- Handled by nvim-dap-go -- Handled by nvim-dap-go
-- dap.adapters.go = { -- dap.adapters.go = {

View File

@@ -1,32 +1,31 @@
return { return {
"folke/snacks.nvim", "folke/snacks.nvim",
priority = 1000, priority = 1000,
lazy = false, lazy = false,
---@type snacks.Config ---@type snacks.Config
opts = { opts = {
-- your configuration comes here -- your configuration comes here
-- or leave it empty to use the default settings -- or leave it empty to use the default settings
-- refer to the configuration section below -- refer to the configuration section below
bigfile = { enabled = true }, bigfile = { enabled = true },
indent = { enabled = true }, indent = { enabled = true },
input = { enabled = true }, input = { enabled = true },
quickfile = { enabled = true }, quickfile = { enabled = true },
scroll = { enabled = true }, statuscolumn = { enabled = true },
statuscolumn = { enabled = true }, words = { enabled = true },
words = { enabled = true }, },
}, keys = {
keys = { {
{ "<leader>t",
"<leader>t", function()
function() Snacks.terminal()
Snacks.terminal() end,
end, },
}, {
{ "<leader>lg",
"<leader>lg", function()
function() Snacks.lazygit()
Snacks.lazygit() end,
end, },
}, },
},
} }

View File

@@ -1,10 +1,17 @@
-- remove search highlight --
vim.keymap.set("n", "<Esc>", "<cmd>nohlsearch<CR>") vim.keymap.set("n", "<Esc>", "<cmd>nohlsearch<CR>")
-- move lines --
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv") vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
vim.keymap.set("v", "K", ":m '>-2<CR>gv=gv") vim.keymap.set("v", "K", ":m '>-2<CR>gv=gv")
-- file navigation --
vim.keymap.set("n", "-", "<cmd>Oil<CR>", { noremap = true, silent = true, desc = "Open Oil" }) vim.keymap.set("n", "-", "<cmd>Oil<CR>", { noremap = true, silent = true, desc = "Open Oil" })
-- compile --
vim.keymap.set("n", "<leader>m", ":make<CR>", { noremap = true, silent = false, desc = "Make" }) vim.keymap.set("n", "<leader>m", ":make<CR>", { noremap = true, silent = false, desc = "Make" })
-- terminal --
vim.keymap.set("n", "<leader>t", ":below term<CR>i", { noremap = true, silent = true, desc = "Open Terminal Split" }) vim.keymap.set("n", "<leader>t", ":below term<CR>i", { noremap = true, silent = true, desc = "Open Terminal Split" })
vim.keymap.set( vim.keymap.set(
"t", "t",
@@ -13,6 +20,10 @@ vim.keymap.set(
{ noremap = true, silent = true, desc = "Go from Terminal mode to Normal mode" } { noremap = true, silent = true, desc = "Go from Terminal mode to Normal mode" }
) )
-- Exec
vim.keymap.set("n", "<leader>x", "<cmd>.lua<CR>", { desc = "Execute the current line" })
vim.keymap.set("n", "<leader><leader>x", "<cmd>source %<CR>", { desc = "Execute the current file" })
-- LSP -- LSP
vim.keymap.set("n", "gd", vim.lsp.buf.definition, { noremap = true, silent = true, desc = "Go to definition" }) vim.keymap.set("n", "gd", vim.lsp.buf.definition, { noremap = true, silent = true, desc = "Go to definition" })
vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, { noremap = true, silent = true, desc = "Go to definition" }) vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, { noremap = true, silent = true, desc = "Go to definition" })
@@ -22,6 +33,7 @@ vim.keymap.set("n", "<left>", '<cmd>echo "Use h to move!!"<CR>')
vim.keymap.set("n", "<right>", '<cmd>echo "Use l to move!!"<CR>') vim.keymap.set("n", "<right>", '<cmd>echo "Use l to move!!"<CR>')
vim.keymap.set("n", "<up>", '<cmd>echo "Use k to move!!"<CR>') vim.keymap.set("n", "<up>", '<cmd>echo "Use k to move!!"<CR>')
vim.keymap.set("n", "<down>", '<cmd>echo "Use j to move!!"<CR>') vim.keymap.set("n", "<down>", '<cmd>echo "Use j to move!!"<CR>')
-- Window Controls -- Window Controls
vim.keymap.set("n", "<C-h>", "<C-w><C-h>", { desc = "Move focus to the left window" }) vim.keymap.set("n", "<C-h>", "<C-w><C-h>", { desc = "Move focus to the left window" })
vim.keymap.set("n", "<C-l>", "<C-w><C-l>", { desc = "Move focus to the right window" }) vim.keymap.set("n", "<C-l>", "<C-w><C-l>", { desc = "Move focus to the right window" })

View File

@@ -1,34 +1,27 @@
vim.g.mapleader = " " local opt = vim.opt
vim.g.maplocalleader = " "
vim.opt.number = true
vim.opt.mouse = "a"
vim.opt.showmode = false
vim.opt.breakindent = true
vim.opt.undofile = true
vim.opt.ignorecase = true
vim.opt.smartcase = true
vim.opt.signcolumn = "yes"
vim.opt.updatetime = 250
vim.opt.timeoutlen = 300
vim.opt.splitright = true
vim.opt.splitbelow = true
vim.opt.inccommand = "split"
vim.opt.cursorline = true
vim.opt.scrolloff = 8
vim.opt.tabstop = 2
vim.opt.shiftwidth = 2
vim.opt.expandtab = true
vim.bo.softtabstop = 2
vim.opt.termguicolors = true
vim.opt.guicursor = ""
vim.opt.nu = true
vim.opt.relativenumber = true
vim.opt.wrap = false
vim.opt.smartindent = true
vim.opt.swapfile = false
vim.opt.scrolloff = 8
vim.opt.updatetime = 50
vim.opt.colorcolumn = "127"
vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) -- command mode --
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) opt.inccommand = "split"
opt.smartcase = true
opt.ignorecase = true
-- line numbers --
opt.number = true
opt.relativenumber = true
-- splits --
opt.splitbelow = true
opt.splitright = true
-- opt.shiftwidth = 2 --
opt.shiftwidth = 2
-- cursor --
opt.cursorline = true
opt.guicursor = ""
opt.scrolloff = 8
-- format --
opt.formatoptions:remove "o"
opt.signcolumn = "yes"
opt.termguicolors = true

View File

@@ -1,29 +0,0 @@
return {
"nvim-telescope/telescope.nvim",
tag = "0.1.5",
dependencies = {
"nvim-lua/plenary.nvim"
},
config = function()
require('telescope').setup({})
local builtin = require('telescope.builtin')
vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
vim.keymap.set('n', '<C-p>', builtin.git_files, {})
vim.keymap.set('n', '<leader>pws', function()
local word = vim.fn.expand("<cword>")
builtin.grep_string({ search = word })
end)
vim.keymap.set('n', '<leader>pWs', function()
local word = vim.fn.expand("<cWORD>")
builtin.grep_string({ search = word })
end)
vim.keymap.set('n', '<leader>ps', function()
builtin.grep_string({ search = vim.fn.input("Grep > ") })
end)
vim.keymap.set('n', '<leader>vh', builtin.help_tags, {})
end
}