commit b5fa76e298cd4334c8a735240cbc42e62d4716b1 parent bb40d7d7858512729b42b01acea5616d9b4a1ea4 Author: mdnrz <mehdeenoroozi@gmail.com> Date: Thu, 15 May 2025 17:24:55 +0330 nvim: use lazy Diffstat:
19 files changed, 571 insertions(+), 33 deletions(-)
diff --git a/nvim/.config/nvim/after/colors.lua b/nvim/.config/nvim/after/colors.lua @@ -0,0 +1,8 @@ +vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) +vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) +vim.api.nvim_set_hl(0, "SignColumn", { bg = "none" }) +vim.api.nvim_set_hl(0, "LineNr", { fg = "White" }) +vim.api.nvim_set_hl(0, "StatusLine", { bg = "#334455" }) +vim.api.nvim_set_hl(0, "StatusLineNC", { bg = "#333333" }) +vim.cmd.colorscheme("gruvbuddy") + diff --git a/nvim/.config/nvim/after/ftplugin/lua.lua b/nvim/.config/nvim/after/ftplugin/lua.lua @@ -0,0 +1,3 @@ +local set = vim.opt_local + +set.shiftwidth = 2 diff --git a/nvim/.config/nvim/after/plugin/colors.lua b/nvim/.config/nvim/after/plugin/colors.lua @@ -1,5 +1,5 @@ function ColorMyNvim(color) - color = color or "monochrome" + color = color or "gruvbuddy" vim.cmd.colorscheme(color) vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) diff --git a/nvim/.config/nvim/after/plugin/compile-mode.lua b/nvim/.config/nvim/after/plugin/compile-mode.lua @@ -6,4 +6,16 @@ require("compile-mode").setup({ ask_to_interrupt = true, baleia_setup = true, }) +-- +-- +---@type CompileModeOpts +-- vim.g.compile_mode = { +-- buffer_name = "*compilation*", +-- default_command = "make -k", +-- time_format = "%a %b %e %H:%M:%S", +-- ask_about_save = true, +-- ask_to_interrupt = true, +-- baleia_setup = true, -- only works if you have baleia.nvim installed + -- bang_expansion = true, -- optional: acts more like `:!` +-- } diff --git a/nvim/.config/nvim/after/plugin/dap.lua b/nvim/.config/nvim/after/plugin/dap.lua @@ -0,0 +1,12 @@ +local dap = require"dap" +dap.configurations.lua = { + { + type = 'nlua', + request = 'launch', + name = "Attach to running Neovim instance", + } +} + +dap.adapters.nlua = function(callback, config) + callback({ type = 'server', host = config.host or "127.0.0.1", port = config.port or 8086 }) +end diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua @@ -1,2 +1,3 @@ - -require("mehdi") +require("config.lazy") +require("config.keymaps") +require("config.settings") diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json @@ -0,0 +1,21 @@ +{ + "baleia.nvim": { "branch": "main", "commit": "fb3aff021b2b64ef820d0230d2c22ebfaf71bb6a" }, + "colorbuddy.nvim": { "branch": "master", "commit": "8b968581e5c19d22a861d5f3fe5dbd83394fa681" }, + "compile-mode.nvim": { "branch": "mdnrz", "commit": "a5a0afee2ddb92277597ea017452fdea015ab008" }, + "gruvbuddy.nvim": { "branch": "master", "commit": "3aa94b2fb061b13ccc118d21fad25d6b1ff3fc8b" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, + "nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" }, + "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" }, + "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" }, + "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, + "nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" }, + "oil.nvim": { "branch": "master", "commit": "685cdb4ffa74473d75a1b97451f8654ceeab0f4a" }, + "one-small-step-for-vimkind": { "branch": "main", "commit": "319346e4d977623c7af66c1c520531b68b8c3542" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, + "vim-dadbod": { "branch": "master", "commit": "fa31d0ffeebaa59cf97a81e7f92194cced54a13f" }, + "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }, + "vim-monochrome": { "branch": "main", "commit": "c4f18812bbdbe640ffddf69e0c5734ec87d6b5e7" } +} diff --git a/nvim/.config/nvim/lua/config/keymaps.lua b/nvim/.config/nvim/lua/config/keymaps.lua @@ -0,0 +1,27 @@ + +vim.keymap.set("n", "-", "<CMD>Oil<CR>", { desc = "Open parent directory" }) +vim.keymap.set("i", "jk", "<Esc>", {}) + +-- Focus on a window by its name +function FocusWindowByName(name) + vim.cmd("Recompile") + for _, win in ipairs(vim.api.nvim_tabpage_list_wins(0)) do + local buf = vim.api.nvim_win_get_buf(win) + local bufname = vim.api.nvim_buf_get_name(buf) + if bufname:match(name) then + vim.api.nvim_set_current_win(win) + return + end + end + print("No window found with name: " .. name) +end + +-- Run :Recompile and focus on the "compilation" pane +-- vim.cmd('command! RecompileAndFocus lua FocusWindowByName("compilation")') +-- vim.keymap.set('n', '<leader>r', ':RecompileAndFocus<CR>', { noremap = true, silent = true }) + +vim.keymap.set("n", "<leader>c", ":Compile<C-F>") +vim.keymap.set("n", "<leader>r", ":Recompile<CR>") +vim.keymap.set("n", "<C-F>", ":silent !tmux neww sessionizer<CR>") + + diff --git a/nvim/.config/nvim/lua/config/lazy.lua b/nvim/.config/nvim/lua/config/lazy.lua @@ -0,0 +1,40 @@ +-- Bootstrap lazy.nvim +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +-- Make sure to setup `mapleader` and `maplocalleader` before +-- loading lazy.nvim so that mappings are correct. +-- This is also a good place to setup other settings (vim.opt) +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" + +-- Setup lazy.nvim +require("lazy").setup({ + spec = { + "tpope/vim-fugitive", + "tpope/vim-dadbod", + "tjdevries/colorbuddy.nvim", + "tjdevries/gruvbuddy.nvim", + "fxn/vim-monochrome", +-- import your plugins + { import = "config.plugins" }, + }, + -- Configure any other settings here. See the documentation for more details. + -- colorscheme that will be used when installing plugins. + install = { colorscheme = { "habamax" } }, + -- automatically check for plugin updates + checker = { enabled = false }, +}) diff --git a/nvim/.config/nvim/lua/config/plugins/compile-mode.lua b/nvim/.config/nvim/lua/config/plugins/compile-mode.lua @@ -0,0 +1,42 @@ +return { + "mdnrz/compile-mode.nvim", + branch = "mdnrz", + -- version = "^5.0.0", + -- you can just use the latest version: + -- branch = "latest", + -- or the most up-to-date updates: + -- branch = "nightly", + + dependencies = { + "nvim-lua/plenary.nvim", + -- if you want to enable coloring of ANSI escape codes in + -- compilation output, add: + { "m00qek/baleia.nvim", tag = "v1.3.0" }, + }, + config = function() + ---@type CompileModeOpts + vim.g.compile_mode = { + -- to add ANSI escape code support, add: + baleia_setup = true, + jump_to_previous_buffer = false, + + -- to make `:Compile` replace special characters (e.g. `%`) in + -- the command (and behave more like `:!`), add: + -- bang_expansion = true, + error_regexp_table = { + rust_error = { + regex = '^ *--> \\(.*[^:]\\):\\([0-9^:]\\+\\):\\([0-9]\\+\\)$', + filename = 1, + row = 2, + col = 3 + }, + rust_panic = { + regex = "^thread .*[^ ] panicked at \\([a-zA-z\\._]\\+\\):\\([0-9]\\+\\):\\([0-9]\\+\\):$", + filename = 1, + row = 2, + col = 3 + } + }, + } + end +} diff --git a/nvim/.config/nvim/lua/config/plugins/debug.lua b/nvim/.config/nvim/lua/config/plugins/debug.lua @@ -0,0 +1,70 @@ +return { + "mfussenegger/nvim-dap", + dependencies = { + "nvim-neotest/nvim-nio", + { + "rcarriga/nvim-dap-ui", + + opts = { + floating = { border = 'rounded' }, + }, + }, + + { + "jbyuki/one-small-step-for-vimkind", + keys = { + { + '<leader>dl', + function() + require('osv').launch { port = 8086 } + end, + desc = 'Launch Lua adapter', + }, + }, + }, + + "leoluz/nvim-dap-go", + }, + + keys = { + { '<leader>db', function() require('dap').toggle_breakpoint() end, desc = 'Toggle breakpoint', }, + { '<leader>di', function() require('dap').list_breakpoints() end, desc = 'List breakpoint', }, + { '<leader>dc', function() require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ') end, desc = 'Breakpoint condition', }, + { '<F5>', function() require('dap').continue() end, desc = 'Continue', }, + { '<F6>', function() require('dap').step_into() end, desc = 'Step into', }, + { '<F7>', function() require('dap').step_over() end, desc = 'Step over', }, + { '<F8>', function() require('dap').step_out() end, desc = 'Step Out', }, + { '<F12>', function() require('dap').terminate() end, desc = 'Terminate', }, + }, + + config = function() + local dap = require('dap') + local ui = require('dapui') + + -- require("dapui").setup() + vim.api.nvim_create_autocmd("VimEnter", { + callback = function() + dapui.setup() + end, + }) + require("dap-go").setup() + + 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 + + dap.configurations.lua = { + { + type = 'nlua', + request = 'attach', + name = "Attach to running Neovim instance", + } + } + + dap.adapters.nlua = function(callback, config) + callback({ type = 'server', host = config.host or "127.0.0.1", port = config.port or 8086 }) + end + + end +} diff --git a/nvim/.config/nvim/lua/config/plugins/nvim-treesitter.lua b/nvim/.config/nvim/lua/config/plugins/nvim-treesitter.lua @@ -0,0 +1,38 @@ +return { + 'nvim-treesitter/nvim-treesitter', + config = function() + require'nvim-treesitter.configs'.setup { + -- A list of parser names, or "all" (the listed parsers MUST always be installed) + ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "markdown", "markdown_inline" }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + -- Automatically install missing parsers when entering buffer + -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally + auto_install = false, + + -- List of parsers to ignore installing (or "all") + ignore_install = { "javascript" }, + + ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) + -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! + + highlight = { + disable = function(lang, buf) + local max_filesize = 100 * 1024 -- 100 KB + local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) + if ok and stats and stats.size > max_filesize then + return true + end + end, + + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = false, + }, + } + end +} diff --git a/nvim/.config/nvim/lua/config/plugins/oil.lua b/nvim/.config/nvim/lua/config/plugins/oil.lua @@ -0,0 +1,215 @@ +return { + 'stevearc/oil.nvim', + ---@module 'oil' + ---@type oil.SetupOpts + opts = {}, + -- Optional dependencies + dependencies = { { "echasnovski/mini.icons", opts = {} } }, + -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons + -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations. + lazy = false, + config = function() + require("oil").setup({ + -- Oil will take over directory buffers (e.g. `vim .` or `:e src/`) + -- Set to false if you want some other plugin (e.g. netrw) to open when you edit directories. + default_file_explorer = true, + -- Id is automatically added at the beginning, and name at the end + -- See :help oil-columns + columns = { + "icon", + "permissions", + "size", + "mtime", + }, + -- Buffer-local options to use for oil buffers + buf_options = { + buflisted = false, + bufhidden = "hide", + }, + -- Window-local options to use for oil buffers + win_options = { + wrap = false, + signcolumn = "no", + cursorcolumn = false, + foldcolumn = "0", + spell = false, + list = false, + conceallevel = 3, + concealcursor = "nvic", + }, + -- Send deleted files to the trash instead of permanently deleting them (:help oil-trash) + delete_to_trash = false, + -- Skip the confirmation popup for simple operations (:help oil.skip_confirm_for_simple_edits) + skip_confirm_for_simple_edits = false, + -- Selecting a new/moved/renamed file or directory will prompt you to save changes first + -- (:help prompt_save_on_select_new_entry) + prompt_save_on_select_new_entry = true, + -- Oil will automatically delete hidden buffers after this delay + -- You can set the delay to false to disable cleanup entirely + -- Note that the cleanup process only starts when none of the oil buffers are currently displayed + cleanup_delay_ms = 2000, + lsp_file_methods = { + -- Enable or disable LSP file operations + enabled = true, + -- Time to wait for LSP file operations to complete before skipping + timeout_ms = 1000, + -- Set to true to autosave buffers that are updated with LSP willRenameFiles + -- Set to "unmodified" to only save unmodified buffers + autosave_changes = false, + }, + -- Constrain the cursor to the editable parts of the oil buffer + -- Set to `false` to disable, or "name" to keep it on the file names + constrain_cursor = "editable", + -- Set to true to watch the filesystem for changes and reload oil + watch_for_changes = false, + -- Keymaps in oil buffer. Can be any value that `vim.keymap.set` accepts OR a table of keymap + -- options with a `callback` (e.g. { callback = function() ... end, desc = "", mode = "n" }) + -- Additionally, if it is a string that matches "actions.<name>", + -- it will use the mapping at require("oil.actions").<name> + -- Set to `false` to remove a keymap + -- See :help oil-actions for a list of all available actions + keymaps = { + ["g?"] = { "actions.show_help", mode = "n" }, + ["<CR>"] = "actions.select", + ["<C-s>"] = { "actions.select", opts = { vertical = true } }, + ["<C-h>"] = { "actions.select", opts = { horizontal = true } }, + ["<C-t>"] = { "actions.select", opts = { tab = true } }, + ["<C-p>"] = "actions.preview", + ["<C-c>"] = { "actions.close", mode = "n" }, + ["<C-l>"] = "actions.refresh", + ["-"] = { "actions.parent", mode = "n" }, + ["_"] = { "actions.open_cwd", mode = "n" }, + ["`"] = { "actions.cd", mode = "n" }, + ["~"] = { "actions.cd", opts = { scope = "tab" }, mode = "n" }, + ["gs"] = { "actions.change_sort", mode = "n" }, + ["gx"] = "actions.open_external", + ["g."] = { "actions.toggle_hidden", mode = "n" }, + ["g\\"] = { "actions.toggle_trash", mode = "n" }, + }, + -- Set to false to disable all of the above keymaps + use_default_keymaps = true, + view_options = { + -- Show files and directories that start with "." + show_hidden = false, + -- This function defines what is considered a "hidden" file + is_hidden_file = function(name, bufnr) + local m = name:match("^%.") + return m ~= nil + end, + -- This function defines what will never be shown, even when `show_hidden` is set + is_always_hidden = function(name, bufnr) + return false + end, + -- Sort file names with numbers in a more intuitive order for humans. + -- Can be "fast", true, or false. "fast" will turn it off for large directories. + natural_order = "fast", + -- Sort file and directory names case insensitive + case_insensitive = false, + sort = { + -- sort order can be "asc" or "desc" + -- see :help oil-columns to see which columns are sortable + { "type", "asc" }, + { "name", "asc" }, + }, + -- Customize the highlight group for the file name + highlight_filename = function(entry, is_hidden, is_link_target, is_link_orphan) + return nil + end, + }, + -- Extra arguments to pass to SCP when moving/copying files over SSH + extra_scp_args = {}, + -- EXPERIMENTAL support for performing file operations with git + git = { + -- Return true to automatically git add/mv/rm files + add = function(path) + return false + end, + mv = function(src_path, dest_path) + return false + end, + rm = function(path) + return false + end, + }, + -- Configuration for the floating window in oil.open_float + float = { + -- Padding around the floating window + padding = 2, + -- max_width and max_height can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) + max_width = 0, + max_height = 0, + border = "rounded", + win_options = { + winblend = 0, + }, + -- optionally override the oil buffers window title with custom function: fun(winid: integer): string + get_win_title = nil, + -- preview_split: Split direction: "auto", "left", "right", "above", "below". + preview_split = "auto", + -- This is the config that will be passed to nvim_open_win. + -- Change values here to customize the layout + override = function(conf) + return conf + end, + }, + -- Configuration for the file preview window + preview_win = { + -- Whether the preview window is automatically updated when the cursor is moved + update_on_cursor_moved = true, + -- How to open the preview window "load"|"scratch"|"fast_scratch" + preview_method = "fast_scratch", + -- A function that returns true to disable preview on a file e.g. to avoid lag + disable_preview = function(filename) + return false + end, + -- Window-local options to use for preview window buffers + win_options = {}, + }, + -- Configuration for the floating action confirmation window + confirmation = { + -- Width dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) + -- min_width and max_width can be a single value or a list of mixed integer/float types. + -- max_width = {100, 0.8} means "the lesser of 100 columns or 80% of total" + max_width = 0.9, + -- min_width = {40, 0.4} means "the greater of 40 columns or 40% of total" + min_width = { 40, 0.4 }, + -- optionally define an integer/float for the exact width of the preview window + width = nil, + -- Height dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) + -- min_height and max_height can be a single value or a list of mixed integer/float types. + -- max_height = {80, 0.9} means "the lesser of 80 columns or 90% of total" + max_height = 0.9, + -- min_height = {5, 0.1} means "the greater of 5 columns or 10% of total" + min_height = { 5, 0.1 }, + -- optionally define an integer/float for the exact height of the preview window + height = nil, + border = "rounded", + win_options = { + winblend = 0, + }, + }, + -- Configuration for the floating progress window + progress = { + max_width = 0.9, + min_width = { 40, 0.4 }, + width = nil, + max_height = { 10, 0.9 }, + min_height = { 5, 0.1 }, + height = nil, + border = "rounded", + minimized_border = "none", + win_options = { + winblend = 0, + }, + }, + -- Configuration for the floating SSH window + ssh = { + border = "rounded", + }, + -- Configuration for the floating keymaps help window + keymaps_help = { + border = "rounded", + }, + }) + end +} diff --git a/nvim/.config/nvim/lua/config/plugins/telescope.lua b/nvim/.config/nvim/lua/config/plugins/telescope.lua @@ -0,0 +1,14 @@ +return { + 'nvim-telescope/telescope.nvim', tag = '0.1.8', + -- or , branch = '0.1.x', + dependencies = { 'nvim-lua/plenary.nvim' }, + config = function() + local builtin = require('telescope.builtin') + vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = 'Telescope find files' }) + vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live grep' }) + vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' }) + vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope help tags' }) + vim.keymap.set('n', '<leader>fw', builtin.git_files, {}) + vim.keymap.set('n', '<leader>fu', ':lua require("telescope.builtin").find_files({no_ignore=true})<CR>', {}) + end +} diff --git a/nvim/.config/nvim/lua/config/plugins/tokyonight.lua b/nvim/.config/nvim/lua/config/plugins/tokyonight.lua @@ -0,0 +1,6 @@ +return { + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, + opts = {}, +} diff --git a/nvim/.config/nvim/lua/config/settings.lua b/nvim/.config/nvim/lua/config/settings.lua @@ -0,0 +1,35 @@ +vim.opt.nu = true +vim.opt.nuw = 1 +vim.opt.rnu = true + +vim.opt.shiftwidth = 4 +vim.opt.tabstop = 4 +vim.opt.softtabstop = 4 +vim.opt.expandtab = true +vim.opt.smartindent = true +vim.opt.scrolloff = 8 + +vim.opt.swapfile = false +vim.opt.backup = false +vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir" +vim.opt.undofile = true + +vim.opt.incsearch = true +vim.opt.hlsearch = false +vim.opt.smartcase = true +vim.opt.ignorecase = true + +vim.opt.termguicolors = true +vim.opt.signcolumn = "yes" + +vim.opt.splitright = true +vim.opt.splitbelow = true + +vim.cmd.colorscheme("gruvbuddy") +vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) +vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) +vim.api.nvim_set_hl(0, "SignColumn", { bg = "none" }) +vim.api.nvim_set_hl(0, "LineNr", { fg = "White" }) +vim.api.nvim_set_hl(0, "StatusLine", { bg = "#334455" }) +vim.api.nvim_set_hl(0, "StatusLineNC", { bg = "#333333" }) + diff --git a/nvim/.config/nvim/lua/mehdi/mappings.lua b/nvim/.config/nvim/lua/mehdi/mappings.lua @@ -28,3 +28,18 @@ vim.cmd('command! RecompileAndFocus lua FocusWindowByName("compilation")') vim.keymap.set('n', '<leader>r', ':RecompileAndFocus<CR>', { noremap = true, silent = true }) vim.keymap.set("n", "<leader>c", ":Compile<C-F>") +vim.keymap.set("n", "<C-F>", ":silent !tmux neww sessionizer<CR>") + +-- DAP +vim.keymap.set("n", "<leader>b", "<cmd>lua require'dap'.toggle_breakpoint()<CR>") +vim.keymap.set("n", "<space>gb", "<cmd>lua require'dap'.run_to_cursor()<CR>") +-- Eval var under cursor +vim.keymap.set("n", "<space>?", function() + require("dapui").eval(nil, { enter = true }) +end) +vim.keymap.set("n", "<F1>", "<cmd>lua require'dap'.continue()<CR>") +vim.keymap.set("n", "<F2>", "<cmd>lua require'dap'.step_into()<CR>") +vim.keymap.set("n", "<F3>", "<cmd>lua require'dap'.step_over()<CR>") +vim.keymap.set("n", "<F4>", "<cmd>lua require'dap'.step_out()<CR>") +vim.keymap.set("n", "<F5>", "<cmd>lua require'dap'.step_back()<CR>") +vim.keymap.set("n", "<F13>", "<cmd>lua require'dap'.restart()<CR>") diff --git a/nvim/.config/nvim/lua/mehdi/packer.lua b/nvim/.config/nvim/lua/mehdi/packer.lua @@ -22,6 +22,8 @@ return require('packer').startup(function(use) use { 'nvim-tree/nvim-web-devicons' } + use { 'tjdevries/colorbuddy.nvim' } + use { 'tjdevries/gruvbuddy.nvim' } use { 'fxn/vim-monochrome' } use { 'sainnhe/gruvbox-material' } @@ -29,12 +31,18 @@ return require('packer').startup(function(use) use { "polirritmico/monokai-nightasty.nvim" } use { 'tpope/vim-fugitive' } + use { 'tpope/vim-dadbod' } use { 'vimwiki/vimwiki' } use { 'ej-shafran/compile-mode.nvim', tag = 'v3.0.1', requires = { { 'nvim-lua/plenary.nvim' }, - { 'm00qek/baleia.nvim', tag = "v1.3.0" }}, + { 'm00qek/baleia.nvim' }, + }, + } + + use { 'mfussenegger/nvim-dap', + requires = { { 'rcarriga/nvim-dap-ui' } } } end) diff --git a/nvim/.config/nvim/shortcuts.vim b/nvim/.config/nvim/shortcuts.vim @@ -1,29 +0,0 @@ -cmap ;cac /home/mehdi/.cache -cmap ;cf /home/mehdi/.config -cmap ;D /home/mehdi/dl -cmap ;d /home/mehdi/dox -cmap ;dt /home/mehdi/.local/share -cmap ;rr /home/mehdi/.local/src -cmap ;h /home/mehdi -cmap ;m /home/mehdi/dl/soulseek -cmap ;mn /mnt -cmap ;pp /home/mehdi/pix -cmap ;sc /home/mehdi/.local/bin -cmap ;src /home/mehdi/.local/src -cmap ;vv /home/mehdi/vids -cmap ;bf /home/mehdi/.config/shell/bm-files -cmap ;bd /home/mehdi/.config/shell/bm-dirs -cmap ;cfx /home/mehdi/.config/x11/xresources -cmap ;cfb ~/.local/src/dwmblocks/config.h -cmap ;cfv /home/mehdi/.config/nvim/init.vim -cmap ;cfz /home/mehdi/.config/zsh/.zshrc -cmap ;cfa /home/mehdi/.config/shell/aliasrc -cmap ;cfp /home/mehdi/.config/shell/profile -cmap ;cfm /home/mehdi/.config/mutt/muttrc -cmap ;cfn /home/mehdi/.config/newsboat/config -cmap ;cfu /home/mehdi/.config/newsboat/urls -cmap ;cfmb /home/mehdi/.config/ncmpcpp/bindings -cmap ;cfmc /home/mehdi/.config/ncmpcpp/config -cmap ;cfl /home/mehdi/.config/lf/lfrc -cmap ;cfL /home/mehdi/.config/lf/scope -cmap ;cfX /home/mehdi/.config/sxiv/exec/key-handler