From 01098b6818de2f57c7e9489c730e7fade22e9dc8 Mon Sep 17 00:00:00 2001 From: Rahsheen Porter Date: Sun, 25 Feb 2024 20:36:08 -0500 Subject: [PATCH] remove nvim config --- .config/nvim/after/plugin/defaults.lua | 2 - .config/nvim/after/plugin/fugitive.lua | 21 - .config/nvim/after/plugin/git-worktree.lua | 22 - .config/nvim/after/plugin/lualine.lua | 13 - .config/nvim/after/plugin/null-ls.lua | 75 --- .config/nvim/init.lua | 552 ------------------ .config/nvim/lua/custom/plugins.lua | 54 -- .config/nvim/lua/kickstart/autoformat.lua | 74 --- .config/nvim/lua/kickstart/debug.lua | 83 --- .config/nvim/lua/rahcodes/keymap.lua | 20 - .config/nvim/lua/rahcodes/null-ls/rubocop.lua | 27 - .config/nvim/lua/rahcodes/remap.lua | 70 --- .config/nvim/lua/rahcodes/sets.lua | 26 - 13 files changed, 1039 deletions(-) delete mode 100644 .config/nvim/after/plugin/defaults.lua delete mode 100644 .config/nvim/after/plugin/fugitive.lua delete mode 100644 .config/nvim/after/plugin/git-worktree.lua delete mode 100644 .config/nvim/after/plugin/lualine.lua delete mode 100644 .config/nvim/after/plugin/null-ls.lua delete mode 100644 .config/nvim/init.lua delete mode 100644 .config/nvim/lua/custom/plugins.lua delete mode 100644 .config/nvim/lua/kickstart/autoformat.lua delete mode 100644 .config/nvim/lua/kickstart/debug.lua delete mode 100644 .config/nvim/lua/rahcodes/keymap.lua delete mode 100644 .config/nvim/lua/rahcodes/null-ls/rubocop.lua delete mode 100644 .config/nvim/lua/rahcodes/remap.lua delete mode 100644 .config/nvim/lua/rahcodes/sets.lua diff --git a/.config/nvim/after/plugin/defaults.lua b/.config/nvim/after/plugin/defaults.lua deleted file mode 100644 index dd0ba5b2..00000000 --- a/.config/nvim/after/plugin/defaults.lua +++ /dev/null @@ -1,2 +0,0 @@ -require("rahcodes.remap") -require("rahcodes.sets") diff --git a/.config/nvim/after/plugin/fugitive.lua b/.config/nvim/after/plugin/fugitive.lua deleted file mode 100644 index e448b76e..00000000 --- a/.config/nvim/after/plugin/fugitive.lua +++ /dev/null @@ -1,21 +0,0 @@ -vim.keymap.set("n", "gs", ":G") -vim.keymap.set("n", "gh", ":diffget //3") -vim.keymap.set("n", "gu", ":diffget //2") -vim.keymap.set("n", "gc", ":GCheckout") -vim.keymap.set("n", "ga", ":G add %:p") -vim.keymap.set("n", "gc", ":G commit -v -q") -vim.keymap.set("n", "gt", ":G commit -v -q %:p") -vim.keymap.set("n", "gff", ":G ff") -vim.keymap.set("n", "gfo", ":G fetch origin") -vim.keymap.set("n", "gd", ":Gdiff") -vim.keymap.set("n", "ge", ":Gedit") -vim.keymap.set("n", "gr", ":Gread") -vim.keymap.set("n", "grb", ":G rebase -i") -vim.keymap.set("n", "gw", ":Gwrite") -vim.keymap.set("n", "gl", ":silent! Glog:bot copen") -vim.keymap.set("n", "gp", ":Ggrep") -vim.keymap.set("n", "gm", ":Gmove") -vim.keymap.set("n", "gbl", ":G blame") -vim.keymap.set("n", "go", ":G checkout") -vim.keymap.set("n", "gps", ":Dispatch! git push") -vim.keymap.set("n", "gpl", ":Dispatch! git pull") diff --git a/.config/nvim/after/plugin/git-worktree.lua b/.config/nvim/after/plugin/git-worktree.lua deleted file mode 100644 index 9e70aa36..00000000 --- a/.config/nvim/after/plugin/git-worktree.lua +++ /dev/null @@ -1,22 +0,0 @@ -local Worktree = require("git-worktree") - --- op = Operations.Switch, Operations.Create, Operations.Delete --- metadata = table of useful values (structure dependent on op) --- Switch --- path = path you switched to --- prev_path = previous worktree path --- Create --- path = path where worktree created --- branch = branch name --- upstream = upstream remote name --- Delete --- path = path where worktree deleted - -Worktree.on_tree_change(function(op, metadata) - if op == Worktree.Operations.Switch then - print("Switched from " .. metadata.prev_path .. " to " .. metadata.path) - end -end) - -vim.keymap.set("n", "bw", require("telescope").extensions.git_worktree.git_worktrees, { desc = "[B]rowse Git Worktrees" }) -vim.keymap.set("n", "cw", require("telescope").extensions.git_worktree.create_git_worktree, { desc = "[C]reate Git [W]orktree" }) diff --git a/.config/nvim/after/plugin/lualine.lua b/.config/nvim/after/plugin/lualine.lua deleted file mode 100644 index 1e3a426e..00000000 --- a/.config/nvim/after/plugin/lualine.lua +++ /dev/null @@ -1,13 +0,0 @@ -require("lualine").setup({ - options = { - theme = "tokyonight", - tabline = { - lualine_a = { "buffers" }, - lualine_b = { "branch" }, - lualine_c = { "filename" }, - lualine_x = {}, - lualine_y = {}, - lualine_z = { "tabs" }, - }, - }, -}) diff --git a/.config/nvim/after/plugin/null-ls.lua b/.config/nvim/after/plugin/null-ls.lua deleted file mode 100644 index 12d5b500..00000000 --- a/.config/nvim/after/plugin/null-ls.lua +++ /dev/null @@ -1,75 +0,0 @@ -local setup, null_ls = pcall(require, "null-ls") -if not setup then - return -end - -local formatting = null_ls.builtins.formatting -local diagnostics = null_ls.builtins.diagnostics -local conditional = function(fn) - local utils = require("null-ls.utils").make_conditional_utils() - return fn(utils) -end - -local lsp_formatting = function(bufnr) - vim.lsp.buf.format({ - timeout_ms = 2000, - filter = function(client) - -- apply whatever logic you want (in this example, we'll only use null-ls) - return client.name ~= "tsserver" - end, - bufnr = bufnr, - }) -end - -local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) - --- local my_rubocop_formatter = require("rahcodes.null-ls.rubocop") -local rubocop = null_ls.builtins.formatting.rubocop - -null_ls.setup({ - debug = false, - sources = { - formatting.prettier, - -- formatting.stylua, - null_ls.builtins.code_actions.gitsigns, - -- setting eslint_d only if we have a ".eslintrc.js" file in the project - diagnostics.eslint_d.with({ - condition = function(utils) - return utils.root_has_file({ '.eslintrc.js' }) - end - }), - - -- Here we set a conditional to call the rubocop formatter. If we have a Gemfile in the project, we call "bundle exec rubocop", if not we only call "rubocop". - conditional(function(utils) - return utils.root_has_file("Gemfile") - and rubocop.with({ - command = "bundle", - args = vim.list_extend({ "exec", "rubocop" }, rubocop._opts.args), - }) - or rubocop - end), - - -- Same as above, but with diagnostics.rubocop to make sure we use the proper rubocop version for the project - conditional(function(utils) - return utils.root_has_file("Gemfile") - and null_ls.builtins.diagnostics.rubocop.with({ - command = "bundle", - args = vim.list_extend({ "exec", "rubocop" }, null_ls.builtins.diagnostics.rubocop._opts.args), - }) - or null_ls.builtins.diagnostics.rubocop - end), - }, - -- format on save - on_attach = function(client, bufnr) - if client.supports_method("textDocument/formatting") then - vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) - vim.api.nvim_create_autocmd("BufWritePre", { - group = augroup, - buffer = bufnr, - callback = function() - lsp_formatting(bufnr) - end, - }) - end - end, -}) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua deleted file mode 100644 index 13c3766f..00000000 --- a/.config/nvim/init.lua +++ /dev/null @@ -1,552 +0,0 @@ ---[[ - -===================================================================== -==================== READ THIS BEFORE CONTINUING ==================== -===================================================================== - -Kickstart.nvim is *not* a distribution. - -Kickstart.nvim is a template for your own configuration. - The goal is that you can read every line of code, top-to-bottom, understand - what your configuration is doing, and modify it to suit your needs. - - Once you've done that, you should start exploring, configuring and tinkering to - explore Neovim! - - If you don't know anything about Lua, I recommend taking some time to read through - a guide. One possible example: - - https://learnxinyminutes.com/docs/lua/ - - - And then you can explore or search through `:help lua-guide` - - https://neovim.io/doc/user/lua-guide.html - - -Kickstart Guide: - -I have left several `:help X` comments throughout the init.lua -You should run that command and read that help section for more information. - -In addition, I have some `NOTE:` items throughout the file. -These are for you, the reader to help understand what is happening. Feel free to delete -them once you know what you're doing, but they should serve as a guide for when you -are first encountering a few different constructs in your nvim config. - -I hope you enjoy your Neovim journey, -- TJ - -P.S. You can delete this when you're done too. It's your config now :) ---]] --- Set as the leader key --- See `:help mapleader` --- NOTE: Must happen before plugins are required (otherwise wrong leader will be used) -vim.g.mapleader = ' ' -vim.g.maplocalleader = ' ' - --- Install package manager --- https://github.com/folke/lazy.nvim --- `:help lazy.nvim.txt` for more info -local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' -if not vim.loop.fs_stat(lazypath) then - vim.fn.system { - 'git', - 'clone', - '--filter=blob:none', - 'https://github.com/folke/lazy.nvim.git', - '--branch=stable', -- latest stable release - lazypath, - } -end -vim.opt.rtp:prepend(lazypath) - --- NOTE: Here is where you install your plugins. --- You can configure plugins using the `config` key. --- --- You can also configure plugins after the setup call, --- as they will be available in your neovim runtime. -require('lazy').setup({ - -- NOTE: First, some plugins that don't require any configuration - - -- Git related plugins - 'tpope/vim-fugitive', - 'tpope/vim-rhubarb', - - -- Detect tabstop and shiftwidth automatically - 'tpope/vim-sleuth', - - -- NOTE: This is where your plugins related to LSP can be installed. - -- The configuration is done below. Search for lspconfig to find it below. - { - -- LSP Configuration & Plugins - 'neovim/nvim-lspconfig', - dependencies = { - -- Automatically install LSPs to stdpath for neovim - { 'williamboman/mason.nvim', config = true }, - 'williamboman/mason-lspconfig.nvim', - - -- Useful status updates for LSP - -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', tag = 'legacy', opts = {} }, - - -- Additional lua configuration, makes nvim stuff amazing! - 'folke/neodev.nvim', - }, - }, - - { - -- Autocompletion - 'hrsh7th/nvim-cmp', - dependencies = { - -- Snippet Engine & its associated nvim-cmp source - 'L3MON4D3/LuaSnip', - 'saadparwaiz1/cmp_luasnip', - - -- Adds LSP completion capabilities - 'hrsh7th/cmp-nvim-lsp', - - -- Adds a number of user-friendly snippets - 'rafamadriz/friendly-snippets', - }, - }, - - -- Useful plugin to show you pending keybinds. - { 'folke/which-key.nvim', opts = {} }, - { - -- Adds git related signs to the gutter, as well as utilities for managing changes - 'lewis6991/gitsigns.nvim', - opts = { - -- See `:help gitsigns.txt` - signs = { - add = { text = '+' }, - change = { text = '~' }, - delete = { text = '_' }, - topdelete = { text = '‾' }, - changedelete = { text = '~' }, - }, - on_attach = function(bufnr) - vim.keymap.set('n', 'hp', require('gitsigns').preview_hunk, { buffer = bufnr, desc = 'Preview git hunk' }) - - -- don't override the built-in and fugitive keymaps - local gs = package.loaded.gitsigns - vim.keymap.set({ 'n', 'v' }, ']c', function() - if vim.wo.diff then return ']c' end - vim.schedule(function() gs.next_hunk() end) - return '' - end, { expr = true, buffer = bufnr, desc = "Jump to next hunk" }) - vim.keymap.set({ 'n', 'v' }, '[c', function() - if vim.wo.diff then return '[c' end - vim.schedule(function() gs.prev_hunk() end) - return '' - end, { expr = true, buffer = bufnr, desc = "Jump to previous hunk" }) - end, - }, - }, - - { - -- Theme inspired by Atom - 'navarasu/onedark.nvim', - priority = 1000, - config = function() - vim.cmd.colorscheme 'onedark' - end, - }, - - { - -- Set lualine as statusline - 'nvim-lualine/lualine.nvim', - -- See `:help lualine.txt` - opts = { - options = { - icons_enabled = false, - theme = 'onedark', - component_separators = '|', - section_separators = '', - }, - }, - }, - - { - -- Add indentation guides even on blank lines - 'lukas-reineke/indent-blankline.nvim', - -- Enable `lukas-reineke/indent-blankline.nvim` - -- See `:help indent_blankline.txt` - main = "ibl", - opts = {}, - }, - - -- "gc" to comment visual regions/lines - { 'numToStr/Comment.nvim', opts = {} }, - - -- Fuzzy Finder (files, lsp, etc) - { - 'nvim-telescope/telescope.nvim', - branch = '0.1.x', - dependencies = { - 'nvim-lua/plenary.nvim', - -- Fuzzy Finder Algorithm which requires local dependencies to be built. - -- Only load if `make` is available. Make sure you have the system - -- requirements installed. - { - 'nvim-telescope/telescope-fzf-native.nvim', - -- NOTE: If you are having trouble with this installation, - -- refer to the README for telescope-fzf-native for more instructions. - build = 'make', - cond = function() - return vim.fn.executable 'make' == 1 - end, - }, - }, - }, - - { - -- Highlight, edit, and navigate code - 'nvim-treesitter/nvim-treesitter', - dependencies = { - 'nvim-treesitter/nvim-treesitter-textobjects', - }, - build = ':TSUpdate', - }, - - -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart - -- These are some example plugins that I've included in the kickstart repository. - -- Uncomment any of the lines below to enable them. - -- require 'kickstart.plugins.autoformat', - -- require 'kickstart.plugins.debug', - - -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` - -- You can use this folder to prevent any conflicts with this init.lua if you're interested in keeping - -- up-to-date with whatever is in the kickstart repo. - -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- - -- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins - { import = 'custom.plugins' }, -}, {}) - --- [[ Setting options ]] --- See `:help vim.o` --- NOTE: You can change these options as you wish! - --- Set highlight on search -vim.o.hlsearch = false - --- Make line numbers default -vim.wo.number = true - --- Enable mouse mode -vim.o.mouse = '' - --- Sync clipboard between OS and Neovim. --- Remove this option if you want your OS clipboard to remain independent. --- See `:help 'clipboard'` -vim.o.clipboard = 'unnamedplus' - --- Enable break indent -vim.o.breakindent = true - --- Save undo history -vim.o.undofile = true - --- Case-insensitive searching UNLESS \C or capital in search -vim.o.ignorecase = true -vim.o.smartcase = true - --- Keep signcolumn on by default -vim.wo.signcolumn = 'yes' - --- Decrease update time -vim.o.updatetime = 250 -vim.o.timeoutlen = 300 - --- Set completeopt to have a better completion experience -vim.o.completeopt = 'menuone,noselect' - --- NOTE: You should make sure your terminal supports this -vim.o.termguicolors = true - --- [[ Basic Keymaps ]] - --- Keymaps for better default experience --- See `:help vim.keymap.set()` -vim.keymap.set({ 'n', 'v' }, '', '', { silent = true }) - --- Remap for dealing with word wrap -vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true }) -vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true }) - --- [[ Highlight on yank ]] --- See `:help vim.highlight.on_yank()` -local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true }) -vim.api.nvim_create_autocmd('TextYankPost', { - callback = function() - vim.highlight.on_yank() - end, - group = highlight_group, - pattern = '*', -}) - --- [[ Configure Telescope ]] --- See `:help telescope` and `:help telescope.setup()` -require('telescope').setup { - defaults = { - mappings = { - i = { - [''] = false, - [''] = false, - }, - }, - }, -} - --- Enable telescope fzf native, if installed -pcall(require('telescope').load_extension, 'fzf') -pcall(require('telescope').load_extension, 'git_worktree') - --- See `:help telescope.builtin` -vim.keymap.set('n', '?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' }) --- vim.keymap.set('n', '', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' }) --- vim.keymap.set('n', '/', function() --- -- You can pass additional configuration to telescope to change theme, layout, etc. --- require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { --- winblend = 10, --- previewer = false, --- }) --- end, { desc = '[/] Fuzzily search in current buffer' }) - -vim.keymap.set('n', '', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' }) -vim.keymap.set('n', 'sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' }) -vim.keymap.set('n', 'sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' }) -vim.keymap.set('n', 'sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' }) -vim.keymap.set('n', '/', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' }) -vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' }) -vim.keymap.set('n', 'sr', require('telescope.builtin').resume, { desc = '[S]earch [R]esume' }) - --- [[ Configure Treesitter ]] --- See `:help nvim-treesitter` --- Defer Treesitter setup after first render to improve startup time of 'nvim {filename}' -vim.defer_fn(function() - require('nvim-treesitter.configs').setup { - -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim' }, - - -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) - auto_install = false, - - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = '', - node_incremental = '', - scope_incremental = '', - node_decremental = '', - }, - }, - textobjects = { - select = { - enable = true, - lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim - keymaps = { - -- You can use the capture groups defined in textobjects.scm - ['aa'] = '@parameter.outer', - ['ia'] = '@parameter.inner', - ['af'] = '@function.outer', - ['if'] = '@function.inner', - ['ac'] = '@class.outer', - ['ic'] = '@class.inner', - }, - }, - move = { - enable = true, - set_jumps = true, -- whether to set jumps in the jumplist - goto_next_start = { - [']m'] = '@function.outer', - [']]'] = '@class.outer', - }, - goto_next_end = { - [']M'] = '@function.outer', - [']['] = '@class.outer', - }, - goto_previous_start = { - ['[m'] = '@function.outer', - ['[['] = '@class.outer', - }, - goto_previous_end = { - ['[M'] = '@function.outer', - ['[]'] = '@class.outer', - }, - }, - swap = { - enable = true, - swap_next = { - ['a'] = '@parameter.inner', - }, - swap_previous = { - ['A'] = '@parameter.inner', - }, - }, - }, - } -end, 0) - --- Diagnostic keymaps -vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' }) -vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' }) -vim.keymap.set('n', 'e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' }) -vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' }) - --- [[ Configure LSP ]] --- This function gets run when an LSP connects to a particular buffer. -local on_attach = function(_, bufnr) - -- 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 - -- many times. - -- - -- 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 nmap = function(keys, func, desc) - if desc then - desc = 'LSP: ' .. desc - end - - vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc }) - end - - nmap('rn', vim.lsp.buf.rename, '[R]e[n]ame') - nmap('ca', vim.lsp.buf.code_action, '[C]ode [A]ction') - - nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition') - nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') - nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') - nmap('D', vim.lsp.buf.type_definition, 'Type [D]efinition') - nmap('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') - nmap('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') - - -- See `:help K` for why this keymap - nmap('K', vim.lsp.buf.hover, 'Hover Documentation') - nmap('', vim.lsp.buf.signature_help, 'Signature Documentation') - - -- Lesser used LSP functionality - nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') - nmap('wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder') - nmap('wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder') - nmap('wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, '[W]orkspace [L]ist Folders') - - -- Create a command `:Format` local to the LSP buffer - vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_) - vim.lsp.buf.format() - end, { desc = 'Format current buffer with LSP' }) -end - --- document existing key chains -require('which-key').register({ - ['c'] = { name = '[C]ode', _ = 'which_key_ignore' }, - ['d'] = { name = '[D]ocument', _ = 'which_key_ignore' }, - ['g'] = { name = '[G]it', _ = 'which_key_ignore' }, - ['h'] = { name = 'More git', _ = 'which_key_ignore' }, - ['r'] = { name = '[R]ename', _ = 'which_key_ignore' }, - ['s'] = { name = '[S]earch', _ = 'which_key_ignore' }, - ['w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, -}) - --- 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. They will be passed to --- the `settings` field of the server config. You must look up that documentation yourself. --- --- If you want to override the default filetypes that your language server will attach to you can --- define the property 'filetypes' to the map in question. -local servers = { - -- clangd = {}, - -- gopls = {}, - -- pyright = {}, - -- rust_analyzer = {}, - -- tsserver = {}, - -- html = { filetypes = { 'html', 'twig', 'hbs'} }, - - lua_ls = { - Lua = { - workspace = { checkThirdParty = false }, - telemetry = { enable = false }, - }, - }, -} - --- Setup neovim lua configuration -require('neodev').setup() - --- nvim-cmp supports additional completion capabilities, so broadcast that to servers -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) - --- Ensure the servers above are installed -local mason_lspconfig = require 'mason-lspconfig' - -mason_lspconfig.setup { - ensure_installed = vim.tbl_keys(servers), -} - -mason_lspconfig.setup_handlers { - function(server_name) - require('lspconfig')[server_name].setup { - capabilities = capabilities, - on_attach = on_attach, - settings = servers[server_name], - filetypes = (servers[server_name] or {}).filetypes, - } - end -} - --- [[ Configure nvim-cmp ]] --- See `:help cmp` -local cmp = require 'cmp' -local luasnip = require 'luasnip' -require('luasnip.loaders.from_vscode').lazy_load() -luasnip.config.setup {} - -cmp.setup { - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - mapping = cmp.mapping.preset.insert { - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete {}, - [''] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }, - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_locally_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, { 'i', 's' }), - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.locally_jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { 'i', 's' }), - }, - sources = { - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - }, -} - --- The line beneath this is called `modeline`. See `:help modeline` --- vim: ts=2 sts=2 sw=2 et diff --git a/.config/nvim/lua/custom/plugins.lua b/.config/nvim/lua/custom/plugins.lua deleted file mode 100644 index 98ba2bac..00000000 --- a/.config/nvim/lua/custom/plugins.lua +++ /dev/null @@ -1,54 +0,0 @@ -return { - { - "ThePrimeagen/refactoring.nvim", - requires = { - { "nvim-lua/plenary.nvim" }, - { "nvim-treesitter/nvim-treesitter" }, - }, - config = function() - require("refactoring").setup({}) - end, - }, - { - "ThePrimeagen/git-worktree.nvim", - }, - { - "folke/tokyonight.nvim", - lazy = false, -- make sure we load this during startup if it is your main colorscheme - priority = 1000, -- make sure to load this before all the other start plugins - config = function() - -- load the colorscheme here - vim.cmd([[colorscheme tokyonight]]) - end, - }, - -- formatting & linting - "jose-elias-alvarez/null-ls.nvim", - -- use("jayp0521/mason-null-ls.nvim") - { - "kylechui/nvim-surround", - version = "*", -- Use for stability; omit to use `main` branch for the latest features - event = "VeryLazy", - config = function() - require("nvim-surround").setup({ - -- Configuration here, or leave empty to use defaults - }) - end, - }, - { - "folke/trouble.nvim", - requires = "nvim-tree/nvim-web-devicons", - config = function() - require("trouble").setup({ - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - }) - end, - }, - { - "rafamadriz/friendly-snippets", - config = function() - require("luasnip.loaders.from_vscode").lazy_load() - end, - }, -} diff --git a/.config/nvim/lua/kickstart/autoformat.lua b/.config/nvim/lua/kickstart/autoformat.lua deleted file mode 100644 index bc56b15b..00000000 --- a/.config/nvim/lua/kickstart/autoformat.lua +++ /dev/null @@ -1,74 +0,0 @@ --- autoformat.lua --- --- Use your language server to automatically format your code on save. --- Adds additional commands as well to manage the behavior - -return { - 'neovim/nvim-lspconfig', - config = function() - -- Switch for controlling whether you want autoformatting. - -- Use :KickstartFormatToggle to toggle autoformatting on or off - local format_is_enabled = true - vim.api.nvim_create_user_command('KickstartFormatToggle', function() - format_is_enabled = not format_is_enabled - print('Setting autoformatting to: ' .. tostring(format_is_enabled)) - end, {}) - - -- Create an augroup that is used for managing our formatting autocmds. - -- We need one augroup per client to make sure that multiple clients - -- can attach to the same buffer without interfering with each other. - local _augroups = {} - local get_augroup = function(client) - if not _augroups[client.id] then - local group_name = 'kickstart-lsp-format-' .. client.name - local id = vim.api.nvim_create_augroup(group_name, { clear = true }) - _augroups[client.id] = id - end - - return _augroups[client.id] - end - - -- Whenever an LSP attaches to a buffer, we will run this function. - -- - -- See `:help LspAttach` for more information about this autocmd event. - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-attach-format', { clear = true }), - -- This is where we attach the autoformatting for reasonable clients - callback = function(args) - local client_id = args.data.client_id - local client = vim.lsp.get_client_by_id(client_id) - local bufnr = args.buf - - -- Only attach to clients that support document formatting - if not client.server_capabilities.documentFormattingProvider then - return - end - - -- Tsserver usually works poorly. Sorry you work with bad languages - -- You can remove this line if you know what you're doing :) - if client.name == 'tsserver' then - return - end - - -- Create an autocmd that will run *before* we save the buffer. - -- Run the formatting command for the LSP that has just attached. - vim.api.nvim_create_autocmd('BufWritePre', { - group = get_augroup(client), - buffer = bufnr, - callback = function() - if not format_is_enabled then - return - end - - vim.lsp.buf.format { - async = false, - filter = function(c) - return c.id == client.id - end, - } - end, - }) - end, - }) - end, -} diff --git a/.config/nvim/lua/kickstart/debug.lua b/.config/nvim/lua/kickstart/debug.lua deleted file mode 100644 index 000bcb8f..00000000 --- a/.config/nvim/lua/kickstart/debug.lua +++ /dev/null @@ -1,83 +0,0 @@ --- debug.lua --- --- Shows how to use the DAP plugin to debug your code. --- --- Primarily focused on configuring the debugger for Go, but can --- be extended to other languages as well. That's why it's called --- kickstart.nvim and not kitchen-sink.nvim ;) - -return { - -- NOTE: Yes, you can install new plugins here! - 'mfussenegger/nvim-dap', - -- NOTE: And you can specify dependencies as well - dependencies = { - -- Creates a beautiful debugger UI - 'rcarriga/nvim-dap-ui', - - -- Installs the debug adapters for you - 'williamboman/mason.nvim', - 'jay-babu/mason-nvim-dap.nvim', - - -- Add your own debuggers here - 'leoluz/nvim-dap-go', - }, - config = function() - local dap = require 'dap' - local dapui = require 'dapui' - - require('mason-nvim-dap').setup { - -- Makes a best effort to setup the various debuggers with - -- reasonable debug configurations - automatic_setup = true, - - -- You can provide additional configuration to the handlers, - -- see mason-nvim-dap README for more information - handlers = {}, - - -- You'll need to check that you have the required things installed - -- online, please don't ask me how to install them :) - ensure_installed = { - -- Update this to ensure that you have the debuggers for the langs you want - 'delve', - }, - } - - -- Basic debugging keymaps, feel free to change to your liking! - vim.keymap.set('n', '', dap.continue) - vim.keymap.set('n', '', dap.step_into) - vim.keymap.set('n', '', dap.step_over) - vim.keymap.set('n', '', dap.step_out) - vim.keymap.set('n', 'b', dap.toggle_breakpoint) - vim.keymap.set('n', 'B', function() - dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ') - end) - - -- Dap UI setup - -- For more information, see |:help nvim-dap-ui| - dapui.setup { - -- Set icons to characters that are more likely to work in every terminal. - -- Feel free to remove or use ones that you like more! :) - -- Don't feel like these are good choices. - icons = { expanded = '▾', collapsed = '▸', current_frame = '*' }, - controls = { - icons = { - pause = '⏸', - play = '▶', - step_into = '⏎', - step_over = '⏭', - step_out = '⏮', - step_back = 'b', - run_last = '▶▶', - terminate = '⏹', - }, - }, - } - - dap.listeners.after.event_initialized['dapui_config'] = dapui.open - dap.listeners.before.event_terminated['dapui_config'] = dapui.close - dap.listeners.before.event_exited['dapui_config'] = dapui.close - - -- Install golang specific config - require('dap-go').setup() - end, -} diff --git a/.config/nvim/lua/rahcodes/keymap.lua b/.config/nvim/lua/rahcodes/keymap.lua deleted file mode 100644 index 463c1881..00000000 --- a/.config/nvim/lua/rahcodes/keymap.lua +++ /dev/null @@ -1,20 +0,0 @@ -local M = {} - -local function bind(op, outer_opts) - outer_opts = outer_opts or {noremap = true} - return function(lhs, rhs, opts) - opts = vim.tbl_extend("force", - outer_opts, - opts or {} - ) - vim.keymap.set(op, lhs,rhs, opts) - end -end - -M.nmap = bind("n", {noremap = false}) -M.nnoremap = bind("n") -M.vnoremap = bind("v") -M.xnoremap = bind("x") -M.inoremap = bind("i") - -return M diff --git a/.config/nvim/lua/rahcodes/null-ls/rubocop.lua b/.config/nvim/lua/rahcodes/null-ls/rubocop.lua deleted file mode 100644 index 6a316d5e..00000000 --- a/.config/nvim/lua/rahcodes/null-ls/rubocop.lua +++ /dev/null @@ -1,27 +0,0 @@ -local h = require("null-ls.helpers") -local methods = require("null-ls.methods") - -local FORMATTING = methods.internal.FORMATTING - -return h.make_builtin({ - name = "rubocop", - meta = { - url = "https://github.com/rubocop/rubocop", - description = "Ruby static code analyzer and formatter, based on the community Ruby style guide.", - }, - method = FORMATTING, - filetypes = { "ruby" }, - generator_opts = { - command = "rubocop", - args = { - "--auto-correct", - "-f", - "quiet", - "--stdin", - "$FILENAME", - }, - to_stdin = true, - -- from_stderr = true, - }, - factory = h.formatter_factory, -}) diff --git a/.config/nvim/lua/rahcodes/remap.lua b/.config/nvim/lua/rahcodes/remap.lua deleted file mode 100644 index 59a904e6..00000000 --- a/.config/nvim/lua/rahcodes/remap.lua +++ /dev/null @@ -1,70 +0,0 @@ -local Remap = require("rahcodes.keymap") -local nmap = Remap.nmap - -vim.keymap.set("n", "pv", vim.cmd.Ex) - -vim.keymap.set("v", "J", ":m '>+1gv=gv") -vim.keymap.set("v", "K", ":m '<-2gv=gv") - -vim.keymap.set("n", "", "zz") -vim.keymap.set("n", "", "zz") - -vim.keymap.set("n", "n", "nzzzv") -vim.keymap.set("n", "N", "Nzzzv") - --- don't bork paste buffer when pasting -vim.keymap.set("x", "p", '"_dP') - -vim.keymap.set("i", "", "") - --- vim.keymap.set("n", "/", "/\v") --- vim.keymap.set("v", "/", "/\v") -vim.keymap.set("n", "`", ":noh") - --- No Cheating -vim.keymap.set("n", "", "") -vim.keymap.set("n", "", "") -vim.keymap.set("n", "", "") -vim.keymap.set("n", "", "") -vim.keymap.set("i", "", "") -vim.keymap.set("i", "", "") -vim.keymap.set("i", "", "") -vim.keymap.set("i", "", "") - --- No weird line jumps -vim.keymap.set("n", "j", "gj") -vim.keymap.set("n", "k", "gk") - --- Copy to system clipboard -vim.keymap.set("n", "y", '"*y') -vim.keymap.set("v", "y", '"*y') -vim.keymap.set("n", "yy", '"+y') -vim.keymap.set("v", "yy", '"+y') - -vim.keymap.set("n", "", "silent !tmux neww tmux-sessionizer") - --- Move buffers -nmap("sp", ":bprev") -nmap("sn", ":bnext") - --- Quickfix list navigation -vim.keymap.set("n", "", "cnextzz") -vim.keymap.set("n", "", "cprevzz") -vim.keymap.set("n", "k", "lnextzz") -vim.keymap.set("n", "j", "lprevzz") - --- Save -nmap("", ":wa") - --- See `:help telescope.builtin` -vim.keymap.set("n", "m", require("telescope.builtin").oldfiles, { desc = "[?] Find recently opened files" }) -vim.keymap.set("n", "gb", require("telescope.builtin").git_branches, { desc = "[G]it [B]ranches" }) -vim.keymap.set("n", "sb", require("telescope.builtin").buffers, { desc = "[ ] Find existing buffers" }) - --- Trouble bindings -vim.keymap.set("n", "xx", function() require("trouble").open() end) -vim.keymap.set("n", "xw", function() require("trouble").open("workspace_diagnostics") end) -vim.keymap.set("n", "xd", function() require("trouble").open("document_diagnostics") end) -vim.keymap.set("n", "xq", function() require("trouble").open("quickfix") end) -vim.keymap.set("n", "xl", function() require("trouble").open("loclist") end) -vim.keymap.set("n", "gR", function() require("trouble").open("lsp_references") end) diff --git a/.config/nvim/lua/rahcodes/sets.lua b/.config/nvim/lua/rahcodes/sets.lua deleted file mode 100644 index 2cf4c156..00000000 --- a/.config/nvim/lua/rahcodes/sets.lua +++ /dev/null @@ -1,26 +0,0 @@ -vim.opt.guicursor = "" - -vim.opt.nu = true -vim.opt.relativenumber = true - -vim.opt.tabstop = 4 -vim.opt.softtabstop = 4 -vim.opt.shiftwidth = 4 -vim.opt.expandtab = true - -vim.opt.smartindent = true - -vim.opt.wrap = false - -vim.opt.swapfile = false -vim.opt.backup = false -vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir" - -vim.opt.incsearch = true - -vim.opt.scrolloff = 8 -vim.opt.isfname:append("@-@") - -vim.opt.colorcolumn = "80" - -vim.opt.mouse = "v"