🔧 Major overhaul of nvim config
This commit is contained in:
z3rOR0ne
parent
351ce052a7
commit
5e7afd99ec
38 changed files with 1091 additions and 87 deletions
2
.config/nvim_pack_old/lua/neovim/init.lua
Normal file
2
.config/nvim_pack_old/lua/neovim/init.lua
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
require("neovim.remap")
|
||||
require("neovim.set")
|
||||
128
.config/nvim_pack_old/lua/neovim/packer.lua
Normal file
128
.config/nvim_pack_old/lua/neovim/packer.lua
Normal file
|
|
@ -0,0 +1,128 @@
|
|||
-- This file can be loaded by calling `lua require('plugins')` from your init.vim
|
||||
|
||||
-- Only required if you have packer configured as `opt`
|
||||
vim.cmd([[packadd packer.nvim]])
|
||||
|
||||
return require("packer").startup(function(use)
|
||||
-- Packer can manage itself
|
||||
use("wbthomason/packer.nvim")
|
||||
use({ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" })
|
||||
use({ "nvim-treesitter/playground" })
|
||||
use({
|
||||
"shaunsingh/nord.nvim",
|
||||
config = function()
|
||||
vim.cmd("colorscheme nord")
|
||||
end,
|
||||
})
|
||||
use({ "preservim/nerdcommenter" })
|
||||
use({ "nvim-lualine/lualine.nvim", requires = { "kyazdani42/nvim-web-devicons", opt = true } })
|
||||
use({ "kyazdani42/nvim-web-devicons" })
|
||||
use({ "kyazdani42/nvim-tree.lua" })
|
||||
use({ "psliwka/vim-smoothie" })
|
||||
use({ "mg979/vim-visual-multi" })
|
||||
-- use({ "Yggdroot/indentLine" })
|
||||
use({ "lukas-reineke/indent-blankline.nvim" })
|
||||
use({ "lewis6991/impatient.nvim" })
|
||||
use({ "airblade/vim-gitgutter" })
|
||||
use({ "f-person/git-blame.nvim" })
|
||||
use({ "kkoomen/vim-doge", run = ":call doge#install()" })
|
||||
-- use({ "norcalli/nvim-colorizer.lua" })
|
||||
use({ "windwp/nvim-autopairs" })
|
||||
use({ "simeji/winresizer" })
|
||||
-- use({ "sbdchd/neoformat" })
|
||||
use({ "stevearc/conform.nvim" })
|
||||
use({ "rhysd/vim-clang-format" })
|
||||
use({ "sangdol/mintabline.vim" })
|
||||
use({ "ThePrimeagen/harpoon" })
|
||||
use({
|
||||
"nvim-telescope/telescope.nvim",
|
||||
tag = "0.1.0",
|
||||
-- or , branch = '0.1.x',
|
||||
requires = { { "nvim-lua/plenary.nvim" } },
|
||||
})
|
||||
use({ "tpope/vim-fugitive" })
|
||||
use({ "tpope/vim-surround" })
|
||||
use({ "lambdalisue/suda.vim" })
|
||||
use({
|
||||
"iamcco/markdown-preview.nvim",
|
||||
run = function()
|
||||
vim.fn["mkdp#util#install"]()
|
||||
end,
|
||||
})
|
||||
-- use({ "iamcco/markdown-preview.nvim", run = "cd app && npm install", setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, })
|
||||
use({ "junegunn/fzf.vim" })
|
||||
use({ "junegunn/gv.vim" })
|
||||
use({ "kien/ctrlp.vim" })
|
||||
use({ "rinx/nvim-ripgrep" })
|
||||
use({ "mbbill/undotree" })
|
||||
use({
|
||||
"VonHeikemen/lsp-zero.nvim",
|
||||
requires = {
|
||||
-- LSP Support
|
||||
{ "neovim/nvim-lspconfig" },
|
||||
{ "williamboman/mason.nvim" },
|
||||
{ "williamboman/mason-lspconfig.nvim" },
|
||||
|
||||
-- Autocompletion
|
||||
{ "hrsh7th/nvim-cmp" },
|
||||
{ "hrsh7th/cmp-buffer" },
|
||||
{ "hrsh7th/cmp-path" },
|
||||
{ "saadparwaiz1/cmp_luasnip" },
|
||||
{ "hrsh7th/cmp-nvim-lsp" },
|
||||
{ "hrsh7th/cmp-nvim-lua" },
|
||||
|
||||
-- Snippets
|
||||
{ "L3MON4D3/LuaSnip" },
|
||||
{ "rafamadriz/friendly-snippets" },
|
||||
},
|
||||
})
|
||||
use("jose-elias-alvarez/null-ls.nvim")
|
||||
use({ "rcarriga/nvim-dap-ui", requires = { "mfussenegger/nvim-dap" } })
|
||||
use({
|
||||
"mfussenegger/nvim-dap",
|
||||
opt = true,
|
||||
module = { "dap" },
|
||||
requires = {
|
||||
"theHamsta/nvim-dap-virtual-text",
|
||||
"mfussenegger/nvim-dap-python",
|
||||
"nvim-telescope/telescope-dap.nvim",
|
||||
{ "leoluz/nvim-dap-go", module = "dap-go" },
|
||||
{ "jbyuki/one-small-step-for-vimkind", module = "osv" },
|
||||
{ "mxsdev/nvim-dap-vscode-js" },
|
||||
{
|
||||
"microsoft/vscode-js-debug",
|
||||
opt = true,
|
||||
-- NOTE: didn't compile on install for some reason,
|
||||
-- navigate to ~/.local/share/nvim/site/pack/packer/opt/vscode-js-debug
|
||||
-- and npm run compile by hand...
|
||||
run = "npm install --legacy-peer-deps && npm run compile",
|
||||
},
|
||||
},
|
||||
})
|
||||
-- codeium AI
|
||||
use("Exafunction/codeium.vim")
|
||||
-- golang
|
||||
use("ray-x/go.nvim")
|
||||
use("ray-x/guihua.lua")
|
||||
-- rustlang
|
||||
use("rust-lang/rust.vim")
|
||||
-- use("mrcjkb/rustaceanvim")
|
||||
use("saecki/crates.nvim")
|
||||
-- code snippet screenshots
|
||||
-- capture code snippets using :Silicon,
|
||||
-- in Visual mode highlight then enter command
|
||||
use({
|
||||
"michaelrommel/nvim-silicon",
|
||||
config = function()
|
||||
require("silicon").setup({
|
||||
command = "silicon",
|
||||
font = "mononoki NF=34",
|
||||
theme = "Nord",
|
||||
no_round_corner = true,
|
||||
no_line_number = true,
|
||||
no_window_controls = true,
|
||||
background = "#20201e",
|
||||
})
|
||||
end,
|
||||
})
|
||||
end)
|
||||
176
.config/nvim_pack_old/lua/neovim/remap.lua
Normal file
176
.config/nvim_pack_old/lua/neovim/remap.lua
Normal file
|
|
@ -0,0 +1,176 @@
|
|||
vim.g.mapleader = " "
|
||||
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
|
||||
|
||||
vim.keymap.set("n", "J", "mzJ`z")
|
||||
|
||||
-- remap for vim-smoothie
|
||||
vim.cmd([[nnoremap <C-D> <cmd>call smoothie#do("\<C-D>zz")<CR>]])
|
||||
vim.cmd([[nnoremap <C-U> <cmd>call smoothie#do("\<C-U>zz")<CR>]])
|
||||
vim.cmd([[nnoremap gg <cmd>call smoothie#do("gg")<CR>]])
|
||||
vim.cmd([[nnoremap <S-g> <cmd>call smoothie#do("\<S-g>zz")<CR>]])
|
||||
|
||||
-- recenter on next/previous search
|
||||
vim.keymap.set("n", "n", "nzzzv")
|
||||
vim.keymap.set("n", "N", "Nzzzv")
|
||||
|
||||
--Toggle NERDCommenter with Ctrl + c
|
||||
vim.keymap.set("n", "<C-c>", "<Plug>NERDCommenterToggle")
|
||||
|
||||
vim.keymap.set("n", "Q", "<nop>")
|
||||
-- reformats
|
||||
--vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
|
||||
|
||||
-- global search and replace
|
||||
vim.keymap.set("n", "<S-s>", ":%s///gI<Left><Left><Left><Left>")
|
||||
-- single line search and replace
|
||||
vim.keymap.set("n", "<S-y>", ":.,.s///g<Left><Left><Left>")
|
||||
|
||||
-- toggle english spellcheck
|
||||
vim.keymap.set("n", "<F11>", ":set spell!<cr>", { silent = true })
|
||||
|
||||
-- make current file executable
|
||||
vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })
|
||||
-- Vimium Like Keybindings
|
||||
vim.keymap.set("n", "<S-t>", "<c-w>:tabnew<CR>", {})
|
||||
|
||||
-- tab keybindings
|
||||
vim.keymap.set("n", "<A-left>", "<c-w>:tabprevious<CR>", {})
|
||||
vim.keymap.set("n", "<A-right>", "<c-w>:tabnext<CR>", {})
|
||||
-- Use ctrl- [hl] to select the active split!
|
||||
vim.keymap.set("n", "<C-h>", "<c-w>:wincmd h<CR>", {})
|
||||
vim.keymap.set("n", "<C-l>", "<c-w>:wincmd l<CR>", {})
|
||||
|
||||
-- remap Nvim_Tree toggle to leader+'
|
||||
vim.keymap.set("n", "<leader>'", "<c-w>:NvimTreeToggle<CR>", {})
|
||||
|
||||
-- Use ctrl - [hl] to select the active split
|
||||
vim.keymap.set("n", "<C-h>", "<c-w>:wincmd h<CR>", {})
|
||||
vim.keymap.set("n", "<C-l>", "<c-w>:wincmd l<CR>", {})
|
||||
|
||||
-- nv creates new vertical split
|
||||
vim.keymap.set("n", "nv", ":vnew", { silent = true })
|
||||
|
||||
-- shift + p invokes PackerSync
|
||||
vim.keymap.set("n", "<S-p>", "<c-w>:PackerSync<CR>", {})
|
||||
|
||||
-- control + t enable transparency
|
||||
vim.keymap.set("n", "<leader>t", "<c-w>:lua ColorMyPencils()<CR>", {})
|
||||
|
||||
-- open :Mason using msn
|
||||
vim.keymap.set("n", "msn", ":Mason", { silent = true })
|
||||
|
||||
-- toggle relative line number with shift + x
|
||||
vim.keymap.set("n", "<S-x>", ":set relativenumber! number<cr>", {})
|
||||
|
||||
-- toggle multi-corsor with control + j/k
|
||||
vim.cmd([[nmap <C-j> <C-Down>]])
|
||||
vim.cmd([[nmap <C-k> <C-Up>]])
|
||||
|
||||
-- enable gitblame with ctrl + g
|
||||
vim.keymap.set("n", "<C-g>", "<c-w>:GitBlameToggle<CR>", { silent = true })
|
||||
|
||||
-- shift + m brings up markdown previewer
|
||||
vim.keymap.set("n", "<S-m>", "<c-w>:MarkdownPreview<CR>", {})
|
||||
|
||||
-- invoke neoformat with nf
|
||||
vim.keymap.set("n", "nf", ":Neoformat<cr>", { silent = true })
|
||||
|
||||
-- format C and C++ Code with cp
|
||||
vim.keymap.set("n", "cp", ":ClangFormat<cr>", { silent = true })
|
||||
|
||||
-- open fzf with ctrl + p
|
||||
vim.cmd([[nnoremap fzf :silent :FZFExplore]])
|
||||
vim.keymap.set("n", "<leader>f", ":FZFExplore<CR>")
|
||||
-- vim.keymap.set("n", "<C-p>", "<c-w>:FZFExplore<CR>", {})
|
||||
|
||||
-- CtrlP: similar to fzf, but with a more simple interface
|
||||
vim.keymap.set("n", "<C-p>", "<c-w>:CtrlPMixed<cr>")
|
||||
|
||||
-- open ripgrep
|
||||
vim.cmd([[nnoremap rg :silent :Rg]])
|
||||
vim.keymap.set("n", "<leader>r", ":silent :Rg")
|
||||
|
||||
-- restart lsp
|
||||
vim.cmd([[nnoremap lsp :silent :LspRestart]])
|
||||
|
||||
--toggle autocompletion
|
||||
vim.cmd([[nnoremap cmp :silent lua SetAutoCmp(Mode)]])
|
||||
|
||||
-- SudaWrite
|
||||
-- vim.cmd([[nnoremap sw :SudaWrite]])
|
||||
vim.keymap.set("n", "<leader>sw", ":SudaWrite")
|
||||
|
||||
-- appends backslash to end of specified number of lines (min 2)
|
||||
-- usage: 4<leader>b will append a backslash to the end of 4 lines
|
||||
-- note: useful for grabbing code snippets for chatting with codellama in terminal
|
||||
vim.cmd([[nnoremap <leader>b :.,+<C-R>=v:count1<CR>norm A\<Esc>]])
|
||||
|
||||
--toggle undotree
|
||||
vim.keymap.set("n", "<leader>u", ":UndotreeToggle<cr>")
|
||||
|
||||
-- runs npm tests without having to leave vim
|
||||
-- vim.keymap.set("n", "<leader>t", ":w|!npm test<cr>")
|
||||
|
||||
-- opens go to definition in new tab if not in current file
|
||||
vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts)
|
||||
|
||||
-- toggles floating error messages
|
||||
vim.keymap.set("n", "<space>e", "<cmd>vim.diagnostic.open_float()<CR>", opts)
|
||||
|
||||
vim.keymap.set("n", "gD", function()
|
||||
local org_path = vim.api.nvim_buf_get_name(0)
|
||||
|
||||
-- Go to definition:
|
||||
vim.api.nvim_command("normal gd")
|
||||
|
||||
-- Wait LSP server response
|
||||
vim.wait(100, function() end)
|
||||
|
||||
local new_path = vim.api.nvim_buf_get_name(0)
|
||||
if not (org_path == new_path) then
|
||||
-- Create a new tab for the original file
|
||||
vim.api.nvim_command("0tabnew %")
|
||||
|
||||
-- Restore the cursor position
|
||||
vim.api.nvim_command("b " .. org_path)
|
||||
vim.api.nvim_command('normal! `"')
|
||||
|
||||
-- Switch to the original tab
|
||||
vim.api.nvim_command("normal! gt")
|
||||
end
|
||||
end, bufopts)
|
||||
|
||||
-- dap Keybindings
|
||||
vim.keymap.set("n", "<leader>dbp", ":lua require'dap'.toggle_breakpoint()")
|
||||
vim.keymap.set("n", "<leader>dco", ":lua require'dap'.continue()")
|
||||
vim.keymap.set("n", "<leader>dov", ":lua require'dap'.step_over()")
|
||||
vim.keymap.set("n", "<leader>dso", ":lua require'dap'.step_out()")
|
||||
vim.keymap.set("n", "<leader>dsi", ":lua require'dap'.step_into()")
|
||||
vim.keymap.set("n", "<leader>dcl", ":lua require'dap'.close()")
|
||||
vim.keymap.set("n", "<leader>dui", ":lua require('dapui').toggle()")
|
||||
--
|
||||
-- codeium remappings
|
||||
vim.keymap.set("i", "<A-tab>", function()
|
||||
return vim.fn["codeium#Accept"]()
|
||||
end, { expr = true })
|
||||
vim.keymap.set("i", "<C-right>", function()
|
||||
return vim.fn["codeium#CycleCompletions"](1)
|
||||
end, { expr = true })
|
||||
vim.keymap.set("i", "<C-left>", function()
|
||||
return vim.fn["codeium#CycleCompletions"](-2)
|
||||
end, { expr = true })
|
||||
vim.keymap.set("i", "<C-x>", function()
|
||||
return vim.fn["codeium#Clear"]()
|
||||
end, { expr = true })
|
||||
|
||||
--toggle codeium on/off
|
||||
function Toggle_codeium()
|
||||
vim.g.codeium_enabled = not vim.g.codeium_enabled
|
||||
end
|
||||
vim.keymap.set("n", "<leader>c", ":lua Toggle_codeium()<cr>", { noremap = true, silent = true })
|
||||
|
||||
-- move single line or highlighted lines of text up cursor (alt + j/k)
|
||||
vim.keymap.set("n", "<A-k>", "<c-w>:m .-2<CR>==")
|
||||
vim.keymap.set("n", "<A-j>", "<c-w>:m .+1<CR>==")
|
||||
vim.keymap.set("v", "<A-j>", ":m '>+1<CR>gv=gv")
|
||||
vim.keymap.set("v", "<A-k>", ":m '<-2<CR>gv=gv")
|
||||
150
.config/nvim_pack_old/lua/neovim/set.lua
Normal file
150
.config/nvim_pack_old/lua/neovim/set.lua
Normal file
|
|
@ -0,0 +1,150 @@
|
|||
-- fat cursor no matter what
|
||||
vim.opt.guicursor = ""
|
||||
--
|
||||
vim.opt.nu = true
|
||||
vim.opt.relativenumber = true
|
||||
vim.opt.softtabstop = 0
|
||||
vim.opt.shiftwidth = 4
|
||||
-- vim.opt.shiftwidth = 2
|
||||
|
||||
vim.opt.expandtab = true
|
||||
|
||||
vim.opt.smartindent = true
|
||||
|
||||
vim.opt.swapfile = false
|
||||
vim.opt.backup = false
|
||||
vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
|
||||
vim.opt.undofile = true
|
||||
|
||||
vim.opt.hlsearch = false
|
||||
vim.opt.incsearch = true
|
||||
|
||||
vim.opt.termguicolors = true
|
||||
|
||||
vim.opt.scrolloff = 18
|
||||
vim.opt.signcolumn = "yes"
|
||||
-- vim.opt.isfname:append("@-@")
|
||||
|
||||
vim.opt.updatetime = 50
|
||||
|
||||
vim.opt.mouse = "a"
|
||||
vim.opt.autoindent = true
|
||||
vim.opt.smarttab = true
|
||||
vim.opt.ignorecase = true
|
||||
vim.opt.cindent = true
|
||||
vim.opt.tabstop = 4
|
||||
vim.opt.cursorcolumn = true
|
||||
-- Disable folds
|
||||
-- vim.g.nofoldenable = true
|
||||
-- Fix Splitting
|
||||
vim.opt.splitbelow = true
|
||||
vim.opt.splitright = true
|
||||
|
||||
-- Removes trailing spaces
|
||||
vim.api.nvim_create_autocmd({ "BufWritePre" }, {
|
||||
pattern = { "*" },
|
||||
command = [[%s/\s\+$//e]],
|
||||
})
|
||||
|
||||
-- Marks end of line, space, and trailing space characters
|
||||
vim.opt.listchars:append({ eol = "↵", trail = "·", space = "·" })
|
||||
vim.opt.list = true
|
||||
|
||||
-- return quotation marks to json files
|
||||
vim.cmd([[autocmd Filetype json let g:indentLine_setConceal = 0]])
|
||||
|
||||
-- vertically center document when entering Insert mode (breaks shift+A)
|
||||
-- vim.cmd([[autocmd InsertEnter * norm zz]])
|
||||
|
||||
-- enable clipboard
|
||||
vim.cmd([[set clipboard+=unnamedplus]])
|
||||
|
||||
-- disable intro screen
|
||||
vim.cmd([[set shortmess+=I]])
|
||||
|
||||
-- enable folds
|
||||
vim.cmd([[set foldmethod=manual]])
|
||||
|
||||
-- enable hard/soft wrap
|
||||
-- vim.cmd([[set wrap linebreak textwidth=80]])
|
||||
-- vim.opt.textwidth = 80
|
||||
-- vim.opt.wrap = true
|
||||
-- vim.opt.linebreak = true
|
||||
vim.cmd([[au BufRead,BufNewFile *.md setlocal textwidth=80]])
|
||||
|
||||
-- max tab characters
|
||||
vim.cmd([[let g:mintabline_tab_max_chars=10]])
|
||||
|
||||
-- Search pattern across repository files using fzf
|
||||
vim.cmd([[
|
||||
function! FzfExplore(...)
|
||||
let inpath = substitute(a:1, "'", '', 'g')
|
||||
if inpath == "" || matchend(inpath, '/') == strlen(inpath)
|
||||
execute "cd" getcwd() . '/' . inpath
|
||||
let cwpath = getcwd() . '/'
|
||||
call fzf#run(fzf#wrap(fzf#vim#with_preview({'source': 'ls -1ap', 'dir': cwpath, 'sink': 'FZFExplore', 'options': ['--prompt', cwpath]})))
|
||||
else
|
||||
let file = getcwd() . '/' . inpath
|
||||
execute "e" file
|
||||
endif
|
||||
endfunction]])
|
||||
|
||||
vim.cmd([[command! -nargs=* FZFExplore call FzfExplore(shellescape(<q-args>))]])
|
||||
|
||||
-- CtrlP will ignore .git and node_modules directories
|
||||
vim.cmd([[set wildignore+=*/node_modules/*,*/.git/*]])
|
||||
vim.cmd([[let g:ctrlp_custom_ignore = '\v[\/]\.(git|node_modules)']])
|
||||
|
||||
-- fzf is on bottom of screen
|
||||
-- vim.cmd([[let g:fzf_layout = { 'down': '~30%' }]])
|
||||
|
||||
--lastplace ignores fzf
|
||||
--vim.cmd([[let g:lastplace_ignore_buftype = "quickfix, nofile, help, FZF"]])
|
||||
|
||||
-- jump to last place visited in file
|
||||
vim.api.nvim_create_autocmd("BufReadPost", {
|
||||
callback = function()
|
||||
local mark = vim.api.nvim_buf_get_mark(0, '"')
|
||||
local lcount = vim.api.nvim_buf_line_count(0)
|
||||
if mark[1] > 0 and mark[1] <= lcount then
|
||||
pcall(vim.api.nvim_win_set_cursor, 0, mark)
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
-- turns off LSP semantic tokens by default
|
||||
-- vim.api.nvim_create_autocmd("LspAttach", {
|
||||
-- callback = function(args)
|
||||
-- local client = vim.lsp.get_client_by_id(args.data.client_id)
|
||||
-- client.server_capabilities.semanticTokensProvider = nil
|
||||
-- end,
|
||||
-- })
|
||||
|
||||
-- set folds to be remembered on save
|
||||
vim.cmd([[
|
||||
augroup remember_folds
|
||||
autocmd!
|
||||
autocmd BufWinLeave *.* mkview
|
||||
autocmd BufWinEnter *.* silent! loadview
|
||||
augroup END
|
||||
]])
|
||||
|
||||
-- configure diagnostic lsp err msgs
|
||||
-- vim.diagnostic.config({
|
||||
-- underline = true,
|
||||
-- signs = true,
|
||||
-- virtual_text = true,
|
||||
-- float = {
|
||||
-- show_header = true,
|
||||
-- source = "always",
|
||||
-- border = "border",
|
||||
-- focusable = false,
|
||||
-- },
|
||||
-- update_in_insert = false, -- default to false
|
||||
-- severity_sort = false, -- default to false
|
||||
-- })
|
||||
|
||||
-- codeium disable default keybindings
|
||||
vim.g.codeium_disable_bindings = 1
|
||||
-- codeium disable by default
|
||||
vim.g.codeium_enabled = 0
|
||||
Loading…
Add table
Add a link
Reference in a new issue