From e777ea62f96b43e63f6ed5d6fedb4177497c3734 Mon Sep 17 00:00:00 2001 From: kj_sh604 Date: Tue, 2 Jun 2026 07:52:44 -0400 Subject: refactor: put nvim config into one file --- .config/nvim/lua/coc.lua | 191 ---------------------------------------------- .config/nvim/lua/keys.lua | 54 ------------- .config/nvim/lua/look.lua | 69 ----------------- .config/nvim/lua/opts.lua | 47 ------------ .config/nvim/lua/plug.lua | 20 ----- .config/nvim/lua/tele.lua | 29 ------- .config/nvim/lua/tree.lua | 32 -------- .config/nvim/lua/zen.lua | 16 ---- 8 files changed, 458 deletions(-) delete mode 100644 .config/nvim/lua/coc.lua delete mode 100644 .config/nvim/lua/keys.lua delete mode 100644 .config/nvim/lua/look.lua delete mode 100644 .config/nvim/lua/opts.lua delete mode 100644 .config/nvim/lua/plug.lua delete mode 100644 .config/nvim/lua/tele.lua delete mode 100644 .config/nvim/lua/tree.lua delete mode 100644 .config/nvim/lua/zen.lua (limited to '.config/nvim/lua') diff --git a/.config/nvim/lua/coc.lua b/.config/nvim/lua/coc.lua deleted file mode 100644 index 8cc2956..0000000 --- a/.config/nvim/lua/coc.lua +++ /dev/null @@ -1,191 +0,0 @@ --- old coc.nvim config (minimal) --- vim.cmd [[ --- function! CheckBackspace() abort --- let col = col('.') - 1 --- return !col || getline('.')[col - 1] =~# '\s' --- endfunction --- --- inoremap --- \ coc#pum#visible() ? coc#pum#next(1) : --- \ CheckBackspace() ? "\" : --- \ coc#refresh() --- inoremap coc#pum#visible() ? coc#pum#prev(1) : "\" --- ]] - --- some servers have issues with backup files, see #649 -vim.opt.backup = false -vim.opt.writebackup = false - --- having longer updatetime (default is 4000 ms = 4s) leads to noticeable --- delays and poor user experience -vim.opt.updatetime = 300 - --- always show the signcolumn, otherwise it would shift the text each time --- diagnostics appeared/became resolved -vim.opt.signcolumn = "yes" - -local keyset = vim.keymap.set --- autocomplete -function _G.check_back_space() - local col = vim.fn.col('.') - 1 - return col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') ~= nil -end - --- use tab for trigger completion with characters ahead and navigate --- note: there's always a completion item selected by default, you may want to enable --- no select by setting `"suggest.noselect": true` in your configuration file --- note: use command ':verbose imap ' to make sure tab is not mapped by --- other plugins before putting this into your config -local opts = {silent = true, noremap = true, expr = true, replace_keycodes = false} -keyset("i", "", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "" : coc#refresh()', opts) -keyset("i", "", [[coc#pum#visible() ? coc#pum#prev(1) : "\"]], opts) - --- make to accept selected completion item or notify coc.nvim to format --- u breaks current undo, please make your own choice -keyset("i", "", [[coc#pum#visible() ? coc#pum#confirm() : "\u\\=coc#on_enter()\"]], opts) - --- use to trigger snippets -keyset("i", "", "(coc-snippets-expand-jump)") --- use to trigger completion -keyset("i", "", "coc#refresh()", {silent = true, expr = true}) - --- use `[g` and `]g` to navigate diagnostics --- use `:cocdiagnostics` to get all diagnostics of current buffer in location list -keyset("n", "[g", "(coc-diagnostic-prev)", {silent = true}) -keyset("n", "]g", "(coc-diagnostic-next)", {silent = true}) - --- goto code navigation -keyset("n", "gd", "(coc-definition)", {silent = true}) -keyset("n", "gy", "(coc-type-definition)", {silent = true}) -keyset("n", "gi", "(coc-implementation)", {silent = true}) -keyset("n", "gr", "(coc-references)", {silent = true}) - --- use k to show documentation in preview window -function _G.show_docs() - local cw = vim.fn.expand('') - if vim.fn.index({'vim', 'help'}, vim.bo.filetype) >= 0 then - vim.api.nvim_command('h ' .. cw) - elseif vim.api.nvim_eval('coc#rpc#ready()') then - vim.fn.CocActionAsync('doHover') - else - vim.api.nvim_command('!' .. vim.o.keywordprg .. ' ' .. cw) - end -end -keyset("n", "K", 'lua _G.show_docs()', {silent = true}) - --- highlight the symbol and its references on a cursorhold event(cursor is idle) -vim.api.nvim_create_augroup("CocGroup", {}) -vim.api.nvim_create_autocmd("CursorHold", { - group = "CocGroup", - command = "silent call CocActionAsync('highlight')", - desc = "Highlight symbol under cursor on CursorHold" -}) - --- symbol renaming -keyset("n", "rn", "(coc-rename)", {silent = true}) - --- formatting selected code -keyset("x", "F", "(coc-format-selected)", {silent = true}) -keyset("n", "F", "(coc-format-selected)", {silent = true}) - --- setup formatexpr specified filetype(s) -vim.api.nvim_create_autocmd("FileType", { - group = "CocGroup", - pattern = "typescript,json", - command = "setl formatexpr=CocAction('formatSelected')", - desc = "Setup formatexpr specified filetype(s)." -}) - --- update signature help on jump placeholder -vim.api.nvim_create_autocmd("User", { - group = "CocGroup", - pattern = "CocJumpPlaceholder", - command = "call CocActionAsync('showSignatureHelp')", - desc = "Update signature help on jump placeholder" -}) - --- apply codeaction to the selected region --- example: `aap` for current paragraph -local opts = {silent = true, nowait = true} -keyset("x", "a", "(coc-codeaction-selected)", opts) -keyset("n", "a", "(coc-codeaction-selected)", opts) - --- remap keys for apply code actions at the cursor position. -keyset("n", "ac", "(coc-codeaction-cursor)", opts) --- remap keys for apply source code actions for current file. -keyset("n", "as", "(coc-codeaction-source)", opts) --- apply the most preferred quickfix action on the current line. -keyset("n", "qf", "(coc-fix-current)", opts) - --- remap keys for apply refactor code actions. -keyset("n", "re", "(coc-codeaction-refactor)", { silent = true }) -keyset("x", "r", "(coc-codeaction-refactor-selected)", { silent = true }) -keyset("n", "r", "(coc-codeaction-refactor-selected)", { silent = true }) - --- run the code lens actions on the current line -keyset("n", "cl", "(coc-codelens-action)", opts) - - --- map function and class text objects --- note: requires 'textdocument.documentsymbol' support from the language server -keyset("x", "if", "(coc-funcobj-i)", opts) -keyset("o", "if", "(coc-funcobj-i)", opts) -keyset("x", "af", "(coc-funcobj-a)", opts) -keyset("o", "af", "(coc-funcobj-a)", opts) -keyset("x", "ic", "(coc-classobj-i)", opts) -keyset("o", "ic", "(coc-classobj-i)", opts) -keyset("x", "ac", "(coc-classobj-a)", opts) -keyset("o", "ac", "(coc-classobj-a)", opts) - - --- remap and to scroll float windows/popups ----@diagnostic disable-next-line: redefined-local -local opts = {silent = true, nowait = true, expr = true} -keyset("n", "", 'coc#float#has_scroll() ? coc#float#scroll(1) : ""', opts) -keyset("n", "", 'coc#float#has_scroll() ? coc#float#scroll(0) : ""', opts) -keyset("i", "", - 'coc#float#has_scroll() ? "=coc#float#scroll(1)" : ""', opts) -keyset("i", "", - 'coc#float#has_scroll() ? "=coc#float#scroll(0)" : ""', opts) -keyset("v", "", 'coc#float#has_scroll() ? coc#float#scroll(1) : ""', opts) -keyset("v", "", 'coc#float#has_scroll() ? coc#float#scroll(0) : ""', opts) - --- use ctrl-s for selections ranges --- requires 'textdocument/selectionrange' support of language server -keyset("n", "", "(coc-range-select)", {silent = true}) -keyset("x", "", "(coc-range-select)", {silent = true}) - --- add `:format` command to format current buffer -vim.api.nvim_create_user_command("Format", "call CocAction('format')", {}) - --- " add `:fold` command to fold current buffer -vim.api.nvim_create_user_command("Fold", "call CocAction('fold', )", {nargs = '?'}) - --- add `:or` command for organize imports of the current buffer -vim.api.nvim_create_user_command("OR", "call CocActionAsync('runCommand', 'editor.action.organizeImport')", {}) - --- mappings for coclist --- code actions and coc stuff ----@diagnostic disable-next-line: redefined-local -local opts = {silent = true, nowait = true} --- show all diagnostics -keyset("n", "a", ":CocList diagnostics", opts) --- manage extensions -keyset("n", "e", ":CocList extensions", opts) --- show commands -keyset("n", "c", ":CocList commands", opts) --- find symbol of current document -keyset("n", "o", ":CocList outline", opts) --- search workspace symbols -keyset("n", "s", ":CocList -I symbols", opts) --- do default action for next item -keyset("n", "j", ":CocNext", opts) --- do default action for previous item -keyset("n", "k", ":CocPrev", opts) --- resume latest coc list -keyset("n", "p", ":CocListResume", opts) - --- add (neo)vim's native statusline support --- note: please see `:h coc-status` for integrations with external plugins that --- provide custom statusline: lightline.vim, vim-airline --- vim.opt.statusline:prepend("%{coc#status()}%{get(b:,'coc_current_function','')}") diff --git a/.config/nvim/lua/keys.lua b/.config/nvim/lua/keys.lua deleted file mode 100644 index 22f1d81..0000000 --- a/.config/nvim/lua/keys.lua +++ /dev/null @@ -1,54 +0,0 @@ --- legacy keybinds for x11 clipboard -vim.cmd [[ - vnoremap "+y - vmap "+x - map "+p - map p "+P -]] - --- vertical motion remappings -vim.api.nvim_set_keymap("n", "", "zz", { noremap = true }) -vim.api.nvim_set_keymap("n", "", "zz", { noremap = true }) -vim.api.nvim_set_keymap("n", "n", "nzzzv", { noremap = true }) -vim.api.nvim_set_keymap("n", "N", "Nzzzv", { noremap = true }) - --- nerdtree keybinds -vim.api.nvim_set_keymap("n", "n", ":NERDTreeFocus", { noremap = true }) -vim.api.nvim_set_keymap("n", "", ":NERDTree", { noremap = true }) -vim.api.nvim_set_keymap("n", "", ":NERDTreeToggle", { noremap = true }) -vim.api.nvim_set_keymap("n", "/", ":NERDTreeFind", { noremap = true }) - --- spell check keybinds -vim.api.nvim_set_keymap("n", "sc", ":set spell!", { silent = true }) - --- splits and vsplits creation rebinds -vim.api.nvim_set_keymap('n', '', 'v', { noremap = true }) -vim.api.nvim_set_keymap('n', '', 's', { noremap = true }) - --- splits quit and save&quit -vim.api.nvim_set_keymap('n', '', 'ZQ', { noremap = true }) -vim.api.nvim_set_keymap('n', '', 'ZZ', { noremap = true }) - --- splits and vsplits movement rebinds -vim.api.nvim_set_keymap('n', '', 'j', { noremap = true }) -vim.api.nvim_set_keymap('n', '', 'k', { noremap = true }) -vim.api.nvim_set_keymap('n', '', 'l', { noremap = true }) -vim.api.nvim_set_keymap('n', '', 'h', { noremap = true }) -vim.api.nvim_set_keymap('n', '', 'w', { noremap = true }) -vim.api.nvim_set_keymap('n', '', 'W', { noremap = true }) - --- splits and vsplits resize rebinds -vim.api.nvim_set_keymap('n', '', '5<', { noremap = true }) -vim.api.nvim_set_keymap('n', '', '5>', { noremap = true }) -vim.api.nvim_set_keymap('n', '', '5-', { noremap = true }) -vim.api.nvim_set_keymap('n', '', '5+', { noremap = true }) - --- tab rebinds -vim.api.nvim_set_keymap('n', '', ':tabnew', { noremap = true }) -vim.api.nvim_set_keymap('n', '', ':tabprev', { noremap = true }) -vim.api.nvim_set_keymap('n', '', ':tabnext', { noremap = true }) -vim.api.nvim_set_keymap('n', '', ':tabmove -', { noremap = true }) -vim.api.nvim_set_keymap('n', '', ':tabmove +', { noremap = true }) - --- set file type keybind -vim.api.nvim_set_keymap('n', 'ft', ':set filetype=', { noremap = true }) diff --git a/.config/nvim/lua/look.lua b/.config/nvim/lua/look.lua deleted file mode 100644 index ccfd8b0..0000000 --- a/.config/nvim/lua/look.lua +++ /dev/null @@ -1,69 +0,0 @@ --- colorscheme declaration -vim.cmd("colorscheme tender") - --- coc.nvim colors -vim.cmd("highlight CocFloating ctermbg=0") -vim.cmd("highlight CocErrorFloat ctermfg=15") - --- gui appearance declarations -if vim.fn.has('gui_running') == 1 then - vim.opt.t_Co = 256 - vim.opt.guifont = "Roboto Mono 11" - vim.opt.guioptions:remove("m") - vim.opt.guioptions:remove("T") - vim.opt.guioptions:remove("r") - vim.opt.guioptions:remove("L") - vim.cmd("colorscheme tender") -end - --- remove trailing whitespace from python and fortran files -vim.api.nvim_exec([[ - autocmd BufWritePre *.py :%s/\s\+$//e - autocmd BufWritePre *.f90 :%s/\s\+$//e - autocmd BufWritePre *.f95 :%s/\s\+$//e - autocmd BufWritePre *.for :%s/\s\+$//e -]], false) - --- other appearance settings that I don't know how to set in lua -vim.cmd("filetype plugin on") -vim.cmd("syntax on") -vim.cmd("highlight Cursorline cterm=bold ctermbg=black") -vim.cmd("filetype indent on") --- set the text color of the line numbers -vim.cmd('highlight LineNr guifg=darkgray ctermfg=darkgray') --- set the text color for the current line number -vim.cmd('highlight CursorLineNr guifg=cyan ctermfg=cyan') - --- customize split dividers -vim.opt.fillchars = vim.opt.fillchars + { - vert = "█", - fold = "█", - diff = "█", - stl = "-", - stlnc = "-", - stl = "-" -} - --- set statusline colors -vim.cmd([[ - hi VertSplit guifg=#151515 - hi User1 guifg=#999999 guibg=#151515 - hi User2 guifg=#eea040 guibg=#151515 - hi User3 guifg=#0072ff guibg=#151515 - hi User4 guifg=#ffffff guibg=#151515 - hi User5 guifg=#777777 guibg=#151515 -]]) - --- set statusline -vim.o.statusline = table.concat({ - "%1* %n %*", -- buffer number - "%3* %y %*", -- file type - -- "%4* %<%F %*", -- full path - "%4* %<%f %*", -- file name - "%2* %m %*", -- modified flag - "%1* %= %5l %*", -- current line - "%2* /%L %*", -- total lines - "%1* %4v %*", -- virtual column number - "%2* 0x%04B %*", -- character under cursor - "%5* %{&ff} %*", -- file format -}) diff --git a/.config/nvim/lua/opts.lua b/.config/nvim/lua/opts.lua deleted file mode 100644 index 3f7dc11..0000000 --- a/.config/nvim/lua/opts.lua +++ /dev/null @@ -1,47 +0,0 @@ -local opts = { - -- clipboard = "unnamedplus", - -- textwidth = 80, - autochdir = true, - autoindent = true, - cursorline = true, - expandtab = true, - hlsearch = true, - ignorecase = true, - linebreak = true, - listchars = { tab = ">-", trail = "~", extends = ">", precedes = "<", space = "." }, - mouse = "a", - number = true, - relativenumber = true, - shiftwidth = 4, - showmatch = true, - smartcase = true, - softtabstop = 4, - splitbelow = true, - splitright = true, - tabstop = 4, - termguicolors = true, - ttimeout = true, - ttimeoutlen = 1, - ttyfast = true, - undofile = true, -} - --- use a line cursor within insert mode and a block cursor everywhere else. --- reference chart of values: --- ps = 0 -> blinking block. --- ps = 1 -> blinking block (default). --- ps = 2 -> steady block. --- ps = 3 -> blinking underline. --- ps = 4 -> steady underline. --- ps = 5 -> blinking bar (xterm). --- ps = 6 -> steady bar (xterm). -vim.g.t_SI = "\27[6 q" -vim.g.t_EI = "\27[2 q" - -if vim.env.TERM == "alacritty" then - vim.opt.ttymouse = "sgr" -end - -for k, v in pairs(opts) do - vim.opt[k] = v -end diff --git a/.config/nvim/lua/plug.lua b/.config/nvim/lua/plug.lua deleted file mode 100644 index a77459a..0000000 --- a/.config/nvim/lua/plug.lua +++ /dev/null @@ -1,20 +0,0 @@ --- legacy plugin manager config (vim-plug) -vim.cmd [[ - call plug#begin() - Plug 'https://github.com/preservim/nerdtree', { 'on': 'NERDTreeToggle' } - Plug 'tmsvg/pear-tree' - Plug 'https://github.com/adelarsq/vim-matchit' - Plug 'neoclide/coc.nvim', {'branch': 'release'} - Plug 'tpope/vim-surround' - Plug 'sbdchd/neoformat' - Plug 'ThePrimeagen/vim-be-good' - Plug 'junegunn/fzf' - Plug 'nvim-lua/plenary.nvim' - Plug 'nvim-telescope/telescope.nvim', { 'branch': '0.1.x' } - Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} - Plug 'Pocco81/true-zen.nvim' - - " Plug 'LunarWatcher/auto-pairs' - call plug#end() -]] - diff --git a/.config/nvim/lua/tele.lua b/.config/nvim/lua/tele.lua deleted file mode 100644 index f264799..0000000 --- a/.config/nvim/lua/tele.lua +++ /dev/null @@ -1,29 +0,0 @@ -local builtin = require('telescope.builtin') - -vim.keymap.set('n', 'fg', function() - builtin.live_grep({ - find_command = {'rg', '--ignore', '--hidden', '--files'}, - prompt_prefix = ' search: ' - }) -end, {}) - -vim.keymap.set('n', 'ff', function() - builtin.find_files({ - find_command = {'rg', '--ignore', '--hidden', '--files'}, - prompt_prefix = ' search: ' - }) -end, {}) - -vim.keymap.set('n', 'fb', function() - builtin.buffers({ - find_command = {'rg', '--ignore', '--hidden', '--files'}, - prompt_prefix = ' search: ' - }) -end, {}) - -vim.keymap.set('n', 'fh', function() - builtin.help_tags({ - find_command = {'rg', '--ignore', '--hidden', '--files'}, - prompt_prefix = ' search: ' - }) -end, {}) diff --git a/.config/nvim/lua/tree.lua b/.config/nvim/lua/tree.lua deleted file mode 100644 index 24d5dc3..0000000 --- a/.config/nvim/lua/tree.lua +++ /dev/null @@ -1,32 +0,0 @@ -local status_ok, configs = pcall(require, "nvim-treesitter.configs") -if not status_ok then - return -end - -configs.setup { - ensure_installed = { - "bash", - "lua", - "vim", - "vimdoc", - }, - - sync_install = false, - auto_install = true, - ignore_install = { "" }, - highlight = { - enable = true, - disable = { - "php", - "markdown", - "dockerfile" - }, - additional_vim_regex_highlighting = false, - }, - indent = { - enable = true, - disable = { - "yaml", - }, - }, -} diff --git a/.config/nvim/lua/zen.lua b/.config/nvim/lua/zen.lua deleted file mode 100644 index 1f607b4..0000000 --- a/.config/nvim/lua/zen.lua +++ /dev/null @@ -1,16 +0,0 @@ -local truezen = require('true-zen') -local keymap = vim.keymap - -keymap.set('n', 'zn', function() - local first = 0 - local last = vim.api.nvim_buf_line_count(0) - truezen.narrow(first, last) -end, { noremap = true }) -keymap.set('v', 'zn', function() - local first = vim.fn.line('v') - local last = vim.fn.line('.') - truezen.narrow(first, last) -end, { noremap = true }) -keymap.set('n', 'zf', truezen.focus, { noremap = true }) -keymap.set('n', 'zm', truezen.minimalist, { noremap = true }) -keymap.set('n', 'za', truezen.ataraxis, { noremap = true }) -- cgit v1.2.3