Commit: 8b62d90504229ad2aabc0d836881fc42ad8da280 - vim (git)

Commit MetaInfo

• Révision: 8b62d90504229ad2aabc0d836881fc42ad8da280 (tree)
• l'heure: 2022-04-01 03:20:35
• Auteur: badcoff33 <none@none>
• Commiter: badcoff33

Message de Log

update files

Change Summary

• modified: after/ftplugin/help.vim
• modified: after/ftplugin/qf.vim
• modified: colors/apollo.vim
• modified: pack_update.bat
• modified: plugins.vim
• modified: vimrc

Modification

--- a/after/ftplugin/help.vim
+++ b/after/ftplugin/help.vim
@@ -11,6 +11,7 @@ nnoremap <buffer> K :help <C-r><C-w><CR>
 
 " Close help again
 nmap <silent> <buffer> <Esc> :bd<CR>
+nmap <silent> <buffer> q     :bd<CR>
 
 " Show value of 'option' under cursor
 nnoremap <buffer> <LocalLeader>o :set <C-r>=substitute(expand("<cword>"), "[^a-z]", "", "g")<CR>?<CR>

--- a/after/ftplugin/qf.vim
+++ b/after/ftplugin/qf.vim
@@ -18,4 +18,5 @@ let b:undo_ftplugin = "setlocal number< relativenumber< wrap< scrolloff<"
 setlocal nonumber norelativenumber nowrap scrolloff=0
 
 nnoremap <buffer> <Esc> :cclose<CR>
+nnoremap <buffer> q     :cclose<CR>
 

--- a/colors/apollo.vim
+++ b/colors/apollo.vim
@@ -42,7 +42,7 @@ let s:GuiBg = {str -> empty(str) ? "":"guibg=".str}
 let s:GuiAttr = {str -> empty(str) ? "":"gui=".str}
 
 " Basics
-execute 'hi Normal' s:GuiFg(s:silver3) s:GuiBg(s:bg1) s:GuiAttr('NONE')
+execute 'hi Normal' s:GuiFg(s:silver4) s:GuiBg(s:bg1) s:GuiAttr('NONE')
 execute 'hi Bold' s:GuiFg(s:silver2)  s:GuiAttr('bold')
 execute 'hi Italic' s:GuiFg(s:silver2)  s:GuiAttr('italic')
 execute 'hi NonText' s:GuiFg(s:blue1) s:GuiBg(s:bg1)

--- a/pack_update.bat
+++ b/pack_update.bat
@@ -7,11 +7,12 @@ vcs_cmd_clone = "hg clone -q"
 vcs_cmd_pull = "hg pull -q"
 
 git_dict = {
-        "pack/github/start/easy-align": "[e-mail]:junegunn/vim-easy-align.git",
-        "pack/github/start/colorizer":  "[e-mail]:lilydjwg/colorizer.git",
-        "pack/github/opt/vista":        "[e-mail]:liuchengxu/vista.vim.git",
-        "pack/github/opt/signify":      "[e-mail]:mhinz/vim-signify.git",
-        "pack/github/opt/wordy":        "[e-mail]:preservim/vim-wordy.git" }
+        "pack/github/start/buffergator": "[e-mail]:jeetsukumaran/vim-buffergator.git",
+        "pack/github/start/easy-align":  "[e-mail]:junegunn/vim-easy-align.git",
+        "pack/github/opt/colorizer":     "[e-mail]:lilydjwg/colorizer.git",
+        "pack/github/opt/vista":         "[e-mail]:liuchengxu/vista.vim.git",
+        "pack/github/start/signify":     "[e-mail]:mhinz/vim-signify.git",
+        "pack/github/opt/wordy":         "[e-mail]:preservim/vim-wordy.git" }
 
 for subdir in git_dict:
     git_url = git_dict[subdir]

--- a/plugins.vim
+++ b/plugins.vim
@@ -1,64 +1,70 @@
-" Netrw variables
-let g:netrw_use_errorwindow = 0
-let g:netrw_banner = 0
-let g:netrw_liststyle = 3
-let g:netrw_browse_split = 0
-let g:netrw_altv = 1
-let g:netrw_winsize = 25
-let g:netrw_preview = 1
+vim9script
+# NETRW variables
+g:netrw_use_errorwindow = 0
+g:netrw_banner = 0
+g:netrw_liststyle = 3
+g:netrw_browse_split = 0
+g:netrw_altv = 1
+g:netrw_winsize = 25
+g:netrw_preview = 1
 
-" Start interactive EasyAlign in visual mode (e.g. vipga)
+# BUFFERGATOR
+g:buffergator_autoexpand_on_split = 0
+
+# EASYALIGN
+# Start interactive EasyAlign in visual mode (e.g. vipga)
 xmap <Leader>a <Plug>(EasyAlign)
-" Start interactive EasyAlign for a motion/text object (e.g. gaip)
+# Start interactive EasyAlign for a motion/text object (e.g. gaip)
 nmap <Leader>a <Plug>(EasyAlign)
 
-let g:dircfg =
-      \ {
-      \ 'HVH1x0_2_0': [
-      \   'command! -nargs=0 CtagsCommand Ctags -R C_Application C_CDD C_AUTOSAR/Sources C:/Daten/Common_3P/comp_SBC_UJA116x/1.3.1',
-      \   'nnoremap <C-CR> :<C-u>Rg -tc -tcmake <C-r><C-w> . C:/Daten/Common_3P/comp_SBC_UJA116x/1.3.1<CR>',
-      \   'set grepprg=rg\ --vimgrep\ -g\ *.[ch]\ $*',
-      \   'set path=C_AUTOSAR/**,C_Application/**,C_CDD/**,C_HvUnit/**,,',
-      \   'set tagcase=match',
-      \   'compiler ghs'
-      \  ],
-      \ 'RL78_data_flash': [
-      \   'command! -nargs=0 CtagsCommand Ctags -R main xcpbasicdrv mcur5f10agf sbcata663431 NvmDriver',
-      \   'nnoremap <C-CR> :<C-u>Rg -tc -tcmake <C-r><C-w> .',
-      \   'set path=main,xcpbasicdrv,mcur5f10agf,sbcata663431,NvmDriver,NvmDriver/**,,',
-      \   'set grepprg=rg\ --vimgrep\ -g\ *.[ch]\ $*',
-      \   'set relativenumber',
-      \   'compiler iar'
-      \ ],
-      \ 'RL78_evaluation': [
-      \   'command! -nargs=0 CtagsCommand Ctags -R main xcpbasicdrv mcur5f10agf sbcata663431',
-      \   'nnoremap <C-CR> :<C-u>Rg -tc -tcmake <C-r><C-w> .',
-      \   'set path=main,xcpbasicdrv,mcur5f10agf,sbcata663431,,',
-      \   'set grepprg=rg\ --vimgrep\ -g\ *.[ch]\ $*',
-      \   'set relativenumber',
-      \   'compiler iar'
-      \ ],
-      \ 'VIM':[
-      \   'cd ~\vimfiles',
-      \   'set path=pack/**,colors,after/**,,',
-      \   'set relativenumber'
-      \ ]}
+# DIRCFG
+g:dircfg =
+       {
+       'HVH1x0_2_0': [
+         'command! -nargs=0 CtagsCommand Ctags -R C_Application C_CDD C_AUTOSAR/Sources C:/Daten/Common_3P/comp_SBC_UJA116x/1.3.1',
+         'nnoremap <C-CR> :<C-u>Rg -tc -tcmake <C-r><C-w> . C:/Daten/Common_3P/comp_SBC_UJA116x/1.3.1<CR>',
+         'set grepprg=rg\ --vimgrep\ -g\ *.[ch]\ $*',
+         'set path=C_AUTOSAR/**,C_Application/**,C_CDD/**,C_HvUnit/**,,',
+         'set tagcase=match',
+         'compiler ghs'
+        ],
+       'RL78_data_flash': [
+         'command! -nargs=0 CtagsCommand Ctags -R main xcpbasicdrv mcur5f10agf sbcata663431 NvmDriver',
+         'nnoremap <C-CR> :<C-u>Rg -tc -tcmake <C-r><C-w> .',
+         'set path=main,xcpbasicdrv,mcur5f10agf,sbcata663431,NvmDriver,NvmDriver/**,,',
+         'set grepprg=rg\ --vimgrep\ -g\ *.[ch]\ $*',
+         'set relativenumber',
+         'compiler iar'
+       ],
+       'RL78_evaluation': [
+         'command! -nargs=0 CtagsCommand Ctags -R main xcpbasicdrv mcur5f10agf sbcata663431',
+         'nnoremap <C-CR> :<C-u>Rg -tc -tcmake <C-r><C-w> .',
+         'set path=main,xcpbasicdrv,mcur5f10agf,sbcata663431,,',
+         'set grepprg=rg\ --vimgrep\ -g\ *.[ch]\ $*',
+         'set relativenumber',
+         'compiler iar'
+       ],
+       'VIM': [
+         'cd ~\vimfiles',
+         'set path=pack/**,colors,after/**,,',
+         'set relativenumber'
+       ]}
 
-""" WORDY
+# WORDY
 
-" Define your own ring of dictionaries, overriding the default one in your .vimrc:
-let g:wordy#ring = [
-  \ 'weak',
-  \ ['being', 'passive-voice', ],
-  \ 'business-jargon',
-  \ 'weasel',
-  \ 'puffery',
-  \ ['problematic', 'redundant', ],
-  \ 'adjectives',
-  \ 'adverbs'
-  \ ]
+# Define your own ring of dictionaries, overriding the default one in your .vimrc:
+g:wordy#ring = [
+   'weak',
+   ['being', 'passive-voice', ],
+   'business-jargon',
+   'weasel',
+   'puffery',
+   ['problematic', 'redundant', ],
+   'adjectives',
+   'adverbs'
+   ]
 
-" You can navigate the ring with the following commands:
-" :NextWordy
-" :PrevWordy
+# You can navigate the ring with the following commands:
+# :NextWordy
+# :PrevWordy
 

--- a/vimrc
+++ b/vimrc
@@ -168,6 +168,8 @@ cnoremap <expr> <A-,> $USERPROFILE..g:path_sep..'vimfiles'..g:path_sep
 imap <C-CR> <C-]>
 cmap <C-CR> <C-]>
 
+nnoremap <PageDown> :cnext<CR>
+nnoremap <PageUp> :cprevious<CR>
 nnoremap <C-j> :cnext<CR>
 nnoremap <C-k> :cprevious<CR>
 nnoremap n nzzzv
@@ -194,7 +196,7 @@ set langmap=Ö\",ö:,ü{,ä},Ü[,Ä]
 
 " set leader and localleader keys, that works best for me
 let mapleader = " "
-let maplocalleader = "-"
+let maplocalleader = "+"
 
 """ quick note taking
 nnoremap <expr> <Leader>n ":drop "..strftime("~/Documents/Notes/note-%d-%m-%y.txt".."<CR>:setfiletype markdown<CR>")
@@ -215,9 +217,12 @@ nnoremap <Leader>c :clist!<CR>
 nnoremap <Leader>q :botright copen<CR>G
 nnoremap <Leader>Q :cclose<CR>
 
+""" zoom current buffer in seperate tab
+nnoremap <Leader>z :tabedit %<CR>
+nnoremap <Leader>x :tabclose<CR>
+
 """ command line abbreviations
 cabbrev e edit
-cabbrev t tabedit
 cabbrev f find
 cabbrev j tjump
 cabbrev b buffer