Tablines and Multicursor

This commit is contained in:
Yannick Reiß 2023-08-13 19:40:22 +02:00
parent b1c4721cd6
commit 2b1446b76a
No known key found for this signature in database
GPG Key ID: 5A3AF456F0A0338C
6 changed files with 65 additions and 22 deletions

5
UltiSnips/vim.snippets Normal file
View File

@ -0,0 +1,5 @@
snippet fun "Lua function" b
function ${1:name}()
$2
endfunction$0
endsnippet

View File

@ -1,4 +1,4 @@
--vim.cmd('source viml/init.vim')
-- vim.cmd('source viml/init.vim')
-- Basic setup configuration
vim.cmd([[
set nocompatible
@ -21,7 +21,7 @@ vim.opt.guifont = "DroidSansMono Nerd Font 11"
-- set colorscheme
vim.opt.termguicolors = true
vim.cmd([[
colorscheme morning
colorscheme ron
]])
-- vim.cmd('source ~/.config/nvim/viml/plugins.vim')
@ -35,7 +35,7 @@ vim.g.UltiSnipsEditSplit = "vertical"
vim.g.UltiSnipsSnippetDirectories = { "~/.config/nvim/UltiSnips" }
-- indentLine config
vim.g.indentLine_char = ""
vim.g.indentLine_char = ""
-- NERDTree Config
vim.g.NERDTreeShowHidden = 1
@ -95,11 +95,6 @@ require("formatter").setup({
},
},
})
-- YCM config
-- replace tab by crtl-k
-- vim.cmd("let g:ycm_key_list_select_completion = ['<c-k>']")
-- vim.cmd("inoremap <expr> <Tab> pumvisible() ? '\\<c-k>' : 'ᐅ'")
-- vim.g.ycm_global_ycm_extra_conf = '~/.config/nvim/python/.ycm_extra_conf.py'
-- Treesitter config
local configs = require("nvim-treesitter.configs")
@ -148,7 +143,13 @@ require("mason-lspconfig").setup_handlers({
})
local wilder = require("wilder")
wilder.setup({ modes = { ":", "/", "?" } }) --, next_key= '<Tab>', previous_key= '<S-Tab>', accept_key= '<c-k>', reject_key= '<Up>'})
wilder.setup({
modes = { ":", "/", "?" },
next_key = "<Tab>",
previous_key = "<S-Tab>",
accept_key = "<c-k>",
reject_key = "<Up>",
})
require("code-completion")
@ -158,4 +159,5 @@ if vim.g.neovide then
vim.g.neovide_scale_factor = 1.0
end
vim.cmd("source ~/.config/nvim/viml/legacyconf.vim")
vim.cmd("source ./viml/legacyconf.vim")
vim.cmd("source ./viml/macros.vim")

View File

@ -3,7 +3,7 @@ let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-
let v:this_session=expand("<sfile>:p")
silent only
silent tabonly
cd ~
cd ~/.config/nvim
if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''
let s:wipebuf = bufnr('%')
endif
@ -13,12 +13,17 @@ if &shortmess =~ 'A'
else
set shortmess=aoO
endif
badd +9 .config/nvim/init.lua
badd +35 init.lua
badd +75 viml/legacyconf.vim
argglobal
%argdel
$argadd .config/nvim/init.lua
edit .config/nvim/init.lua
$argadd init.lua
$argadd viml/legacyconf.vim
tabnew +setlocal\ bufhidden=wipe
tabrewind
edit init.lua
argglobal
balt viml/legacyconf.vim
setlocal fdm=expr
setlocal fde=nvim_treesitter#foldexpr()
setlocal fmr={{{,}}}
@ -27,12 +32,31 @@ setlocal fdl=0
setlocal fml=1
setlocal fdn=20
setlocal nofen
let s:l = 9 - ((8 * winheight(0) + 25) / 50)
let s:l = 35 - ((20 * winheight(0) + 21) / 42)
if s:l < 1 | let s:l = 1 | endif
keepjumps exe s:l
normal! zt
keepjumps 9
normal! 021|
keepjumps 35
normal! 026|
tabnext
edit viml/legacyconf.vim
argglobal
2argu
balt init.lua
setlocal fdm=expr
setlocal fde=nvim_treesitter#foldexpr()
setlocal fmr={{{,}}}
setlocal fdi=#
setlocal fdl=0
setlocal fml=1
setlocal fdn=20
setlocal nofen
let s:l = 1 - ((0 * winheight(0) + 23) / 47)
if s:l < 1 | let s:l = 1 | endif
keepjumps exe s:l
normal! zt
keepjumps 1
normal! 0
tabnext 1
if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal'
silent exe 'bwipe ' . s:wipebuf
@ -46,7 +70,6 @@ if filereadable(s:sx)
endif
let &g:so = s:so_save | let &g:siso = s:siso_save
set hlsearch
nohlsearch
doautoall SessionLoadPost
unlet SessionLoad
" vim: set ft=vim :

View File

@ -38,6 +38,8 @@ return require("packer").startup(function(use)
use("prabirshrestha/async.vim")
use("prabirshrestha/vim-lsp")
use("nvim-tree/nvim-web-devicons")
use("mg979/vim-visual-multi")
use("Yggdroot/indentline")
use({ "romgrk/barbar.nvim", wants = "nvim-web-devicons" })
use({ "petertriho/cmp-git", requires = "nvim-lua/plenary.nvim" })
use("quangnguyen30192/cmp-nvim-ultisnips")

View File

@ -52,9 +52,6 @@ nnoremap <C-s> :w<CR>
" autosave for Markdown and Latex
set updatetime=800
autocmd CursorHold *.md w
" autocmd BufAdd *.md !okular %&
"terminator -e "latexmk -pdf -f </dev/null" &
nnoremap <C-y> :!latexmk -pdf -silent -f </dev/null <CR>
function RestoreSession()
if @% == ""
@ -63,7 +60,7 @@ function RestoreSession()
endfunction
" Git-Blame configuration
let g:gitblame_message_template = ' => <author> • <summary> • <date>'
let g:gitblame_message_template = ' => <author> • <date> • <summary>'
let g:gitblame_date_format = '%r'
if executable('vhdl-tool')
@ -83,6 +80,7 @@ nnoremap <silent> <C-0> <Cmd>BufferNext<CR>
function Update_Sys()
PackerSync
TSUpdate
MasonUpdate
endfunction
nnoremap <M-u> :call Update_Sys()<CR>

13
viml/macros.vim Normal file
View File

@ -0,0 +1,13 @@
function Common()
endfunction
function Ctypes()
let @c = "\<ESC>0i/*\<ESC>A */\<ESC>0j"
endfunction
" load common macros for all Filetypes
autocmd BufEnter * :call Common()
" load c-type macros
autocmd BufEnter *\.c Ctypes()