From: Lukas Hägele Date: Wed, 6 Sep 2023 07:08:41 +0000 (+0200) Subject: legacy config (vimscript) X-Git-Url: https://git.lhaegele.de/?a=commitdiff_plain;h=c78efa2ddef67c506c2da4bf00656d06336a3c7d;p=dotfiles_nvim.git legacy config (vimscript) --- diff --git a/after/plugin/fugitive.lua b/after/plugin/fugitive.lua deleted file mode 100644 index 80c9070..0000000 --- a/after/plugin/fugitive.lua +++ /dev/null @@ -1 +0,0 @@ -vim.keymap.set("n", "gs", vim.cmd.Git) diff --git a/after/plugin/harpoon.lua b/after/plugin/harpoon.lua deleted file mode 100644 index f9f269c..0000000 --- a/after/plugin/harpoon.lua +++ /dev/null @@ -1,11 +0,0 @@ -local mark = require("harpoon.mark") -local ui = require("harpoon.ui") - -vim.keymap.set("n", "a", mark.toggle_file) -vim.keymap.set("n", "", ui.toggle_quick_menu) - -vim.keymap.set("n", "", function() ui.nav_file(1) end) -vim.keymap.set("n", "", function() ui.nav_file(2) end) -vim.keymap.set("n", "", function() ui.nav_file(3) end) -vim.keymap.set("n", "", function() ui.nav_file(4) end) - diff --git a/after/plugin/hop.lua b/after/plugin/hop.lua deleted file mode 100644 index 584403d..0000000 --- a/after/plugin/hop.lua +++ /dev/null @@ -1,22 +0,0 @@ -local hop = require("hop") - -local directions = require('hop.hint').HintDirection - -vim.keymap.set('', 'k', function() - hop.hint_lines({ direction = directions.BEFORE_CURSOR}) -end, {remap=true}) - -vim.keymap.set('', 'j', function() - hop.hint_lines({ direction = directions.AFTER_CURSOR}) -end, {remap=true}) - -vim.keymap.set('', 'f', function() - hop.hint_char1({ direction = directions.AFTER_CURSOR, current_line_only = true }) -end, {remap=true}) - -vim.keymap.set('', 'F', function() - hop.hint_char1({ direction = directions.BEFORE_CURSOR, current_line_only = true }) -end, {remap=true}) - -hop.setup() - diff --git a/after/plugin/kiwi.lua b/after/plugin/kiwi.lua deleted file mode 100644 index da42da3..0000000 --- a/after/plugin/kiwi.lua +++ /dev/null @@ -1,13 +0,0 @@ -local kiwi = require('kiwi') - -vim.keymap.set('n', 'ww', kiwi.open_wiki_index, {}) ---vim.keymap.set('n', 'wd', kiwi.open_diary_index, {}) ---vim.keymap.set('n', 'wn', kiwi.open_diary_new, {}) -vim.keymap.set('n', 'l', kiwi.todo.toggle, {}) - -kiwi.setup({ - { - name = "wiki", - path = "/home/lukas/wiki" - } -}) diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua deleted file mode 100644 index fd42b84..0000000 --- a/after/plugin/lsp.lua +++ /dev/null @@ -1,31 +0,0 @@ --- setup servers with nvim-cmp's additional capabilities -local capabilities = require('cmp_nvim_lsp').default_capabilities() -local lspconfig = require('lspconfig') -local servers = {'clangd'} -for _, lsp in ipairs(servers) do - lspconfig[lsp].setup { - -- on_attach = my_custom_on_attach, - capabilities = capabilities, - } -end - --- setup completion -local cmp = require('cmp') - -local cmp_select = { behavior = cmp.SelectBehavior.Select } -local cmp_mappings = cmp.mapping.preset.insert({ - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.confirm({ select = true}), - [''] = cmp.mapping.select_prev_item(cmp_select), - [''] = cmp.mapping.select_next_item(cmp_select), -}) - -local cmp_sources = cmp.config.sources({ - { name = 'nvim_lsp' } -}) - -cmp.setup { - mapping = cmp_mappings, - --TODO snippet = ..., - sources = cmp_sources -} diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua deleted file mode 100644 index ea6eb81..0000000 --- a/after/plugin/telescope.lua +++ /dev/null @@ -1,7 +0,0 @@ -local builtin = require('telescope.builtin') - -vim.keymap.set('n', 'pf', builtin.find_files, {}) -vim.keymap.set('n', '', builtin.git_files, {}) -vim.keymap.set('n', 'ps', function() - builtin.grep_string({ search = vim.fn.input("Grep > ") }); -end) diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua deleted file mode 100644 index 19c9c2f..0000000 --- a/after/plugin/treesitter.lua +++ /dev/null @@ -1,22 +0,0 @@ -require'nvim-treesitter.configs'.setup { - -- A list of parser names, or "all" - ensure_installed = { "vimdoc", "c", "lua", "markdown" }, - - -- Install parsers synchronously (only applied to `ensure_installed`) - sync_install = false, - - -- Automatically install missing parsers when entering buffer - -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally - auto_install = true, - - highlight = { - -- `false` will disable the whole extension - enable = true, - - -- Setting this to true will run `:h syntax` and tree-sitter at the same time. - -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). - -- Using this option may slow down your editor, and you may see some duplicate highlights. - -- Instead of true it can also be a list of languages - additional_vim_regex_highlighting = false, - }, -} diff --git a/after/plugin/trouble.lua b/after/plugin/trouble.lua deleted file mode 100644 index 12ee72f..0000000 --- a/after/plugin/trouble.lua +++ /dev/null @@ -1 +0,0 @@ -vim.keymap.set("n", "xq", function() require("trouble").open("quickfix") end) diff --git a/after/plugin/undotree.lua b/after/plugin/undotree.lua deleted file mode 100644 index b6b9276..0000000 --- a/after/plugin/undotree.lua +++ /dev/null @@ -1 +0,0 @@ -vim.keymap.set("n", "u", vim.cmd.UndotreeToggle) diff --git a/init.lua b/init.lua deleted file mode 100644 index d94e335..0000000 --- a/init.lua +++ /dev/null @@ -1,2 +0,0 @@ -require("lukas") - diff --git a/init.vim b/init.vim new file mode 100644 index 0000000..3908b88 --- /dev/null +++ b/init.vim @@ -0,0 +1,208 @@ +""" github.com/Optixal/neovim-init.vim + +""" -------------------------------------------------------------------------- +""" common +""" -------------------------------------------------------------------------- +set tabstop=4 softtabstop=4 shiftwidth=4 expandtab smarttab autoindent +set incsearch ignorecase smartcase hlsearch +set ruler laststatus=2 showcmd showmode +set list listchars=trail:>,tab:>- +set fillchars+=vert:\ +set encoding=utf-8 +set number relativenumber + +""" enable bash-like tab completion +set wildmode=longest,list + +""" highlighting +syntax on + +" 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). +let &t_SI = "\e[6 q" +let &t_EI = "\e[2 q" + +""" -------------------------------------------------------------------------- +""" Custom Mappings +""" -------------------------------------------------------------------------- +let mapleader=" " + +imap jj + +""" -------------------------------------------------------------------------- +""" plugins +""" -------------------------------------------------------------------------- +call plug#begin('~/.config/nvim/plugged') +Plug 'neoclide/coc.nvim', {'branch': 'release'} +Plug 'junegunn/fzf' +Plug 'junegunn/fzf.vim' +Plug 'shaunsingh/nord.nvim' +Plug 'easymotion/vim-easymotion' +Plug 'airblade/vim-gitgutter' +Plug 'jackguo380/vim-lsp-cxx-highlight' +Plug 'vimwiki/vimwiki' +Plug 'michal-h21/vim-zettel' +call plug#end() + +""" -------------------------------------------------------------------------- +""" neoclide/coc.nvim +""" -------------------------------------------------------------------------- + +" TextEdit might fail if hidden is not set. +set hidden + +" Some servers have issues with backup files, see #649. +set nobackup +set nowritebackup + +" Give more space for displaying messages. +set cmdheight=2 + +" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable +" delays and poor user experience. +set updatetime=300 + +" Don't pass messages to |ins-completion-menu|. +set shortmess+=c + +" Always show the signcolumn, otherwise it would shift the text each time +" diagnostics appear/become resolved. +set signcolumn=yes + +" Use tab for trigger completion with characters ahead and navigate. +" NOTE: Use command ':verbose imap ' to make sure tab is not mapped by +" other plugin before putting this into your config. +inoremap + \ pumvisible() ? "\" : + \ CheckBackspace() ? "\" : + \ coc#refresh() +inoremap pumvisible() ? "\" : "\" + +function! CheckBackspace() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' +endfunction + +" Use to trigger completion. +if has('nvim') + inoremap coc#refresh() +else + inoremap coc#refresh() +endif + +" Make auto-select the first completion item and notify coc.nvim to +" format on enter, could be remapped by other vim plugin +inoremap pumvisible() ? coc#_select_confirm() + \: "\u\\=coc#on_enter()\" + +" Highlight the symbol and its references when holding the cursor. +autocmd CursorHold * silent call CocActionAsync('highlight') + +" Symbol renaming. +nmap rn (coc-rename) + +" search symbol +nmap o :CocList outline + +" GoTo code navigation. +nmap gd (coc-definition) +nmap gy (coc-type-definition) +nmap gi (coc-implementation) +nmap gr (coc-references) + +" 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. +"set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')} + +""" -------------------------------------------------------------------------- +""" junegunn/fzf +""" junegunn/fzf.vim +""" -------------------------------------------------------------------------- + +let g:nv_search_paths = ['~/wiki/'] + +" Mapping selecting mappings +nmap (fzf-maps-n) +xmap (fzf-maps-x) +omap (fzf-maps-o) + +" Insert mode completion +imap (fzf-complete-path) + +nmap p :Files + +""" -------------------------------------------------------------------------- +""" shaunsingh/nord.nvim +""" -------------------------------------------------------------------------- + +" Example config in Vim-Script +let g:nord_contrast = v:true +let g:nord_borders = v:false +let g:nord_disable_background = v:false +let g:nord_italic = v:false + +" Load the colorscheme +colorscheme nord + +""" -------------------------------------------------------------------------- +""" easymotion/vim-easymotion +""" -------------------------------------------------------------------------- + +" allow motions to be triggered by a single +map (easymotion-prefix) + +""" -------------------------------------------------------------------------- +""" airblade/vim-gitgutter +""" -------------------------------------------------------------------------- + +" always show the signcolumn +set signcolumn=yes + +" show diff +nmap d :GitGutterDiffOrig + +""" -------------------------------------------------------------------------- +""" jackguo380/vim-lsp-cxx-highlight +""" -------------------------------------------------------------------------- + +let g:cpp_member_variable_highlight = 1 + +""" -------------------------------------------------------------------------- +""" vimwiki/vimwiki +""" -------------------------------------------------------------------------- + +""" wiki folder +""" use markdown syntax +""" auto-update tags metadata when current page is saved +let g:vimwiki_list = [{ + \'path': '~/wiki/', + \'syntax': 'markdown', 'ext': '.md', + \'auto_tags': 1 + \}] + +""" do not consider every markdown file a wiki file +let g:vimwiki_global_ext = 0 + +""" mappings +nnoremap l :VimwikiToggleListItem + +""" -------------------------------------------------------------------------- +""" michal-h21/vim-zettel +""" -------------------------------------------------------------------------- + +""" filename format +let g:zettel_format = "%Y%m%d-%H%M" + +""" mappings +nnoremap zn :ZettelNew + +""" -------------------------------------------------------------------------- diff --git a/lua/lukas/init.lua b/lua/lukas/init.lua deleted file mode 100644 index 0ec999a..0000000 --- a/lua/lukas/init.lua +++ /dev/null @@ -1,2 +0,0 @@ -require('lukas.remap') -require('lukas.settings') diff --git a/lua/lukas/packer.lua b/lua/lukas/packer.lua deleted file mode 100644 index 45e9c21..0000000 --- a/lua/lukas/packer.lua +++ /dev/null @@ -1,62 +0,0 @@ --- 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' - - - -- fuzzy finder - use { - 'nvim-telescope/telescope.nvim', tag = '0.1.2', - requires = { {'nvim-lua/plenary.nvim'} } - } - - -- quick buffer switching - use("theprimeagen/harpoon") - - -- easy motions - use { - 'phaazon/hop.nvim', - branch = 'v2', -- optional but strongly recommended - config = function() - -- you can configure Hop the way you like here; see :h hop-config - require'hop'.setup { keys = 'etovxqpdygfblzhckisuran' } - end - } - - - -- configs for the nvim lsp client - use{'neovim/nvim-lspconfig', tag = 'v0.1.6'} - -- autocompletion engine - use('hrsh7th/nvim-cmp') - -- additional capabilities - use('hrsh7th/cmp-nvim-lsp') - - -- syntax highlighting - use { - 'nvim-treesitter/nvim-treesitter', tag = 'v0.9.1', - run = function() - local ts_update = require('nvim-treesitter.install').update({ with_sync = true }) - ts_update() - end, - } - - -- diagnostics - use{'folke/trouble.nvim', tag = 'v2.8.0'} - - - -- git integration - use{'tpope/vim-fugitive', tag = 'v3.7'} - - -- undo - use{'mbbill/undotree', tag = 'rel_6.1'} - - -- wiki - use { - 'serenevoid/kiwi.nvim', - requires = { {'nvim-lua/plenary.nvim'} } - } -end) diff --git a/lua/lukas/remap.lua b/lua/lukas/remap.lua deleted file mode 100644 index 35e63e5..0000000 --- a/lua/lukas/remap.lua +++ /dev/null @@ -1,40 +0,0 @@ -vim.g.mapleader = " " - --- open file explorer -vim.keymap.set("n", "pv", vim.cmd.Ex) - --- shortcut escape in insert mode -vim.keymap.set('i', 'jj', '') - --- move highlighted lines -vim.keymap.set("v", "J", ":m '>+1gv=gv") -vim.keymap.set("v", "K", ":m '<-2gv=gv") - --- stay in the middle -vim.keymap.set("n", "J", "mzJ`z") -vim.keymap.set("n", "", "zz") -vim.keymap.set("n", "", "zz") -vim.keymap.set("n", "n", "nzzzv") -vim.keymap.set("n", "N", "Nzzzv") - --- keep yank buffer after paste -vim.keymap.set("x", "p", [["_dP]]) - --- yank to system clipboard -vim.keymap.set({"n", "v"}, "y", [["+y]]) -vim.keymap.set("n", "Y", [["+Y]]) - --- delete to void (?) -vim.keymap.set({"n", "v"}, "d", [["_d]]) - --- quick fix navigation (?) -vim.keymap.set("n", "", "cnextzz") -vim.keymap.set("n", "", "cprevzz") -vim.keymap.set("n", "k", "lnextzz") -vim.keymap.set("n", "j", "lprevzz") - --- replace all instances of the current symbol -vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) - --- make current file executable -vim.keymap.set("n", "x", "!chmod +x %", { silent = true }) diff --git a/lua/lukas/settings.lua b/lua/lukas/settings.lua deleted file mode 100644 index fd4e1d7..0000000 --- a/lua/lukas/settings.lua +++ /dev/null @@ -1,26 +0,0 @@ -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.undofile = true - -vim.opt.hlsearch = false -vim.opt.incsearch = true - -vim.opt.termguicolors = false - -vim.opt.scrolloff = 8 -vim.opt.signcolumn = "yes" -vim.opt.isfname:append("@-@") - -vim.opt.updatetime = 50 - --- vim.opt.colorcolumn = "80" diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua deleted file mode 100644 index 2048e5a..0000000 --- a/plugin/packer_compiled.lua +++ /dev/null @@ -1,164 +0,0 @@ --- Automatically generated packer.nvim plugin loader code - -if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then - vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') - return -end - -vim.api.nvim_command('packadd packer.nvim') - -local no_errors, error_msg = pcall(function() - -_G._packer = _G._packer or {} -_G._packer.inside_compile = true - -local time -local profile_info -local should_profile = false -if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end - end -else - time = function(chunk, start) end -end - -local function save_profiles(threshold) - local sorted_times = {} - for chunk_name, time_taken in pairs(profile_info) do - sorted_times[#sorted_times + 1] = {chunk_name, time_taken} - end - table.sort(sorted_times, function(a, b) return a[2] > b[2] end) - local results = {} - for i, elem in ipairs(sorted_times) do - if not threshold or threshold and elem[2] > threshold then - results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' - end - end - if threshold then - table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') - end - - _G._packer.profile_output = results -end - -time([[Luarocks path setup]], true) -local package_path_str = "/home/lukas/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/lukas/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/lukas/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/lukas/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/lukas/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" -if not string.find(package.path, package_path_str, 1, true) then - package.path = package.path .. ';' .. package_path_str -end - -if not string.find(package.cpath, install_cpath_pattern, 1, true) then - package.cpath = package.cpath .. ';' .. install_cpath_pattern -end - -time([[Luarocks path setup]], false) -time([[try_loadstring definition]], true) -local function try_loadstring(s, component, name) - local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) - if not success then - vim.schedule(function() - vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) - end) - end - return result -end - -time([[try_loadstring definition]], false) -time([[Defining packer_plugins]], true) -_G.packer_plugins = { - ["cmp-nvim-lsp"] = { - loaded = true, - path = "/home/lukas/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", - url = "https://github.com/hrsh7th/cmp-nvim-lsp" - }, - harpoon = { - loaded = true, - path = "/home/lukas/.local/share/nvim/site/pack/packer/start/harpoon", - url = "https://github.com/theprimeagen/harpoon" - }, - ["hop.nvim"] = { - config = { "\27LJ\2\nU\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\tkeys\28etovxqpdygfblzhckisuran\nsetup\bhop\frequire\0" }, - loaded = true, - path = "/home/lukas/.local/share/nvim/site/pack/packer/start/hop.nvim", - url = "https://github.com/phaazon/hop.nvim" - }, - ["kiwi.nvim"] = { - loaded = true, - path = "/home/lukas/.local/share/nvim/site/pack/packer/start/kiwi.nvim", - url = "https://github.com/serenevoid/kiwi.nvim" - }, - ["nvim-cmp"] = { - loaded = true, - path = "/home/lukas/.local/share/nvim/site/pack/packer/start/nvim-cmp", - url = "https://github.com/hrsh7th/nvim-cmp" - }, - ["nvim-lspconfig"] = { - loaded = true, - path = "/home/lukas/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", - url = "https://github.com/neovim/nvim-lspconfig" - }, - ["nvim-treesitter"] = { - loaded = true, - path = "/home/lukas/.local/share/nvim/site/pack/packer/start/nvim-treesitter", - url = "https://github.com/nvim-treesitter/nvim-treesitter" - }, - ["packer.nvim"] = { - loaded = true, - path = "/home/lukas/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - }, - ["plenary.nvim"] = { - loaded = true, - path = "/home/lukas/.local/share/nvim/site/pack/packer/start/plenary.nvim", - url = "https://github.com/nvim-lua/plenary.nvim" - }, - ["telescope.nvim"] = { - loaded = true, - path = "/home/lukas/.local/share/nvim/site/pack/packer/start/telescope.nvim", - url = "https://github.com/nvim-telescope/telescope.nvim" - }, - ["trouble.nvim"] = { - loaded = true, - path = "/home/lukas/.local/share/nvim/site/pack/packer/start/trouble.nvim", - url = "https://github.com/folke/trouble.nvim" - }, - undotree = { - loaded = true, - path = "/home/lukas/.local/share/nvim/site/pack/packer/start/undotree", - url = "https://github.com/mbbill/undotree" - }, - ["vim-fugitive"] = { - loaded = true, - path = "/home/lukas/.local/share/nvim/site/pack/packer/start/vim-fugitive", - url = "https://github.com/tpope/vim-fugitive" - } -} - -time([[Defining packer_plugins]], false) --- Config for: hop.nvim -time([[Config for hop.nvim]], true) -try_loadstring("\27LJ\2\nU\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\tkeys\28etovxqpdygfblzhckisuran\nsetup\bhop\frequire\0", "config", "hop.nvim") -time([[Config for hop.nvim]], false) - -_G._packer.inside_compile = false -if _G._packer.needs_bufread == true then - vim.cmd("doautocmd BufRead") -end -_G._packer.needs_bufread = false - -if should_profile then save_profiles() end - -end) - -if not no_errors then - error_msg = error_msg:gsub('"', '\\"') - vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') -end