diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 30a7b95..cffe33f 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -6,8 +6,8 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "compile-mode.nvim": { "branch": "nightly", "commit": "a2ee3b791436ff61ddc0a3e0c1d04dfabd1cfef4" }, "conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" }, + "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" }, "fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" }, "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, "gruvbox": { "branch": "main", "commit": "68c3460a5d1d1a362318960035c9f3466d5011f5" }, @@ -16,13 +16,7 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, - "nvim-dap": { "branch": "master", "commit": "665d3569a86395fe0dab85efbdb26d7d2ee57e49" }, - "nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" }, - "nvim-dap-lldb": { "branch": "main", "commit": "81273514fdb5107b79090364b57a3ff5570bea21" }, - "nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" }, - "nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" }, - "nvim-lspconfig": { "branch": "master", "commit": "ff2b85abaa810f6611233dbe6d31c07510ebf43d" }, - "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, + "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" }, "nvim-web-devicons": { "branch": "master", "commit": "63f552a7f59badc6e6b6d22e603150f0d5abebb7" }, "oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/compile.lua b/nvim/.config/nvim/lua/vxclutch/lazy/compile.lua deleted file mode 100644 index 083f68b..0000000 --- a/nvim/.config/nvim/lua/vxclutch/lazy/compile.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - "ej-shafran/compile-mode.nvim", - branch = "nightly", - dependencies = { - "nvim-lua/plenary.nvim", - }, - config = function() - ---@type CompileModeOpts - vim.g.compile_mode = {} - end, -} diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/dap.lua b/nvim/.config/nvim/lua/vxclutch/lazy/dap.lua deleted file mode 100644 index f6bb0d9..0000000 --- a/nvim/.config/nvim/lua/vxclutch/lazy/dap.lua +++ /dev/null @@ -1,83 +0,0 @@ -return { - { - "mfussenegger/nvim-dap", - dependencies = { - "leoluz/nvim-dap-go", - "rcarriga/nvim-dap-ui", - "nvim-neotest/nvim-nio", - "williamboman/mason.nvim", - "julianolf/nvim-dap-lldb", - "mfussenegger/nvim-dap-python", - }, - config = function() - local dap = require "dap" - local ui = require "dapui" - - require("dapui").setup() - require("dap-go").setup() - require("dap-python").setup() - -- require("dap-lldb").setup() - - -- Handled by nvim-dap-go - -- dap.adapters.go = { - -- type = "server", - -- port = "${port}", - -- executable = { - -- command = "dlv", - -- args = { "dap", "-l", "127.0.0.1:${port}" }, - -- }, - -- } - - -- dap.adapters.lldb = { - -- type = "executable", - -- command = "/usr/bin/lldb", -- Adjust path if necessary - -- name = "lldb", - -- } - - dap.configurations.cpp = { - { - name = "Launch", - type = "lldb", - request = "launch", - program = function() - return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file") - end, - cwd = "${workspaceFolder}", - stopOnEntry = false, - args = {}, - runInTerminal = false, - }, - } - dap.configurations.c = dap.configurations.cpp - dap.configurations.rust = dap.configurations.cpp - - vim.keymap.set("n", "b", dap.toggle_breakpoint) - vim.keymap.set("n", "gb", dap.run_to_cursor) - - -- Eval var under cursor - vim.keymap.set("n", "?", function() - require("dapui").eval(nil, { enter = true }) - end) - - vim.keymap.set("n", "dc", dap.continue) - vim.keymap.set("n", "s", dap.step_into) - vim.keymap.set("n", "n", dap.step_over) - vim.keymap.set("n", "do", dap.step_out) - vim.keymap.set("n", "db", dap.step_back) - vim.keymap.set("n", "dr", dap.restart) - - dap.listeners.before.attach.dapui_config = function() - ui.open() - end - dap.listeners.before.launch.dapui_config = function() - ui.open() - end - dap.listeners.before.event_terminated.dapui_config = function() - ui.close() - end - dap.listeners.before.event_exited.dapui_config = function() - ui.close() - end - end, - }, -} diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/git.lua b/nvim/.config/nvim/lua/vxclutch/lazy/git.lua index 0b426c0..3bf8496 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/git.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/git.lua @@ -1,3 +1,18 @@ return { - "tpope/vim-fugitive" + { + "tpope/vim-fugitive", + }, + + { + "lewis6991/gitsigns.nvim", + opts = { + signs = { + add = { text = "+" }, + change = { text = "~" }, + delete = { text = "_" }, + topdelete = { text = "‾" }, + changedelete = { text = "~" }, + }, + }, + }, } diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/gitsigns.lua b/nvim/.config/nvim/lua/vxclutch/lazy/gitsigns.lua deleted file mode 100644 index 44a7d98..0000000 --- a/nvim/.config/nvim/lua/vxclutch/lazy/gitsigns.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - "lewis6991/gitsigns.nvim", - opts = { - signs = { - add = { text = "+" }, - change = { text = "~" }, - delete = { text = "_" }, - topdelete = { text = "‾" }, - changedelete = { text = "~" }, - }, - }, -} diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/snacks.lua b/nvim/.config/nvim/lua/vxclutch/lazy/snacks.lua index 9e27656..085252c 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/snacks.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/snacks.lua @@ -1,31 +1,37 @@ return { - "folke/snacks.nvim", - priority = 1000, - lazy = false, - ---@type snacks.Config - opts = { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - bigfile = { enabled = true }, - indent = { enabled = true }, - input = { enabled = true }, - quickfile = { enabled = true }, - statuscolumn = { enabled = true }, - words = { enabled = true }, + -- this is a sort of related + { + "stevearc/dressing.nvim" }, - keys = { - { - "t", - function() - Snacks.terminal() - end, + { + "folke/snacks.nvim", + priority = 1000, + lazy = false, + ---@type snacks.Config + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + bigfile = { enabled = true }, + indent = { enabled = true }, + input = { enabled = true }, + quickfile = { enabled = true }, + statuscolumn = { enabled = true }, + words = { enabled = true }, }, - { - "lg", - function() - Snacks.lazygit() - end, + keys = { + { + "t", + function() + Snacks.terminal.toggle() + end, + }, + { + "lg", + function() + Snacks.lazygit() + end, + }, }, }, } diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/telescope.lua b/nvim/.config/nvim/lua/vxclutch/lazy/telescope.lua index 21fe0a3..2a65f87 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/telescope.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/telescope.lua @@ -1,36 +1,27 @@ return { - "nvim-telescope/telescope.nvim", + "nvim-telescope/telescope.nvim", - tag = "0.1.5", + tag = "0.1.5", - dependencies = { - "nvim-lua/plenary.nvim", - }, + dependencies = { + "nvim-lua/plenary.nvim", + }, - config = function() - require("telescope").setup({}) + config = function() + require("telescope").setup {} - local builtin = require("telescope.builtin") - vim.keymap.set("n", "sf", builtin.find_files, {}) - vim.keymap.set("n", "", builtin.git_files, {}) - vim.keymap.set("n", "ps", function() - builtin.grep_string({ search = vim.fn.input("Grep > ") }) - end) - vim.keymap.set("n", "vh", builtin.help_tags, {}) - vim.keymap.set("n", "", function() - builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({ - winblend = 10, - previewer = false, - })) - end, { desc = "[/] Fuzzily search in current buffer" }) - vim.keymap.set("n", "s/", function() - builtin.live_grep({ - grep_open_files = true, - prompt_title = "Live Grep in Open Files", - }) - end, { desc = "[S]earch [/] in Open Files" }) - vim.keymap.set("n", "sn", function() - builtin.find_files({ cwd = vim.fn.stdpath("config") }) - end, { desc = "[S]earch [N]eovim files" }) - end, + local builtin = require "telescope.builtin" + vim.keymap.set("n", "sf", builtin.find_files, {}) + vim.keymap.set("n", "", builtin.git_files, {}) + vim.keymap.set("n", "vh", builtin.help_tags, {}) + vim.keymap.set("n", "", function() + builtin.live_grep { + grep_open_files = true, + prompt_title = "Live Grep in Open Files", + } + end, { desc = "[S]earch [/] in Open Files" }) + vim.keymap.set("n", "sn", function() + builtin.find_files { cwd = vim.fn.stdpath "config" } + end, { desc = "[S]earch [N]eovim files" }) + end, } diff --git a/nvim/.config/nvim/lua/vxclutch/remap.lua b/nvim/.config/nvim/lua/vxclutch/remap.lua index c8bbd2a..baa8087 100644 --- a/nvim/.config/nvim/lua/vxclutch/remap.lua +++ b/nvim/.config/nvim/lua/vxclutch/remap.lua @@ -10,11 +10,6 @@ set("v", "K", ":m '>-2gv=gv") -- file navigation -- set("n", "-", "Oil", { noremap = true, silent = true, desc = "Open Oil" }) --- compile -- -set("n", "m", ":make", { noremap = true, silent = false, desc = "Make" }) -set("n", "cc", ":Compile", { noremap = true, silent = false, desc = "Compile" }) -set("n", "rc", ":Recompile", { noremap = true, silent = false, desc = "Recompile" }) - -- terminal -- set("n", "t", ":below termi", { noremap = true, silent = true, desc = "Open Terminal Split" }) set("t", "", "", { noremap = true, silent = true, desc = "Exit terminal and goto normal mode" })