config/nvim: Update plugins & indentation & commenting
This commit is contained in:
parent
840d4decfb
commit
34a5261eed
|
@ -5,7 +5,8 @@ set undofile
|
||||||
set wildmode=longest,list,full " Auto-completion for cmdline
|
set wildmode=longest,list,full " Auto-completion for cmdline
|
||||||
set clipboard+=unnamedplus " Merge with system clipboard
|
set clipboard+=unnamedplus " Merge with system clipboard
|
||||||
|
|
||||||
set tabstop=4 shiftwidth=4 " Indentation
|
set shiftwidth=2 " Indentation
|
||||||
|
"set shiftwidth=4 tabstop = 4 " Indentation for programming
|
||||||
|
|
||||||
" visuals
|
" visuals
|
||||||
set number relativenumber " Relative line numbering on the left
|
set number relativenumber " Relative line numbering on the left
|
||||||
|
@ -34,8 +35,10 @@ set foldopen+=jump " Automatically open folds on jump
|
||||||
" FILETYPES
|
" FILETYPES
|
||||||
syntax on
|
syntax on
|
||||||
filetype plugin on
|
filetype plugin on
|
||||||
autocmd FileType json syntax match Comment +\/\/.\+$+ " Comment highlighting in JSON
|
" comments
|
||||||
autocmd Filetype * set formatoptions-=o " Don't automatically comment on o
|
autocmd Filetype * setlocal formatoptions-=o | setlocal formatoptions+=qn1jr " Change comment behavior
|
||||||
|
autocmd Filetype json syntax match Comment +\/\/.\+$+ " Comment highlighting in JSON
|
||||||
|
autocmd Filetype markdown let &comments = "b:*,b:-,b:+," . &comments
|
||||||
" custom hardcoded types
|
" custom hardcoded types
|
||||||
autocmd BufRead,BufNewFile $CONFIG_SHELLS/*,$CONFIG_ZSH/* setlocal filetype=zsh
|
autocmd BufRead,BufNewFile $CONFIG_SHELLS/*,$CONFIG_ZSH/* setlocal filetype=zsh
|
||||||
autocmd BufRead $XDG_CONFIG_HOME/yadm/bootstrap setlocal filetype=sh
|
autocmd BufRead $XDG_CONFIG_HOME/yadm/bootstrap setlocal filetype=sh
|
||||||
|
|
|
@ -38,7 +38,6 @@ nnoremap gl $
|
||||||
nnoremap gh 0
|
nnoremap gh 0
|
||||||
nnoremap gk H
|
nnoremap gk H
|
||||||
nnoremap gj L
|
nnoremap gj L
|
||||||
nnoremap gt gg
|
|
||||||
nnoremap gb G
|
nnoremap gb G
|
||||||
|
|
||||||
" Enable and disable auto comment
|
" Enable and disable auto comment
|
||||||
|
|
|
@ -55,13 +55,15 @@ Plug 'nathanaelkane/vim-indent-guides'
|
||||||
let g:indent_guides_enable_on_vim_startup = 1
|
let g:indent_guides_enable_on_vim_startup = 1
|
||||||
|
|
||||||
" Integrations
|
" Integrations
|
||||||
Plug 'xerus2000/vim-dokuwiki'
|
Plug 'dhruvasagar/vim-table-mode'
|
||||||
|
let g:table_mode_corner='|'
|
||||||
Plug 'neoclide/coc.nvim', {'branch': 'release' }
|
Plug 'neoclide/coc.nvim', {'branch': 'release' }
|
||||||
Plug 'udalov/kotlin-vim'
|
Plug 'udalov/kotlin-vim'
|
||||||
Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app & yarn install' }
|
Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app & yarn install' }
|
||||||
Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } }
|
Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } }
|
||||||
Plug 'mipmip/vim-scimark' " Edit markdown tables
|
Plug 'mipmip/vim-scimark' " Edit markdown tables
|
||||||
Plug 'APZelos/blamer.nvim' " Inline git blame
|
Plug 'APZelos/blamer.nvim' " Inline git blame
|
||||||
|
" Plug 'xerus2000/vim-dokuwiki'
|
||||||
|
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
|
|
|
@ -55,6 +55,8 @@ let g:firenvim_config = {
|
||||||
\ '.*docs\.google\.com.*': { 'priority': 9, 'takeover': 'never', },
|
\ '.*docs\.google\.com.*': { 'priority': 9, 'takeover': 'never', },
|
||||||
\ '.*mail\.protonmail\.com.*': { 'priority': 9, 'takeover': 'never', },
|
\ '.*mail\.protonmail\.com.*': { 'priority': 9, 'takeover': 'never', },
|
||||||
\ '.*cloud.atomtoast.xyz.*': { 'priority': 9, 'takeover': 'never', },
|
\ '.*cloud.atomtoast.xyz.*': { 'priority': 9, 'takeover': 'never', },
|
||||||
|
\ 'https://bigbluebutton.*': { 'priority': 9, 'takeover': 'never', },
|
||||||
|
\ 'https://dhall-lang.org.*': { 'priority': 9, 'takeover': 'never', },
|
||||||
\ }
|
\ }
|
||||||
\ }
|
\ }
|
||||||
if exists('g:started_by_firenvim')
|
if exists('g:started_by_firenvim')
|
||||||
|
|
Loading…
Reference in New Issue