From f7473eadd793946911b1679e3089d14312e820ce Mon Sep 17 00:00:00 2001 From: wooshdude Date: Fri, 18 Apr 2025 12:24:09 -0700 Subject: [PATCH] organize nvim config --- nvim/.config/nvim/coc-settings.json | 18 +- nvim/.config/nvim/init.lua | 934 +----------------- nvim/.config/nvim/lazy-lock.json | 59 +- nvim/.config/nvim/lua/config/keymap.lua | 53 + nvim/.config/nvim/lua/config/options.lua | 152 +++ nvim/.config/nvim/lua/config/run.lua | 32 + nvim/.config/nvim/lua/plugins/autopairs.lua | 9 + nvim/.config/nvim/lua/plugins/autosession.lua | 17 + nvim/.config/nvim/lua/plugins/barbar.lua | 27 + nvim/.config/nvim/lua/plugins/catppuccin.lua | 19 + nvim/.config/nvim/lua/plugins/cmp.lua | 161 +++ nvim/.config/nvim/lua/plugins/coc.lua | 36 + nvim/.config/nvim/lua/plugins/conform.lua | 38 + nvim/.config/nvim/lua/plugins/gitsigns.lua | 14 + nvim/.config/nvim/lua/plugins/init.lua | 11 + nvim/.config/nvim/lua/plugins/lazydev.lua | 14 + nvim/.config/nvim/lua/plugins/lualine.lua | 41 + nvim/.config/nvim/lua/plugins/markdown.lua | 16 + nvim/.config/nvim/lua/plugins/mason.lua | 273 +++++ nvim/.config/nvim/lua/plugins/mini.lua | 24 + nvim/.config/nvim/lua/plugins/nvim-tree.lua | 19 + nvim/.config/nvim/lua/plugins/omnisharp.lua | 41 + nvim/.config/nvim/lua/plugins/telescope.lua | 79 ++ .../nvim/lua/plugins/tmux_navigator.lua | 6 + nvim/.config/nvim/lua/plugins/todo.lua | 8 + nvim/.config/nvim/lua/plugins/treesitter.lua | 45 + nvim/.config/nvim/lua/plugins/which-key.lua | 20 + nvim/.config/nvim/lua/plugins/yazi.lua | 30 + nvim/.config/nvim/utilities/unity-nvim | 2 + 29 files changed, 1258 insertions(+), 940 deletions(-) create mode 100644 nvim/.config/nvim/lua/config/keymap.lua create mode 100644 nvim/.config/nvim/lua/config/options.lua create mode 100644 nvim/.config/nvim/lua/config/run.lua create mode 100644 nvim/.config/nvim/lua/plugins/autopairs.lua create mode 100644 nvim/.config/nvim/lua/plugins/autosession.lua create mode 100644 nvim/.config/nvim/lua/plugins/barbar.lua create mode 100644 nvim/.config/nvim/lua/plugins/catppuccin.lua create mode 100644 nvim/.config/nvim/lua/plugins/cmp.lua create mode 100644 nvim/.config/nvim/lua/plugins/coc.lua create mode 100644 nvim/.config/nvim/lua/plugins/conform.lua create mode 100644 nvim/.config/nvim/lua/plugins/gitsigns.lua create mode 100644 nvim/.config/nvim/lua/plugins/init.lua create mode 100644 nvim/.config/nvim/lua/plugins/lazydev.lua create mode 100644 nvim/.config/nvim/lua/plugins/lualine.lua create mode 100644 nvim/.config/nvim/lua/plugins/markdown.lua create mode 100644 nvim/.config/nvim/lua/plugins/mason.lua create mode 100644 nvim/.config/nvim/lua/plugins/mini.lua create mode 100644 nvim/.config/nvim/lua/plugins/nvim-tree.lua create mode 100644 nvim/.config/nvim/lua/plugins/omnisharp.lua create mode 100644 nvim/.config/nvim/lua/plugins/telescope.lua create mode 100644 nvim/.config/nvim/lua/plugins/tmux_navigator.lua create mode 100644 nvim/.config/nvim/lua/plugins/todo.lua create mode 100644 nvim/.config/nvim/lua/plugins/treesitter.lua create mode 100644 nvim/.config/nvim/lua/plugins/which-key.lua create mode 100644 nvim/.config/nvim/lua/plugins/yazi.lua create mode 100755 nvim/.config/nvim/utilities/unity-nvim diff --git a/nvim/.config/nvim/coc-settings.json b/nvim/.config/nvim/coc-settings.json index 3d4ea99..2ded4a5 100644 --- a/nvim/.config/nvim/coc-settings.json +++ b/nvim/.config/nvim/coc-settings.json @@ -8,16 +8,15 @@ "csharp-ls": { "command": "csharp", "filetypes": ["cs"], - "rootPatterns": ["*.csproj", ".vim/", ".git/", ".hg/"] + "rootPatterns": ["*.csproj", "*.sln", ".vim/", ".git/", ".hg/"], + "semanticTokens.enable": false } }, "coc.preferences.formatOnSave": true, "suggest.floatConfig": { - "border": true, - "rounded": true, - "maxHeight": 10 + "border": false, + "rounded": false }, - "semanticTokens.enable": true, "suggest.completionItemKindLabels": { "class": "󰆧 ", "text": "󰦨 ", @@ -41,11 +40,16 @@ }, "diagnostic.enableMessage": "never", "diagnostic.enable": true, - "diagnostic.errorSign": " ", + "diagnostic.errorSign": " ", "diagnostic.warningSign": " ", "diagnostic.infoSign": "ℹ", "diagnostic.hintSign": "➤", "diagnostic.virtualText": true, "diagnostic.virtualTextAlign": "below", - "diagnostic.virtualTextCurrentLineOnly": true + "diagnostic.virtualTextCurrentLineOnly": true, + "coc.source.OmniSharp.enable": true, + "coc.source.OmniSharp.shortcut": "󰆧 ", + "pyright.inlayHints.variableTypes": false, + "pyright.inlayHints.parameterTypes": false, + "pyright.inlayHints.functionReturnTypes": false } diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 2941fca..8a7ca55 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1,909 +1,33 @@ --- Set as the leader key --- See `:help mapleader` --- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) -vim.g.mapleader = " " -vim.g.maplocalleader = " " -vim.opt.tabstop = 4 -vim.opt.softtabstop = 4 -vim.opt.shiftwidth = 4 - --- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = true - -local colorscheme = "catppuccin" - --- [[ Setting options ]] --- See `:help vim.opt` --- NOTE: You can change these options as you wish! --- For more options, you can see `:help option-list` - --- Make line numbers default -vim.opt.number = true --- You can also add relative line numbers, to help with jumping. --- Experiment for yourself to see if you like it! --- vim.opt.relativenumber = true - --- Enable mouse mode, can be useful for resizing splits for example! -vim.opt.mouse = "a" - --- Don't show the mode, since it's already in the status line -vim.opt.showmode = false - --- Sync clipboard between OS and Neovim. --- Schedule the setting after `UiEnter` because it can increase startup-time. --- Remove this option if you want your OS clipboard to remain independent. --- See `:help 'clipboard'` -vim.schedule(function() - vim.opt.clipboard = "unnamedplus" -end) - --- Enable break indent -vim.opt.breakindent = true - --- Save undo history -vim.opt.undofile = true - --- Case-insensitive searching UNLESS \C or one or more capital letters in the search term -vim.opt.ignorecase = true -vim.opt.smartcase = true - --- Keep signcolumn on by default -vim.opt.signcolumn = "yes" - --- Decrease update time -vim.opt.updatetime = 250 - --- Decrease mapped sequence wait time --- Displays which-key popup sooner -vim.opt.timeoutlen = 300 - --- Configure how new splits should be opened -vim.opt.splitright = true -vim.opt.splitbelow = true - --- Sets how neovim will display certain whitespace characters in the editor. --- See `:help 'list'` --- and `:help 'listchars'` -vim.opt.list = true -vim.opt.listchars = { tab = "» ", trail = "·", nbsp = "␣" } - --- Preview substitutions live, as you type! -vim.opt.inccommand = "split" - --- Show which line your cursor is on -vim.opt.cursorline = true - --- Minimal number of screen lines to keep above and below the cursor. -vim.opt.scrolloff = 10 --- [[ Basic Keymaps ]] --- See `:help vim.keymap.set()` - --- Clear highlights on search when pressing in normal mode --- See `:help hlsearch` -vim.keymap.set("n", "", "nohlsearch") - --- Diagnostic keymaps -vim.keymap.set("n", "q", vim.diagnostic.setloclist, { desc = "Open diagnostic [Q]uickfix list" }) - --- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier --- for people to discover. Otherwise, you normally need to press , which --- is not what someone will guess without a bit more experience. --- --- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping --- or just use to exit terminal mode -vim.keymap.set("t", "", ":bd!", { desc = "Exit terminal mode", silent = true }) -vim.keymap.set("i", "jj", "", { desc = "Exit insert mode", silent = true }) --- TIP: Disable arrow keys in normal mode --- vim.keymap.set('n', '', 'echo "Use h to move!!"') --- vim.keymap.set('n', '', 'echo "Use l to move!!"') --- vim.keymap.set('n', '', 'echo "Use k to move!!"') --- vim.keymap.set('n', '', 'echo "Use j to move!!"') - --- Keybinds to make split navigation easier. --- Use CTRL+ to switch between windows - --- Vertical navigation -vim.keymap.set("n", "", "10j", { desc = "Jump ten spaces down", silent = true }) -vim.keymap.set("n", "", "10k", { desc = "Jump ten spaces up", silent = true }) - --- Horizontal navigation -vim.keymap.set("n", "", "^", { desc = "Jump to start of line", silent = true }) -vim.keymap.set("n", "", "$", { desc = "Jump to end of line", silent = true }) - --- Telescope -vim.keymap.set("n", "ff", ":Telescope find_files", { desc = "Find Files", silent = true }) - --- See `:help wincmd` for a list of all window commands -vim.keymap.set("n", "", "", { desc = "Move focus to the left window", silent = true }) -vim.keymap.set("n", "", "", { desc = "Move focus to the right window", silent = true }) -vim.keymap.set("n", "", "", { desc = "Move focus to the lower window", silent = true }) -vim.keymap.set("n", "", "", { desc = "Move focus to the upper window", silent = true }) - --- Better split keymaps --- vim.keymap.set("n", "v", "v", { desc = "Split window vertically", silent = true }) --- vim.keymap.set("n", "h", "h", { desc = "Split window horizontally", silent = true }) - --- Buffers -vim.keymap.set("n", "tt", ":tabeditn", { desc = "Create a new tab", silent = true }) -vim.keymap.set("n", "te", ":BufferClose!", { desc = "Close current tab", silent = true }) -vim.keymap.set("n", "", ":BufferNext", { desc = "Next tab", silent = true }) -vim.keymap.set("n", "", ":BufferPrevious", { desc = "Previous tab", silent = true }) -vim.keymap.set("n", "tl", ":BufferMoveNext", { desc = "Shift tab right", silent = true }) -vim.keymap.set("n", "th", ":BufferMovePrevious", { desc = "Shift tab left", silent = true }) - --- Run Commands - --- Cargo run -local function set_rust_keybindings() - vim.keymap.set( - "n", - "vv", - ":terminal cargo run", - { desc = "Cargo Run", buffer = true, silent = true } - ) -end - --- Python run -local function set_python_keybindings() - vim.keymap.set( - "n", - "vv", - ":terminal python3 main.py", - { desc = "Python Run", buffer = true, silent = true } - ) -end - --- Go run -local function set_go_keybindings() - vim.keymap.set("n", "vv", ":terminal go run .", { desc = "Go Run", buffer = true, silent = true }) -end - -local function set_csharp_keybindings() - vim.keymap.set( - "n", - "vv", - ":terminal dotnet run", - { desc = "DotNet Run", buffer = true, silent = true } - ) -end - --- Set up an autocmd group to run the function on BufRead or BufNewFile for Rust files -vim.api.nvim_create_augroup("RustKeybindings", { clear = true }) -vim.api.nvim_create_autocmd("FileType", { - pattern = "rust", - callback = set_rust_keybindings, - group = "RustKeybindings", -}) - -vim.api.nvim_create_augroup("PythonKeybindings", { clear = true }) -vim.api.nvim_create_autocmd("FileType", { - pattern = "python", - callback = set_python_keybindings, - group = "PythonKeybindings", -}) - -vim.api.nvim_create_augroup("CSharpKeybindings", { clear = true }) -vim.api.nvim_create_autocmd("FileType", { - pattern = "cs", - callback = set_csharp_keybindings, - group = "CSharpKeybindings", -}) - -vim.api.nvim_create_augroup("GoKeybindings", { clear = true }) -vim.api.nvim_create_autocmd("FileType", { - pattern = "go", - callback = set_go_keybindings, - group = "GoKeybindings", -}) - -if vim.env.TMUX ~= nil then - -- Define an autocommand for BufEnter and FocusGained events - vim.api.nvim_create_autocmd({ "BufEnter", "FocusGained" }, { - pattern = "*", - callback = function() - local current_file = vim.fn.expand("%:t") - local tmux_command = string.format("tmux rename-window 'nvim'", current_file) - vim.fn.system(tmux_command) - end - }) - - -- Define an autocommand for the VimLeave event - vim.api.nvim_create_autocmd("VimLeave", { - pattern = "*", - callback = function() - local shell = vim.env.SHELL or "sh" - vim.fn.system("tmux set-window-option automatic-rename on") - end - }) -end - --- Nvim Tree -vim.keymap.set("n", "n", "NvimTreeToggle", { desc = "Toggle Nvim Tree" }) - --- Tab Size -local TAB_WIDTH = 4 -vim.bo.tabstop = TAB_WIDTH -vim.bo.shiftwidth = TAB_WIDTH -vim.bo.expandtab = true --- [[ Basic Autocommands ]] --- See `:help lua-guide-autocommands` - --- Highlight when yanking (copying) text --- Try it with `yap` in normal mode --- See `:help vim.highlight.on_yank()` -vim.api.nvim_create_autocmd("TextYankPost", { - desc = "Highlight when yanking (copying) text", - group = vim.api.nvim_create_augroup("kickstart-highlight-yank", { clear = true }), - callback = function() - vim.highlight.on_yank() - end, -}) - --- [[ Install `lazy.nvim` plugin manager ]] --- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.uv.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 - error("Error cloning lazy.nvim:\n" .. out) - end -end ---@diagnostic disable-next-line: undefined-field -vim.opt.rtp:prepend(lazypath) - -local colors = { - blue = "#89b4fa", - cyan = "#74c7ec", - crust = "#11111b", - white = "#cdd6f4", - red = "#f38ba8", - violet = "#cba6f7", - surface = "#313244", - base = "#1e1e2e", -} - -local bubbles_theme = { - normal = { - a = { fg = colors.crust, bg = colors.blue }, - b = { fg = colors.blue, bg = colors.surface }, - c = { fg = colors.white }, - }, - - insert = { a = { fg = colors.crust, bg = colors.green } }, - visual = { a = { fg = colors.crust, bg = colors.violet } }, - replace = { a = { fg = colors.crust, bg = colors.red } }, - - inactive = { - a = { fg = colors.white, bg = colors.crust }, - b = { fg = colors.white, bg = colors.crust }, - c = { fg = colors.white }, - }, -} +require("config.keymap") +require("config.options") +require("config.run") +require("plugins") -- PLUGINS - require("lazy").setup({ - { - "MeanderingProgrammer/render-markdown.nvim", - opts = {}, - dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.nvim" }, -- if you use the mini.nvim suite - -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins - -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons - }, - { - "tadmccorkle/markdown.nvim", - ft = "markdown", -- or 'event = "VeryLazy"' - opts = { - -- configuration here or empty for defaults - }, - }, - { - "rmagatti/auto-session", - lazy = false, - - ---enables autocomplete for opts - ---@module "auto-session" - ---@type AutoSession.Config - opts = { - suppressed_dirs = { "~/", "~/Projects", "~/Downloads", "/" }, - auto_save = true, - auto_create = true, - auto_restore = true, - -- log_level = 'debug', - }, - }, - { - "mikavilpas/yazi.nvim", - event = "VeryLazy", - keys = { - -- 👇 in this section, choose your own keymappings! - { - "", - "Yazi", - desc = "Open yazi at the current file", - }, - { - -- NOTE: this requires a version of yazi that includes - -- https://github.com/sxyazi/yazi/pull/1305 from 2024-07-18 - "", - "Yazi toggle", - desc = "Resume the last yazi session", - }, - }, - ---@type YaziConfig - opts = { - -- if you want to open yazi instead of netrw, see below for more info - open_for_directories = false, - keymaps = { - show_help = "", - }, - highlight_hovered_buffers_in_same_directory = true, - }, - }, - { - "christoomey/vim-tmux-navigator", - lazy = false, - }, - { - "romgrk/barbar.nvim", - config = function() - icons = { - button = "", - separator = { left = '', right = '' }, - } - - vim.g.barbar_auto_setup = false - end, - dependencies = { - "lewis6991/gitsigns.nvim", -- OPTIONAL: for git status - "nvim-tree/nvim-web-devicons", -- OPTIONAL: for file icons - }, - opts = { - -- lazy.nvim will automatically call setup for you. put your options here, anything missing will use the default: - -- animation = true, - -- insert_at_start = true, - -- …etc. - }, - version = "^1.0.0", -- optional: only update when a new 1.x version is released - }, - { - "nvim-lualine/lualine.nvim", - config = function() - require("lualine").setup({ - options = { - --theme = bubbles_theme, - component_separators = "", - section_separators = { left = "", right = "" }, - }, - sections = { - lualine_a = { - { "mode", separator = { left = "", right = "" }, right_padding = 2 }, - }, - lualine_b = { - "filename", - "branch", - }, - lualine_c = { - "diagnostics", - }, - lualine_x = { "filetype" }, - lualine_y = { "progress" }, - lualine_z = { - { "location", separator = { left = "", right = "" }, left_padding = 0 }, - }, - }, - inactive_sections = { - lualine_a = { "filename" }, - lualine_b = {}, - lualine_c = {}, - lualine_x = {}, - lualine_y = {}, - lualine_z = { "location" }, - }, - tabline = {}, - extensions = {}, - }) - end, - }, - { "catppuccin/nvim" }, - { "luisiacc/gruvbox-baby" }, - { "rebelot/kanagawa.nvim" }, - { "Biscuit-Theme/biscuit" }, - { "rose-pine/neovim" }, - { - "windwp/nvim-autopairs", - event = "InsertEnter", - config = true, - -- use opts = {} for passing setup options - -- this is equivalent to setup({}) function - }, - { - "sourcegraph/sg.nvim", - dependencies = { - "nvim-lua/plenary.nvim", --[[ "nvim-telescope/telescope.nvim ]] - }, - }, - { - "S1M0N38/love2d.nvim", - cmd = "LoveRun", - opts = {}, - keys = { - { "v", ft = "lua", desc = "LÖVE" }, - { "vv", "LoveRun", ft = "lua", desc = "Run LÖVE" }, - { "vs", "LoveStop", ft = "lua", desc = "Stop LÖVE" }, - }, - }, - { - "nvim-tree/nvim-tree.lua", - version = "*", - lazy = false, - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - config = function() - require("nvim-tree").setup({ - actions = { - open_file = { - quit_on_open = true, - }, - }, - }) - end, - }, - { "tpope/vim-sleuth" }, -- Detect tabstop and shiftwidth automatically - { "sitiom/nvim-numbertoggle" }, - { - "lewis6991/gitsigns.nvim", - opts = { - signs = { - add = { text = "+" }, - change = { text = "~" }, - delete = { text = "_" }, - topdelete = { text = "‾" }, - changedelete = { text = "~" }, - }, - }, - }, - - { -- Useful plugin to show you pending keybinds. - "folke/which-key.nvim", - event = "VimEnter", -- Sets the loading event to 'VimEnter' - config = function() -- This is the function that runs, AFTER loading - require("which-key").setup() - - -- Document existing key chains - require("which-key").add({ - { "c", group = "[C]ode" }, - { "d", group = "[D]ocument" }, - { "r", group = "[R]ename" }, - { "s", group = "[S]earch" }, - { "w", group = "[W]orkspace" }, - { "t", group = "[T]oggle" }, - { "h", group = "Git [H]unk", mode = { "n", "v" } }, - }) - end, - }, - - { -- Fuzzy Finder (files, lsp, etc) - "nvim-telescope/telescope.nvim", - event = "VimEnter", - branch = "0.1.x", - dependencies = { - "nvim-lua/plenary.nvim", - { -- If encountering errors, see telescope-fzf-native README for installation instructions - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - cond = function() - return vim.fn.executable("make") == 1 - end, - }, - { "nvim-telescope/telescope-ui-select.nvim" }, - - -- Useful for getting pretty icons, but requires a Nerd Font. - { "nvim-tree/nvim-web-devicons", enabled = vim.g.have_nerd_font }, - }, - config = function() - require("telescope").setup({ - -- You can put your default mappings / updates / etc. in here - -- All the info you're looking for is in `:help telescope.setup()` - -- - -- defaults = { - -- mappings = { - -- i = { [''] = 'to_fuzzy_refine' }, - -- }, - -- }, - -- pickers = {} - extensions = { - ["ui-select"] = { - require("telescope.themes").get_dropdown(), - }, - }, - }) - - -- Enable Telescope extensions if they are installed - pcall(require("telescope").load_extension, "fzf") - pcall(require("telescope").load_extension, "ui-select") - - -- See `:help telescope.builtin` - local builtin = require("telescope.builtin") - vim.keymap.set("n", "sh", builtin.help_tags, { desc = "[S]earch [H]elp" }) - vim.keymap.set("n", "sk", builtin.keymaps, { desc = "[S]earch [K]eymaps" }) - vim.keymap.set("n", "sf", builtin.find_files, { desc = "[S]earch [F]iles" }) - vim.keymap.set("n", "ss", builtin.builtin, { desc = "[S]earch [S]elect Telescope" }) - vim.keymap.set("n", "sw", builtin.grep_string, { desc = "[S]earch current [W]ord" }) - vim.keymap.set("n", "sg", builtin.live_grep, { desc = "[S]earch by [G]rep" }) - vim.keymap.set("n", "sd", builtin.diagnostics, { desc = "[S]earch [D]iagnostics" }) - vim.keymap.set("n", "sr", builtin.resume, { desc = "[S]earch [R]esume" }) - vim.keymap.set("n", "s.", builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) - -- vim.keymap.set("n", "", builtin.buffers, { desc = "[ ] Find existing buffers" }) - - -- Slightly advanced example of overriding default behavior and theme - vim.keymap.set("n", "/", function() - -- You can pass additional configuration to Telescope to change the theme, layout, etc. - builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({ - winblend = 10, - previewer = false, - })) - end, { desc = "[/] Fuzzily search in current buffer" }) - - -- It's also possible to pass additional configuration options. - -- See `:help telescope.builtin.live_grep()` for information about particular keys - 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" }) - - -- Shortcut for searching your Neovim configuration files - vim.keymap.set("n", "sn", function() - builtin.find_files({ cwd = vim.fn.stdpath("config") }) - end, { desc = "[S]earch [N]eovim files" }) - end, - }, - - -- LSP Plugins - { - "OmniSharp/omnisharp-vim", - config = function() - vim.g.OmniSharp_server_use_net6 = 1 - vim.g.OmniSharp_server_use_mono = 1 - vim.g.Omnisharp_highlighting = 3 - vim.g.OmniSharp_diagnostic_showid = 0 - vim.g.OmniSharp_diagnostic_overrides = { - CS8019 = { type = 'None' }, - } - end, - }, - { - "dense-analysis/ale", - config = function() - vim.g.ale_sign_column_always = 1 - vim.g.ale_sign_error = ' ' - vim.g.ale_sign_warning = ' ' - vim.b.ale_linters = { cs = { "OmniSharp" } } - vim.g.ale_linters_explicit = 1 - vim.g.ale_echo_msg_error_str = ' ' - vim.g.ale_echo_msg_warning_str = ' ' - vim.g.ale_cs_csc_assemblies = { ".mono" } - vim.g.ale_cs_mcsc_assemblies = { ".mono" } - end - }, - { - "neoclide/coc.nvim", - branch = "release", - config = function() - -- Key mappings for coc.nvim in insert mode - vim.keymap.set("i", "", "pumvisible() ? coc#_select_confirm() : ''", - { expr = true, noremap = true, silent = true }) - vim.keymap.set("i", "", [[coc#pum#visible() ? coc#pum#next(1) : "\"]], - { expr = true, noremap = true, silent = true, replace_keycodes = false }) - vim.keymap.set("i", "", [[coc#pum#visible() ? coc#pum#prev(1) : "\"]], - { expr = true, noremap = true, silent = true, replace_keycodes = false }) - -- Disable Enter key for confirming completion - vim.keymap.set("i", "", "pumvisible() ? coc#_cancel() : ''", { expr = true, noremap = true, silent = true }) - end - }, - { - -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins - -- used for completion, annotations and signatures of Neovim apis - "folke/lazydev.nvim", - ft = "lua", - opts = { - library = { - -- Load luvit types when the `vim.uv` word is found - { path = "luvit-meta/library", words = { "vim%.uv" } }, - }, - }, - }, - { "Bilal2453/luvit-meta", lazy = true }, - - { -- Autoformat - "stevearc/conform.nvim", - event = { "BufWritePre" }, - cmd = { "ConformInfo" }, - keys = { - { - "f", - function() - require("conform").format({ async = true, lsp_fallback = true }) - end, - mode = "", - desc = "[F]ormat buffer", - }, - }, - opts = { - notify_on_error = false, - format_on_save = function(bufnr) - -- Disable "format_on_save lsp_fallback" for languages that don't - -- have a well standardized coding style. You can add additional - -- languages here or re-enable it for the disabled ones. - local disable_filetypes = { c = true, cpp = true } - return { - timeout_ms = 500, - lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], - } - end, - formatters_by_ft = { - lua = { "stylua" }, - -- Conform can also run multiple formatters sequentially - -- python = { "isort", "black" }, - -- - -- You can use 'stop_after_first' to run the first available formatter from the list - -- javascript = { "prettierd", "prettier", stop_after_first = true }, - }, - }, - }, - - { -- Autocompletion - "hrsh7th/nvim-cmp", - outs = function(_, opts) - table.insert(opts.sources, { - { name = "emoji" }, - { name = "orgmode" }, - }) - local cmp = require("cmp") - opts.window = { - completion = cmp.config.window.bordered({}), - documentation = cmp.config.window.bordered({}), - } - -- Set view to follow cursor while typing - opts.view = { - entries = { - follow_cursor = true, - }, - } - end, - event = "InsertEnter", - dependencies = { - -- Snippet Engine & its associated nvim-cmp source - { - "L3MON4D3/LuaSnip", - build = (function() - -- Build Step is needed for regex support in snippets. - -- This step is not supported in many windows environments. - -- Remove the below condition to re-enable on windows. - if vim.fn.has("win32") == 1 or vim.fn.executable("make") == 0 then - return - end - return "make install_jsregexp" - end)(), - dependencies = { - -- `friendly-snippets` contains a variety of premade snippets. - -- See the README about individual language/framework/plugin snippets: - -- https://github.com/rafamadriz/friendly-snippets - -- { - -- 'rafamadriz/friendly-snippets', - -- config = function() - -- require('luasnip.loaders.from_vscode').lazy_load() - -- end, - -- }, - }, - }, - "saadparwaiz1/cmp_luasnip", - - -- Adds other completion capabilities. - -- nvim-cmp does not ship with all sources by default. They are split - -- into multiple repos for maintenance purposes. - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-path", - "hrsh7th/cmp-emoji", - }, - config = function() - -- See `:help cmp` - local cmp = require("cmp") - local luasnip = require("luasnip") - luasnip.config.setup({}) - - cmp.setup({ - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - completion = { completeopt = "menu,menuone,noinsert" }, - - mapping = cmp.mapping.preset.insert({ - -- Select the [n]ext item - [""] = cmp.mapping.select_next_item(), - -- Select the [p]revious item - [""] = cmp.mapping.select_prev_item(), - - -- Scroll the documentation window [b]ack / [f]orward - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - - -- Accept ([y]es) the completion. - -- This will auto-import if your LSP supports it. - -- This will expand snippets if the LSP sent a snippet. - [""] = cmp.mapping.confirm({ select = true }), - - [""] = cmp.mapping.complete({}), - - -- will move you to the right of each of the expansion locations. - -- is similar, except moving you backwards. - [""] = cmp.mapping(function() - if luasnip.expand_or_locally_jumpable() then - luasnip.expand_or_jump() - end - end, { "i", "s" }), - [""] = cmp.mapping(function() - if luasnip.locally_jumpable(-1) then - luasnip.jump(-1) - end - end, { "i", "s" }), - - -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: - -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps - }), - sources = { - { - name = "lazydev", - -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it - group_index = 0, - }, - { name = "nvim_lsp" }, - { name = "luasnip" }, - { name = "path" }, - }, - }) - end, - }, - - { -- You can easily change to a different colorscheme. - -- Change the name of the colorscheme plugin below, and then - -- change the command in the config to whatever the name of that colorscheme is. - -- - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - "folke/tokyonight.nvim", - priority = 1000, -- Make sure to load this before all the other start plugins. - init = function() - -- Load the colorscheme here. - -- Like many other themes, this one has different styles, and you could load - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme(colorscheme) - - -- You can configure highlights by doing something like: - vim.cmd.hi("Comment gui=none") - end, - }, - - -- Highlight todo, notes, etc in comments - { - "folke/todo-comments.nvim", - event = "VimEnter", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = { signs = false }, - }, - - { -- Collection of various small independent plugins/modules - "echasnovski/mini.nvim", - config = function() - -- Better Around/Inside textobjects - -- - -- Examples: - -- - va) - [V]isually select [A]round [)]paren - -- - yinq - [Y]ank [I]nside [N]ext [Q]uote - -- - ci' - [C]hange [I]nside [']quote - require("mini.ai").setup({ n_lines = 500 }) - - -- Add/delete/replace surroundings (brackets, quotes, etc.) - -- - -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren - -- - sd' - [S]urround [D]elete [']quotes - -- - sr)' - [S]urround [R]eplace [)] ['] - require("mini.surround").setup() - - -- ... and there is more! - -- Check out: https://github.com/echasnovski/mini.nvim - end, - }, - { -- Highlight, edit, and navigate code - "nvim-treesitter/nvim-treesitter", - build = ":TSUpdate", - opts = { - ensure_installed = { - "bash", - "c", - "diff", - "html", - "lua", - "luadoc", - "markdown", - "markdown_inline", - "query", - "vim", - "vimdoc", - }, - -- Autoinstall languages that are not installed - auto_install = true, - highlight = { - enable = true, - -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. - -- If you are experiencing weird indenting issues, add the language to - -- the list of additional_vim_regex_highlighting and disabled languages for indent. - additional_vim_regex_highlighting = { "ruby" }, - }, - indent = { enable = true, disable = { "ruby" } }, - }, - config = function(_, opts) - -- [[ Configure Treesitter ]] See `:help nvim-treesitter` - - ---@diagnostic disable-next-line: missing-fields - require("nvim-treesitter.configs").setup(opts) - - -- There are additional nvim-treesitter modules that you can use to interact - -- with nvim-treesitter. You should go explore a few and see what interests you: - -- - -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` - -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context - -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects - end, - }, - - -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the - -- init.lua. If you want these files, they are in the repository, so you can just download them and - -- place them in the correct locations. - - -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart - -- - -- Here are some example plugins that I've included in the Kickstart repository. - -- Uncomment any of the lines below to enable them (you will need to restart nvim). - -- - -- require 'kickstart.plugins.debug', - -- require 'kickstart.plugins.indent_line', - -- require 'kickstart.plugins.lint', - -- require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', - -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps - - -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` - -- This is the easiest way to modularize your config. - -- - -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins` - -- { import = 'custom.plugins' }, -}, { - ui = { - -- If you are using a Nerd Font: set icons to an empty table which will use the - -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table - icons = vim.g.have_nerd_font and {} or { - cmd = "⌘", - config = "🛠", - event = "📅", - ft = "📂", - init = "⚙", - keys = "🗝", - plugin = "🔌", - runtime = "💻", - require = "🌙", - source = "📄", - start = "🚀", - task = "📌", - lazy = "💤 ", - }, - }, + { import = "plugins.treesitter" }, + { import = "plugins.telescope" }, + { import = "plugins.markdown" }, + { import = "plugins.autosession" }, + { import = "plugins.yazi" }, + { import = "plugins.tmux_navigator" }, + { import = "plugins.lualine" }, + { import = "plugins.autopairs" }, + { import = "plugins.nvim-tree" }, + { import = "plugins.which-key" }, + { import = "plugins.telescope" }, + { import = "plugins.mason" }, -- or { import = "plugins.coc" } + { import = "plugins.omnisharp" }, + { import = "plugins.lazydev" }, + { import = "plugins.conform" }, + { import = "plugins.cmp" }, + { import = "plugins.catppuccin" }, + { import = "plugins.barbar" }, + { "luisiacc/gruvbox-baby" }, + { "rebelot/kanagawa.nvim" }, + { "Biscuit-Theme/biscuit" }, + { "rose-pine/neovim" }, + { "tpope/vim-sleuth" }, + { "sitiom/nvim-numbertoggle" }, + { "Bilal2453/luvit-meta" }, }) - --- The line beneath this is called `modeline`. See `:help modeline` --- vim: ts=2 sts=2 sw=2 et diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 6605aaf..92cf9e7 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,43 +1,46 @@ { - "LuaSnip": { "branch": "master", "commit": "787dee55ca364cc9119787165418fe93b74c1842" }, - "auto-session": { "branch": "main", "commit": "3cd531ce4d46fb156268ddedf5f3e6822ef26af7" }, + "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, + "ale": { "branch": "master", "commit": "65b49c1b8172d0ab1b08ffe8fdcabb93fc1328df" }, + "auto-session": { "branch": "main", "commit": "021b64ed7d4ac68a37be3ad28d8e1cba5bec582c" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "biscuit": { "branch": "main", "commit": "4089be2d6051c41558db55bbcc227c9d0c33bb0f" }, + "blink.cmp": { "branch": "main", "commit": "e16586c49309c29f238e1068546e7ba64cc15a78" }, "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "coc.nvim": { "branch": "release", "commit": "57d488a06bdb34de89acef3c2f3e9ce609d632ed" }, - "conform.nvim": { "branch": "master", "commit": "6a28c90082a67f62a323ab90d988e000a718a8c7" }, - "gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "conform.nvim": { "branch": "master", "commit": "f4e8837878fc5712d053ba3091a73d27d96a09e2" }, + "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" }, + "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, "gruvbox-baby": { "branch": "main", "commit": "bd52e62d8134647090108189e69c8b3cd18bdbbf" }, - "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, - "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, - "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, - "love2d.nvim": { "branch": "main", "commit": "3724013498b12c5abb4c6d40425e1ae4099f3539" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, + "kanagawa.nvim": { "branch": "master", "commit": "ad3dddecd606746374ba4807324a08331dfca23c" }, + "lazy.nvim": { "branch": "main", "commit": "7c493713bc2cb392706866eeba53aaef6c8e9fc6" }, + "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, + "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, + "luvit-meta": { "branch": "main", "commit": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7" }, "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, - "mini.nvim": { "branch": "main", "commit": "919b953f044d97a2243cc2d1f0b316a199434127" }, - "neovim": { "branch": "main", "commit": "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e" }, - "nvim": { "branch": "main", "commit": "cf021ebfb1e400a5fd1615cbda024308ca589b18" }, - "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, - "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.nvim": { "branch": "main", "commit": "2435d0de00174a45d6b352fefeaa6008ebe9f23b" }, + "neovim": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" }, + "nvim": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" }, + "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, + "nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" }, + "nvim-lspconfig": { "branch": "master", "commit": "5a812abc65d529ea7673059a348814c21d7f87ff" }, "nvim-numbertoggle": { "branch": "main", "commit": "c5827153f8a955886f1b38eaea6998c067d2992f" }, - "nvim-tree.lua": { "branch": "master", "commit": "4a9e82d10a3715d0c3845e1d2f66ddfb8b711253" }, - "nvim-treesitter": { "branch": "master", "commit": "00d219068385a4aa80859d4606ad6e03af6faa83" }, - "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, + "nvim-tree.lua": { "branch": "master", "commit": "375e38673b5c61debd8074ced01cfd4f3b7ce1e9" }, + "nvim-treesitter": { "branch": "master", "commit": "337b503688eccb3046547661e4c738e674548fcf" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, + "nvim-web-devicons": { "branch": "master", "commit": "e73d2774d12d0ecf9e05578d692ba1ea50508cf2" }, "omnisharp-vim": { "branch": "master", "commit": "2205888fdcaf2b6008d115f343ddc31697a62151" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "render-markdown.nvim": { "branch": "main", "commit": "fc05fb7c56795f191b6800799a2ec6ea325ba715" }, - "sg.nvim": { "branch": "master", "commit": "76c97d91f8d8818a4fcf14817fadd98412aa44c8" }, + "render-markdown.nvim": { "branch": "main", "commit": "e41b0002fe4196825450ab5a6343300c40791d51" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "2e1daa1d164ad8cc3e99b44ca68e990888a66038" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "vim-tmux-navigator": { "branch": "master", "commit": "a9b52e7d36114d40350099f254b5f299a35df978" }, - "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }, - "yazi.nvim": { "branch": "main", "commit": "93fd9dc5f23c7699ba50507bfe5d4136cfa487d2" } + "vim-tmux-navigator": { "branch": "master", "commit": "424b5caa154bff34dc258ee53cec5a8e36cf7ea8" }, + "which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" }, + "yazi.nvim": { "branch": "main", "commit": "ce6b5b249cde9e4a27dfce18a6adb57c170d4325" } } diff --git a/nvim/.config/nvim/lua/config/keymap.lua b/nvim/.config/nvim/lua/config/keymap.lua new file mode 100644 index 0000000..19597ff --- /dev/null +++ b/nvim/.config/nvim/lua/config/keymap.lua @@ -0,0 +1,53 @@ +-- Clear highlights on search when pressing in normal mode +-- See `:help hlsearch` +vim.keymap.set("n", "", "nohlsearch") + +-- Diagnostic keymaps +vim.keymap.set("n", "q", vim.diagnostic.setloclist, { desc = "Open diagnostic [Q]uickfix list" }) + +-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier +-- for people to discover. Otherwise, you normally need to press , which +-- is not what someone will guess without a bit more experience. +-- +-- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping +-- or just use to exit terminal mode +vim.keymap.set("t", "", ":bd!", { desc = "Exit terminal mode", silent = true }) +vim.keymap.set("i", "jj", "", { desc = "Exit insert mode", silent = true }) +-- TIP: Disable arrow keys in normal mode +-- vim.keymap.set('n', '', 'echo "Use h to move!!"') +-- vim.keymap.set('n', '', 'echo "Use l to move!!"') +-- vim.keymap.set('n', '', 'echo "Use k to move!!"') +-- vim.keymap.set('n', '', 'echo "Use j to move!!"') + +-- Keybinds to make split navigation easier. +-- Use CTRL+ to switch between windows + +-- Vertical navigation +vim.keymap.set("n", "", "5j", { desc = "Jump ten spaces down", silent = true }) +vim.keymap.set("n", "", "5k", { desc = "Jump ten spaces up", silent = true }) + +-- Horizontal navigation +vim.keymap.set("n", "", "^", { desc = "Jump to start of line", silent = true }) +vim.keymap.set("n", "", "$", { desc = "Jump to end of line", silent = true }) + +-- Telescope +vim.keymap.set("n", "ff", ":Telescope find_files", { desc = "Find Files", silent = true }) + +-- See `:help wincmd` for a list of all window commands +vim.keymap.set("n", "", "", { desc = "Move focus to the left window", silent = true }) +vim.keymap.set("n", "", "", { desc = "Move focus to the right window", silent = true }) +vim.keymap.set("n", "", "", { desc = "Move focus to the lower window", silent = true }) +vim.keymap.set("n", "", "", { desc = "Move focus to the upper window", silent = true }) + +-- Better split keymaps +-- vim.keymap.set("n", "v", "v", { desc = "Split window vertically", silent = true }) +-- vim.keymap.set("n", "h", "h", { desc = "Split window horizontally", silent = true }) + +-- Buffers +vim.keymap.set("n", "tt", ":tabeditn", { desc = "Create a new tab", silent = true }) +vim.keymap.set("n", "te", ":BufferClose!", { desc = "Close current tab", silent = true }) +vim.keymap.set("n", "", ":BufferNext", { desc = "Next tab", silent = true }) +vim.keymap.set("n", "", ":BufferPrevious", { desc = "Previous tab", silent = true }) +vim.keymap.set("n", "tl", ":BufferMoveNext", { desc = "Shift tab right", silent = true }) + +vim.keymap.set("n", "th", ":BufferMovePrevious", { desc = "Shift tab left", silent = true }) diff --git a/nvim/.config/nvim/lua/config/options.lua b/nvim/.config/nvim/lua/config/options.lua new file mode 100644 index 0000000..85e87f2 --- /dev/null +++ b/nvim/.config/nvim/lua/config/options.lua @@ -0,0 +1,152 @@ +-- Set as the leader key +-- See `:help mapleader` +-- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) +vim.g.mapleader = " " +vim.g.maplocalleader = " " +vim.opt.tabstop = 4 +vim.opt.softtabstop = 4 +vim.opt.shiftwidth = 4 + +-- Set to true if you have a Nerd Font installed and selected in the terminal +vim.g.have_nerd_font = true + +colorscheme = "catppuccin" + +-- [[ Setting options ]] +-- See `:help vim.opt` +-- NOTE: You can change these options as you wish! +-- For more options, you can see `:help option-list` + +-- Make line numbers default +vim.opt.number = true +-- You can also add relative line numbers, to help with jumping. +-- Experiment for yourself to see if you like it! +-- vim.opt.relativenumber = true + +-- Enable mouse mode, can be useful for resizing splits for example! +vim.opt.mouse = "a" + +-- Don't show the mode, since it's already in the status line +vim.opt.showmode = false + +-- Sync clipboard between OS and Neovim. +-- Schedule the setting after `UiEnter` because it can increase startup-time. +-- Remove this option if you want your OS clipboard to remain independent. +-- See `:help 'clipboard'` +vim.schedule(function() + vim.opt.clipboard = "unnamedplus" +end) + +-- Enable break indent +vim.opt.breakindent = true + +-- Save undo history +vim.opt.undofile = true + +-- Case-insensitive searching UNLESS \C or one or more capital letters in the search term +vim.opt.ignorecase = true +vim.opt.smartcase = true + +-- Keep signcolumn on by default +vim.opt.signcolumn = "yes" + +-- Decrease update time +vim.opt.updatetime = 250 + +-- Decrease mapped sequence wait time +-- Displays which-key popup sooner +vim.opt.timeoutlen = 300 + +-- Configure how new splits should be opened +vim.opt.splitright = true +vim.opt.splitbelow = true + +-- Sets how neovim will display certain whitespace characters in the editor. +-- See `:help 'list'` +-- and `:help 'listchars'` +vim.opt.list = true +vim.opt.listchars = { tab = "» ", trail = "·", nbsp = "␣" } + +-- Preview substitutions live, as you type! +vim.opt.inccommand = "split" + +-- Show which line your cursor is on +vim.opt.cursorline = true + +-- Minimal number of screen lines to keep above and below the cursor. +vim.opt.scrolloff = 10 +-- [[ Basic Keymaps ]] +-- See `:help vim.keymap.set()` + +if vim.env.TMUX ~= nil then + -- Define an autocommand for BufEnter and FocusGained events + vim.api.nvim_create_autocmd({ "BufEnter", "FocusGained" }, { + pattern = "*", + callback = function() + local current_file = vim.fn.expand("%:t") + local tmux_command = string.format("tmux rename-window 'nvim'", current_file) + vim.fn.system(tmux_command) + end, + }) + + -- Define an autocommand for the VimLeave event + vim.api.nvim_create_autocmd("VimLeave", { + pattern = "*", + callback = function() + local shell = vim.env.SHELL or "sh" + vim.fn.system("tmux set-window-option automatic-rename on") + end, + }) +end + +-- Nvim Tree +vim.keymap.set("n", "n", "NvimTreeToggle", { desc = "Toggle Nvim Tree" }) + +-- Tab Size +local TAB_WIDTH = 4 +vim.bo.tabstop = TAB_WIDTH +vim.bo.shiftwidth = TAB_WIDTH +vim.bo.expandtab = true +-- [[ Basic Autocommands ]] +-- See `:help lua-guide-autocommands` + +-- Highlight when yanking (copying) text +-- Try it with `yap` in normal mode +-- See `:help vim.highlight.on_yank()` +vim.api.nvim_create_autocmd("TextYankPost", { + desc = "Highlight when yanking (copying) text", + group = vim.api.nvim_create_augroup("kickstart-highlight-yank", { clear = true }), + callback = function() + vim.highlight.on_yank() + end, +}) + + +colors = { + blue = "#89b4fa", + cyan = "#74c7ec", + crust = "#11111b", + white = "#cdd6f4", + red = "#f38ba8", + violet = "#cba6f7", + surface = "#313244", + base = "#1e1e2e", +} + +bubbles_theme = { + normal = { + a = { fg = colors.crust, bg = colors.blue }, + b = { fg = colors.blue, bg = colors.surface }, + c = { fg = colors.white }, + }, + + insert = { a = { fg = colors.crust, bg = colors.green } }, + visual = { a = { fg = colors.crust, bg = colors.violet } }, + replace = { a = { fg = colors.crust, bg = colors.red } }, + + inactive = { + a = { fg = colors.white, bg = colors.crust }, + b = { fg = colors.white, bg = colors.crust }, + c = { fg = colors.white }, + }, +} diff --git a/nvim/.config/nvim/lua/config/run.lua b/nvim/.config/nvim/lua/config/run.lua new file mode 100644 index 0000000..87647cb --- /dev/null +++ b/nvim/.config/nvim/lua/config/run.lua @@ -0,0 +1,32 @@ +-- Run Commands + +local function new_run_command(cmd, lang, desc) + if desc == nil then + desc = "Run script" + end + + local group = vim.api.nvim_create_augroup("RunScript_" .. lang, { clear = true }) + + vim.api.nvim_create_autocmd("FileType", { + pattern = lang, + group = group, + callback = function() + vim.keymap.set("n", "vv", function() + vim.cmd("terminal " .. cmd) + end, { + desc = desc, + buffer = true, + silent = true, + }) + end, + }) +end + +-- Add new run commands +-- Run scripts or projects using vv +-- new_run_command(, , "] = cmp.mapping.select_next_item(), + -- Select the [p]revious item + [""] = cmp.mapping.select_prev_item(), + + -- Scroll the documentation window [b]ack / [f]orward + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + + -- Accept ([y]es) the completion. + -- This will auto-import if your LSP supports it. + -- This will expand snippets if the LSP sent a snippet. + [""] = cmp.mapping.confirm({ select = true }), + + [""] = cmp.mapping.complete({}), + + -- will move you to the right of each of the expansion locations. + -- is similar, except moving you backwards. + [""] = cmp.mapping(function() + if luasnip.expand_or_locally_jumpable() then + luasnip.expand_or_jump() + end + end, { "i", "s" }), + [""] = cmp.mapping(function() + if luasnip.locally_jumpable(-1) then + luasnip.jump(-1) + end + end, { "i", "s" }), + + -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: + -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps + }), + sources = { + { + name = "lazydev", + -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it + group_index = 0, + }, + { name = "nvim_lsp" }, + { name = "luasnip" }, + { name = "path" }, + }, + }) + end, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/coc.lua b/nvim/.config/nvim/lua/plugins/coc.lua new file mode 100644 index 0000000..71d8d7c --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/coc.lua @@ -0,0 +1,36 @@ +return { + { + "neoclide/coc.nvim", + branch = "release", + config = function() + -- Key mappings for coc.nvim in insert mode + vim.cmd.set("pumheight=10") + vim.g.coc_default_semantic_highlight_groups = 1 + vim.keymap.set( + "i", + "", + "pumvisible() ? coc#_select_confirm() : ''", + { expr = true, noremap = true, silent = true } + ) + vim.keymap.set( + "i", + "", + [[coc#pum#visible() ? coc#pum#next(1) : "\"]], + { expr = true, noremap = true, silent = true, replace_keycodes = false } + ) + vim.keymap.set( + "i", + "", + [[coc#pum#visible() ? coc#pum#prev(1) : "\"]], + { expr = true, noremap = true, silent = true, replace_keycodes = false } + ) + -- Disable Enter key for confirming completion + vim.keymap.set( + "i", + "", + "pumvisible() ? coc#_cancel() : ''", + { expr = true, noremap = true, silent = true } + ) + end, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/conform.lua b/nvim/.config/nvim/lua/plugins/conform.lua new file mode 100644 index 0000000..9dfc377 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/conform.lua @@ -0,0 +1,38 @@ +return { + { + "stevearc/conform.nvim", + event = { "BufWritePre" }, + cmd = { "ConformInfo" }, + keys = { + { + "f", + function() + require("conform").format({ async = true, lsp_fallback = true }) + end, + mode = "", + desc = "[F]ormat buffer", + }, + }, + opts = { + notify_on_error = false, + format_on_save = function(bufnr) + -- Disable "format_on_save lsp_fallback" for languages that don't + -- have a well standardized coding style. You can add additional + -- languages here or re-enable it for the disabled ones. + local disable_filetypes = { c = true, cpp = true } + return { + timeout_ms = 500, + lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], + } + end, + formatters_by_ft = { + lua = { "stylua" }, + -- Conform can also run multiple formatters sequentially + -- python = { "isort", "black" }, + -- + -- You can use 'stop_after_first' to run the first available formatter from the list + -- javascript = { "prettierd", "prettier", stop_after_first = true }, + }, + }, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/gitsigns.lua b/nvim/.config/nvim/lua/plugins/gitsigns.lua new file mode 100644 index 0000000..9cef063 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/gitsigns.lua @@ -0,0 +1,14 @@ +return { + { + "lewis6991/gitsigns.nvim", + opts = { + signs = { + add = { text = "+" }, + change = { text = "~" }, + delete = { text = "_" }, + topdelete = { text = "‾" }, + changedelete = { text = "~" }, + }, + }, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua new file mode 100644 index 0000000..51deff7 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -0,0 +1,11 @@ +-- [[ Install `lazy.nvim` plugin manager ]] +-- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.uv.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 + error("Error cloning lazy.nvim:\n" .. out) + end +end ---@diagnostic disable-next-line: undefined-field +vim.opt.rtp:prepend(lazypath) diff --git a/nvim/.config/nvim/lua/plugins/lazydev.lua b/nvim/.config/nvim/lua/plugins/lazydev.lua new file mode 100644 index 0000000..aae7ffb --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/lazydev.lua @@ -0,0 +1,14 @@ +return { + { + -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins + -- used for completion, annotations and signatures of Neovim apis + "folke/lazydev.nvim", + ft = "lua", + opts = { + library = { + -- Load luvit types when the `vim.uv` word is found + { path = "luvit-meta/library", words = { "vim%.uv" } }, + }, + }, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/lualine.lua b/nvim/.config/nvim/lua/plugins/lualine.lua new file mode 100644 index 0000000..801648e --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/lualine.lua @@ -0,0 +1,41 @@ +return { + { + "nvim-lualine/lualine.nvim", + config = function() + require("lualine").setup({ + options = { + --theme = bubbles_theme, + component_separators = "", + section_separators = { left = "", right = "" }, + }, + sections = { + lualine_a = { + { "mode", separator = { left = "", right = "" }, right_padding = 2 }, + }, + lualine_b = { + "filename", + "branch", + }, + lualine_c = { + "diagnostics", + }, + lualine_x = { "filetype" }, + lualine_y = { "progress" }, + lualine_z = { + { "location", separator = { left = "", right = "" }, left_padding = 0 }, + }, + }, + inactive_sections = { + lualine_a = { "filename" }, + lualine_b = {}, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = { "location" }, + }, + tabline = {}, + extensions = {}, + }) + end, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/markdown.lua b/nvim/.config/nvim/lua/plugins/markdown.lua new file mode 100644 index 0000000..d461450 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/markdown.lua @@ -0,0 +1,16 @@ +return { + { + "MeanderingProgrammer/render-markdown.nvim", + opts = {}, + dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.nvim" }, -- if you use the mini.nvim suite + -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins + -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons + }, + { + "tadmccorkle/markdown.nvim", + ft = "markdown", -- or 'event = "VeryLazy"' + opts = { + -- configuration here or empty for defaults + }, + } +} diff --git a/nvim/.config/nvim/lua/plugins/mason.lua b/nvim/.config/nvim/lua/plugins/mason.lua new file mode 100644 index 0000000..92f9008 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/mason.lua @@ -0,0 +1,273 @@ +return { + { + -- Main LSP Configuration + "neovim/nvim-lspconfig", + dependencies = { + -- Automatically install LSPs and related tools to stdpath for Neovim + -- Mason must be loaded before its dependents so we need to set it up here. + -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})` + { "williamboman/mason.nvim", opts = {} }, + "williamboman/mason-lspconfig.nvim", + "WhoIsSethDaniel/mason-tool-installer.nvim", + + -- Useful status updates for LSP. + { "j-hui/fidget.nvim", opts = {} }, + + -- Allows extra capabilities provided by blink.cmp + "saghen/blink.cmp", + }, + config = function() + -- Brief aside: **What is LSP?** + -- + -- LSP is an initialism you've probably heard, but might not understand what it is. + -- + -- LSP stands for Language Server Protocol. It's a protocol that helps editors + -- and language tooling communicate in a standardized fashion. + -- + -- In general, you have a "server" which is some tool built to understand a particular + -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers + -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone + -- processes that communicate with some "client" - in this case, Neovim! + -- + -- LSP provides Neovim with features like: + -- - Go to definition + -- - Find references + -- - Autocompletion + -- - Symbol Search + -- - and more! + -- + -- Thus, Language Servers are external tools that must be installed separately from + -- Neovim. This is where `mason` and related plugins come into play. + -- + -- If you're wondering about lsp vs treesitter, you can check out the wonderfully + -- and elegantly composed help section, `:help lsp-vs-treesitter` + + -- This function gets run when an LSP attaches to a particular buffer. + -- That is to say, every time a new file is opened that is associated with + -- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this + -- function will be executed to configure the current buffer + vim.api.nvim_create_autocmd("LspAttach", { + group = vim.api.nvim_create_augroup("kickstart-lsp-attach", { clear = true }), + callback = function(event) + -- NOTE: Remember that Lua is a real programming language, and as such it is possible + -- to define small helper and utility functions so you don't have to repeat yourself. + -- + -- In this case, we create a function that lets us more easily define mappings specific + -- for LSP related items. It sets the mode, buffer and description for us each time. + local map = function(keys, func, desc, mode) + mode = mode or "n" + vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = "LSP: " .. desc }) + end + + -- Rename the variable under your cursor. + -- Most Language Servers support renaming across files, etc. + map("grn", vim.lsp.buf.rename, "[R]e[n]ame") + + -- Execute a code action, usually your cursor needs to be on top of an error + -- or a suggestion from your LSP for this to activate. + map("gra", vim.lsp.buf.code_action, "[G]oto Code [A]ction", { "n", "x" }) + + -- Find references for the word under your cursor. + map("grr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences") + + -- Jump to the implementation of the word under your cursor. + -- Useful when your language has ways of declaring types without an actual implementation. + map("gri", require("telescope.builtin").lsp_implementations, "[G]oto [I]mplementation") + + -- Jump to the definition of the word under your cursor. + -- This is where a variable was first declared, or where a function is defined, etc. + -- To jump back, press . + map("grd", require("telescope.builtin").lsp_definitions, "[G]oto [D]efinition") + + -- WARN: This is not Goto Definition, this is Goto Declaration. + -- For example, in C this would take you to the header. + map("grD", vim.lsp.buf.declaration, "[G]oto [D]eclaration") + + -- Fuzzy find all the symbols in your current document. + -- Symbols are things like variables, functions, types, etc. + map("gO", require("telescope.builtin").lsp_document_symbols, "Open Document Symbols") + + -- Fuzzy find all the symbols in your current workspace. + -- Similar to document symbols, except searches over your entire project. + map("gW", require("telescope.builtin").lsp_dynamic_workspace_symbols, "Open Workspace Symbols") + + -- Jump to the type of the word under your cursor. + -- Useful when you're not sure what type a variable is and you want to see + -- the definition of its *type*, not where it was *defined*. + map("grt", require("telescope.builtin").lsp_type_definitions, "[G]oto [T]ype Definition") + + -- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10) + ---@param client vim.lsp.Client + ---@param method vim.lsp.protocol.Method + ---@param bufnr? integer some lsp support methods only in specific files + ---@return boolean + local function client_supports_method(client, method, bufnr) + if vim.fn.has("nvim-0.11") == 1 then + return client:supports_method(method, bufnr) + else + return client.supports_method(method, { bufnr = bufnr }) + end + end + + -- The following two autocommands are used to highlight references of the + -- word under your cursor when your cursor rests there for a little while. + -- See `:help CursorHold` for information about when this is executed + -- + -- When you move your cursor, the highlights will be cleared (the second autocommand). + local client = vim.lsp.get_client_by_id(event.data.client_id) + if + client + and client_supports_method( + client, + vim.lsp.protocol.Methods.textDocument_documentHighlight, + event.buf + ) + then + local highlight_augroup = + vim.api.nvim_create_augroup("kickstart-lsp-highlight", { clear = false }) + vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, { + buffer = event.buf, + group = highlight_augroup, + callback = vim.lsp.buf.document_highlight, + }) + + vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, { + buffer = event.buf, + group = highlight_augroup, + callback = vim.lsp.buf.clear_references, + }) + + vim.api.nvim_create_autocmd("LspDetach", { + group = vim.api.nvim_create_augroup("kickstart-lsp-detach", { clear = true }), + callback = function(event2) + vim.lsp.buf.clear_references() + vim.api.nvim_clear_autocmds({ group = "kickstart-lsp-highlight", buffer = event2.buf }) + end, + }) + end + + -- The following code creates a keymap to toggle inlay hints in your + -- code, if the language server you are using supports them + -- + -- This may be unwanted, since they displace some of your code + if + client + and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) + then + map("th", function() + vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = event.buf })) + end, "[T]oggle Inlay [H]ints") + end + end, + }) + + -- Diagnostic Config + -- See :help vim.diagnostic.Opts + vim.diagnostic.config({ + severity_sort = true, + float = { border = "rounded", source = "if_many" }, + underline = { severity = vim.diagnostic.severity.ERROR }, + signs = vim.g.have_nerd_font and { + text = { + [vim.diagnostic.severity.ERROR] = "󰅚 ", + [vim.diagnostic.severity.WARN] = "󰀪 ", + [vim.diagnostic.severity.INFO] = "󰋽 ", + [vim.diagnostic.severity.HINT] = "󰌶 ", + }, + } or {}, + virtual_text = { + source = "if_many", + spacing = 2, + format = function(diagnostic) + local diagnostic_message = { + [vim.diagnostic.severity.ERROR] = diagnostic.message, + [vim.diagnostic.severity.WARN] = diagnostic.message, + [vim.diagnostic.severity.INFO] = diagnostic.message, + [vim.diagnostic.severity.HINT] = diagnostic.message, + } + return diagnostic_message[diagnostic.severity] + end, + }, + }) + + -- LSP servers and clients are able to communicate to each other what features they support. + -- By default, Neovim doesn't support everything that is in the LSP specification. + -- When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities. + -- So, we create new capabilities with blink.cmp, and then broadcast that to the servers. + local capabilities = require("blink.cmp").get_lsp_capabilities() + + -- Enable the following language servers + -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. + -- + -- Add any additional override configuration in the following tables. Available keys are: + -- - cmd (table): Override the default command used to start the server + -- - filetypes (table): Override the default list of associated filetypes for the server + -- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features. + -- - settings (table): Override the default settings passed when initializing the server. + -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ + local servers = { + -- clangd = {}, + -- gopls = {}, + -- pyright = {}, + -- rust_analyzer = {}, + -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs + -- + -- Some languages (like typescript) have entire language plugins that can be useful: + -- https://github.com/pmizio/typescript-tools.nvim + -- + -- But for many setups, the LSP (`ts_ls`) will work just fine + -- ts_ls = {}, + -- + + lua_ls = { + -- cmd = { ... }, + -- filetypes = { ... }, + -- capabilities = {}, + settings = { + Lua = { + completion = { + callSnippet = "Replace", + }, + -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings + -- diagnostics = { disable = { 'missing-fields' } }, + }, + }, + }, + } + + -- Ensure the servers and tools above are installed + -- + -- To check the current status of installed tools and/or manually install + -- other tools, you can run + -- :Mason + -- + -- You can press `g?` for help in this menu. + -- + -- `mason` had to be setup earlier: to configure its options see the + -- `dependencies` table for `nvim-lspconfig` above. + -- + -- You can add other tools here that you want Mason to install + -- for you, so that they are available from within Neovim. + local ensure_installed = vim.tbl_keys(servers or {}) + vim.list_extend(ensure_installed, { + "stylua", -- Used to format Lua code + }) + require("mason-tool-installer").setup({ ensure_installed = ensure_installed }) + + require("mason-lspconfig").setup({ + ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer) + automatic_installation = false, + handlers = { + function(server_name) + local server = servers[server_name] or {} + -- This handles overriding only values explicitly passed + -- by the server configuration above. Useful when disabling + -- certain features of an LSP (for example, turning off formatting for ts_ls) + server.capabilities = vim.tbl_deep_extend("force", {}, capabilities, server.capabilities or {}) + require("lspconfig")[server_name].setup(server) + end, + }, + }) + end, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/mini.lua b/nvim/.config/nvim/lua/plugins/mini.lua new file mode 100644 index 0000000..d75083b --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/mini.lua @@ -0,0 +1,24 @@ +return { + { -- Collection of various small independent plugins/modules + "echasnovski/mini.nvim", + config = function() + -- Better Around/Inside textobjects + -- + -- Examples: + -- - va) - [V]isually select [A]round [)]paren + -- - yinq - [Y]ank [I]nside [N]ext [Q]uote + -- - ci' - [C]hange [I]nside [']quote + require("mini.ai").setup({ n_lines = 500 }) + + -- Add/delete/replace surroundings (brackets, quotes, etc.) + -- + -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren + -- - sd' - [S]urround [D]elete [']quotes + -- - sr)' - [S]urround [R]eplace [)] ['] + require("mini.surround").setup() + + -- ... and there is more! + -- Check out: https://github.com/echasnovski/mini.nvim + end, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/nvim-tree.lua b/nvim/.config/nvim/lua/plugins/nvim-tree.lua new file mode 100644 index 0000000..f223524 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/nvim-tree.lua @@ -0,0 +1,19 @@ +return { + { + "nvim-tree/nvim-tree.lua", + version = "*", + lazy = false, + dependencies = { + "nvim-tree/nvim-web-devicons", + }, + config = function() + require("nvim-tree").setup({ + actions = { + open_file = { + quit_on_open = true, + }, + }, + }) + end, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/omnisharp.lua b/nvim/.config/nvim/lua/plugins/omnisharp.lua new file mode 100644 index 0000000..e34b73a --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/omnisharp.lua @@ -0,0 +1,41 @@ +return { + { + "OmniSharp/omnisharp-vim", + config = function() + vim.g.OmniSharp_server_use_net6 = 1 + vim.g.OmniSharp_server_use_mono = 0 + vim.g.OmniSharp_server_stdio = 1 + vim.g.OmniSharp_highlighting = 3 + vim.g.OmniSharp_diagnostic_showid = 1 + vim.g.OmniSharp_diagnostic_overrides = { + CS8019 = { type = "none" }, + } + + vim.g.OmniSharp_highlight_groups = { + ParameterName = 0, + FieldName = "Label", + EnumMemberName = 0, + LocalName = 0, + PropertyName = 0, + DelegateName = "Function", + Keyword = 0, + Identifier = 0, + EventName = 0 + } + end, + }, + { + "dense-analysis/ale", + config = function() + vim.g.ale_sign_column_always = 1 + vim.g.ale_sign_error = " " + vim.g.ale_sign_warning = " " + vim.b.ale_linters = { cs = { "OmniSharp" } } + vim.g.ale_linters_explicit = 1 + vim.g.ale_echo_msg_error_str = " " + vim.g.ale_echo_msg_warning_str = " " + vim.g.ale_cs_csc_assemblies = { ".mono" } + vim.g.ale_cs_mcsc_assemblies = { ".mono" } + end, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua new file mode 100644 index 0000000..e06fcbc --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/telescope.lua @@ -0,0 +1,79 @@ +return { + { -- Fuzzy Finder (files, lsp, etc) + "nvim-telescope/telescope.nvim", + event = "VimEnter", + branch = "0.1.x", + dependencies = { + "nvim-lua/plenary.nvim", + { -- If encountering errors, see telescope-fzf-native README for installation instructions + "nvim-telescope/telescope-fzf-native.nvim", + build = "make", + cond = function() + return vim.fn.executable("make") == 1 + end, + }, + { "nvim-telescope/telescope-ui-select.nvim" }, + + -- Useful for getting pretty icons, but requires a Nerd Font. + { "nvim-tree/nvim-web-devicons", enabled = vim.g.have_nerd_font }, + }, + config = function() + require("telescope").setup({ + -- You can put your default mappings / updates / etc. in here + -- All the info you're looking for is in `:help telescope.setup()` + -- + -- defaults = { + -- mappings = { + -- i = { [''] = 'to_fuzzy_refine' }, + -- }, + -- }, + -- pickers = {} + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown(), + }, + }, + }) + + -- Enable Telescope extensions if they are installed + pcall(require("telescope").load_extension, "fzf") + pcall(require("telescope").load_extension, "ui-select") + + -- See `:help telescope.builtin` + local builtin = require("telescope.builtin") + vim.keymap.set("n", "sh", builtin.help_tags, { desc = "[S]earch [H]elp" }) + vim.keymap.set("n", "sk", builtin.keymaps, { desc = "[S]earch [K]eymaps" }) + vim.keymap.set("n", "sf", builtin.find_files, { desc = "[S]earch [F]iles" }) + vim.keymap.set("n", "ss", builtin.builtin, { desc = "[S]earch [S]elect Telescope" }) + vim.keymap.set("n", "sw", builtin.grep_string, { desc = "[S]earch current [W]ord" }) + vim.keymap.set("n", "sg", builtin.live_grep, { desc = "[S]earch by [G]rep" }) + vim.keymap.set("n", "sd", builtin.diagnostics, { desc = "[S]earch [D]iagnostics" }) + vim.keymap.set("n", "sr", builtin.resume, { desc = "[S]earch [R]esume" }) + vim.keymap.set("n", "s.", builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) + -- vim.keymap.set("n", "", builtin.buffers, { desc = "[ ] Find existing buffers" }) + + -- Slightly advanced example of overriding default behavior and theme + vim.keymap.set("n", "/", function() + -- You can pass additional configuration to Telescope to change the theme, layout, etc. + builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({ + winblend = 10, + previewer = false, + })) + end, { desc = "[/] Fuzzily search in current buffer" }) + + -- It's also possible to pass additional configuration options. + -- See `:help telescope.builtin.live_grep()` for information about particular keys + 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" }) + + -- Shortcut for searching your Neovim configuration 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/plugins/tmux_navigator.lua b/nvim/.config/nvim/lua/plugins/tmux_navigator.lua new file mode 100644 index 0000000..9a723a5 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/tmux_navigator.lua @@ -0,0 +1,6 @@ +return { + { + "christoomey/vim-tmux-navigator", + lazy = false, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/todo.lua b/nvim/.config/nvim/lua/plugins/todo.lua new file mode 100644 index 0000000..c19a7a0 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/todo.lua @@ -0,0 +1,8 @@ +return { + { + "folke/todo-comments.nvim", + event = "VimEnter", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = { signs = false }, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/treesitter.lua b/nvim/.config/nvim/lua/plugins/treesitter.lua new file mode 100644 index 0000000..579008f --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/treesitter.lua @@ -0,0 +1,45 @@ +return { + { "nvim-treesitter/nvim-treesitter-textobjects" }, + { -- Highlight, edit, and navigate code + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + opts = { + ensure_installed = { + "bash", + "c", + "diff", + "html", + "lua", + "luadoc", + "markdown", + "markdown_inline", + "query", + "vim", + "vimdoc", + }, + -- Autoinstall languages that are not installed + auto_install = true, + highlight = { + enable = true, + -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. + -- If you are experiencing weird indenting issues, add the language to + -- the list of additional_vim_regex_highlighting and disabled languages for indent. + additional_vim_regex_highlighting = { "ruby" }, + }, + indent = { enable = true, disable = { "ruby" } }, + }, + config = function(_, opts) + -- [[ Configure Treesitter ]] See `:help nvim-treesitter` + + ---@diagnostic disable-next-line: missing-fields + require("nvim-treesitter.configs").setup(opts) + + -- There are additional nvim-treesitter modules that you can use to interact + -- with nvim-treesitter. You should go explore a few and see what interests you: + -- + -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` + -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context + -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects + end, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/which-key.lua b/nvim/.config/nvim/lua/plugins/which-key.lua new file mode 100644 index 0000000..7e08587 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/which-key.lua @@ -0,0 +1,20 @@ +return { + { + "folke/which-key.nvim", + event = "VimEnter", -- Sets the loading event to 'VimEnter' + config = function() -- This is the function that runs, AFTER loading + require("which-key").setup() + + -- Document existing key chains + require("which-key").add({ + { "c", group = "[C]ode" }, + { "d", group = "[D]ocument" }, + { "r", group = "[R]ename" }, + { "s", group = "[S]earch" }, + { "w", group = "[W]orkspace" }, + { "t", group = "[T]oggle" }, + { "h", group = "Git [H]unk", mode = { "n", "v" } }, + }) + end, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/yazi.lua b/nvim/.config/nvim/lua/plugins/yazi.lua new file mode 100644 index 0000000..ba4b99d --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/yazi.lua @@ -0,0 +1,30 @@ +return { + { + "mikavilpas/yazi.nvim", + event = "VeryLazy", + keys = { + -- 👇 in this section, choose your own keymappings! + { + "", + "Yazi", + desc = "Open yazi at the current file", + }, + { + -- NOTE: this requires a version of yazi that includes + -- https://github.com/sxyazi/yazi/pull/1305 from 2024-07-18 + "", + "Yazi toggle", + desc = "Resume the last yazi session", + }, + }, + ---@type YaziConfig + opts = { + -- if you want to open yazi instead of netrw, see below for more info + open_for_directories = false, + keymaps = { + show_help = "", + }, + highlight_hovered_buffers_in_same_directory = true, + }, + }, +} diff --git a/nvim/.config/nvim/utilities/unity-nvim b/nvim/.config/nvim/utilities/unity-nvim new file mode 100755 index 0000000..3430f22 --- /dev/null +++ b/nvim/.config/nvim/utilities/unity-nvim @@ -0,0 +1,2 @@ +#!/bin/bash +wezterm -- nvr --servername unity $@