Compare commits

...

2 commits

2 changed files with 6 additions and 16 deletions

View file

@ -11,7 +11,7 @@
" If you would like to use another vi clone such as Elvis or Vile " If you would like to use another vi clone such as Elvis or Vile
" you will need to change this setting. " you will need to change this setting.
set vicmd=vim set vicmd=nvim
" This makes vifm perform file operations on its own instead of relying on " This makes vifm perform file operations on its own instead of relying on
" standard utilities like `cp`. While using `cp` and alike is a more universal " standard utilities like `cp`. While using `cp` and alike is a more universal
@ -128,12 +128,12 @@ mark h ~/
" %m run the command in a menu window " %m run the command in a menu window
command! df df -h %m 2> /dev/null command! df df -h %m 2> /dev/null
command! diff vim -d %f %F command! diff nvim -d %f %F
command! zip zip -r %c.zip %f command! zip zip -r %c.zip %f
command! run !! ./%f command! run !! ./%f
command! make !!make %a command! make !!make %a
command! mkcd :mkdir %a | cd %a command! mkcd :mkdir %a | cd %a
command! vgrep vim "+grep %a" command! vgrep nvim "+grep %a"
command! reload :write | restart full command! reload :write | restart full
" ------------------------------------------------------------------------------ " ------------------------------------------------------------------------------
@ -316,11 +316,6 @@ nnoremap S :sort<cr>
nnoremap w :view<cr> nnoremap w :view<cr>
vnoremap w :view<cr>gv vnoremap w :view<cr>gv
" Open file in existing instance of gvim
nnoremap o :!gvim --remote-tab-silent %f<cr>
" Open file in new instance of gvim
nnoremap O :!gvim %f<cr>
" Open file in the background using its default program " Open file in the background using its default program
nnoremap gb :file &<cr>l nnoremap gb :file &<cr>l
@ -354,8 +349,6 @@ nnoremap ,t :!xterm &<cr>
" Open editor to edit vifmrc and apply settings after returning to vifm " Open editor to edit vifmrc and apply settings after returning to vifm
nnoremap ,c :write | edit $MYVIFMRC | restart full<cr> nnoremap ,c :write | edit $MYVIFMRC | restart full<cr>
" Open gvim to edit vifmrc
nnoremap ,C :!gvim --remote-tab-silent $MYVIFMRC &<cr>
" Toggle wrap setting on ,w key " Toggle wrap setting on ,w key
nnoremap ,w :set wrap!<cr> nnoremap ,w :set wrap!<cr>

View file

@ -46,12 +46,9 @@ in
"json" "json"
"yaml" "yaml"
"markdown" "markdown"
"html" "html,htmldjango"
"css" "css,scss,less"
"scss" "sql,psql"
"less"
"sql"
"psql"
]; ];
}) })
]; ];