Update nvim config

dotfiles/.config/gtk-3.0/bookmarks

@@ -1,3 +1,4 @@
+file:///mnt/hdd/slococo/videos
 file:///home/slococo/.local/share/Trash Trash
 file:///home/slococo/Downloads Downloads
 file:///home/slococo/Documents Documents

dotfiles/.config/nvim/init.vim

@@ -1,4 +1,4 @@
-let mapleader ="\\"
+let mapleader =","
 
 if ! filereadable(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim"'))
     echo "Downloading junegunn/vim-plug to manage plugins..."
@@ -12,14 +12,13 @@ Plug 'tpope/vim-surround'
 Plug 'preservim/nerdtree'
 Plug 'junegunn/goyo.vim'
 Plug 'jreybert/vimagit'
-Plug 'lukesmithxyz/vimling'
 Plug 'vimwiki/vimwiki'
-Plug 'bling/vim-airline'
+Plug 'vim-airline/vim-airline'
 Plug 'tpope/vim-commentary'
 Plug 'ap/vim-css-color'
 Plug 'farmergreg/vim-lastplace'
 Plug 'jiangmiao/auto-pairs'
-Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' }
+" Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' }
 call plug#end()
 
 set bg=dark
@@ -30,15 +29,13 @@ set nohlsearch
 
 " Use this one if you want to use Middle click to paste copied text from vim
 set clipboard=unnamed
-
 " Use this one if you want to use primary clipboard! 
 " set clipboard=unnamedplus
-
 " Though for this we need xsel (https://github.com/neovim/neovim/issues/7945)
 
 " colorscheme delek
+" colorscheme vim
 
-" Some basics:
 nnoremap c "_c
 set nocompatible
 filetype plugin on
@@ -47,93 +44,77 @@ set clipboard=unnamed
 set number relativenumber
 set softtabstop=4
 set shiftwidth=4
-" Enable autocompletion:
 set wildmode=longest,list,full
-" Disables automatic commenting on newline:
+
 autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
 
-" Goyo plugin makes text more readable when writing prose:
+map <leader>f :Goyo \| set linebreak<CR>
-	map <leader>f :Goyo \| set bg=light \| set linebreak<CR>
 
-" Spell-check set to <leader>o, 'o' for 'orthography':
 map <leader>o :setlocal spell! spelllang=en_us<CR>
 
-" Splits open at the bottom and right, which is non-retarded, unlike vim defaults.
 set splitbelow splitright
 
-" Nerd tree
 map <leader>n :NERDTreeToggle<CR>
 autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
-    if has('nvim')
 let NERDTreeBookmarksFile = stdpath('data') . '/NERDTreeBookmarks'
-    else
+
-        let NERDTreeBookmarksFile = '~/.vim' . '/NERDTreeBookmarks'
+if !exists('g:airline_symbols')
+    let g:airline_symbols = {}
 endif
 
-" vimling:
+let g:airline_symbols.colnr = ' C:'
-	nm <leader>d :call ToggleDeadKeys()<CR>
+let g:airline_symbols.linenr = ' L:'
-	imap <leader>d <esc>:call ToggleDeadKeys()<CR>a
+let g:airline_symbols.maxlinenr = '☰ '
-	nm <leader>i :call ToggleIPA()<CR>
-	imap <leader>i <esc>:call ToggleIPA()<CR>a
-	nm <leader>q :call ToggleProse()<CR>
 
-" Shortcutting split navigation, saving a keypress:
+" ctrl-w<motion> where motion is h, j, k, or l. Also, you can use ctrl-ww to cycle between them
 map <C-h> <C-w>h
 map <C-j> <C-w>j
 map <C-k> <C-w>k
 map <C-l> <C-w>l
 
-" Replace ex mode with gq
 map Q gq
 
-" Check file in shellcheck:
 map <leader>s :!clear && shellcheck %<CR>
 
-" Open my bibliography file in split
-"	map <leader>b :vsp<space>$BIB<CR>
-"	map <leader>r :vsp<space>$REFER<CR>
-
-" Replace all is aliased to S.
 nnoremap S :%s//g<Left><Left>
 
-" Compile document, be it groff/LaTeX/markdown/etc.
 map <leader>c :w! \| !compiler "<c-r>%"<CR>
 
-" Open corresponding .pdf/.html or preview
 map <leader>p :!opout <c-r>%<CR><CR>
 
-" Runs a script that cleans out tex build files whenever I close out of a .tex file.
 autocmd VimLeave *.tex !texclear %
 
-" Ensure files are read as what I want:
+cabbrev w!! execute 'silent! write !sudo tee % >/dev/null' <bar> edit!
-"	let g:vimwiki_ext2syntax = {'.Rmd': 'markdown', '.rmd': 'markdown','.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'}
-"	map <leader>v :VimwikiIndex
-"	let g:vimwiki_list = [{'path': '~/vimwiki', 'syntax': 'markdown', 'ext': '.md'}]
-"	autocmd BufRead,BufNewFile /tmp/calcurse*,~/.calcurse/notes/* set filetype=markdown
-"	autocmd BufRead,BufNewFile *.ms,*.me,*.mom,*.man set filetype=groff
-"	autocmd BufRead,BufNewFile *.tex set filetype=tex
 
-" Save file as sudo on files that require root permission
+" autocmd BufWritePre * let currPos = getpos(".")
-	cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' <bar> edit!
-
-" Enable Goyo by default for mutt writing
-"	autocmd BufRead,BufNewFile /tmp/neomutt* let g:goyo_width=80
-"	autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo | set bg=light
-"	autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo\|x!<CR>
-"	autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q!<CR>
-
-" Automatically deletes all trailing whitespace and newlines at end of file on save.
 " autocmd BufWritePre * %s/\s\+$//e
-"	autocmd BufWritepre * %s/\n\+\%$//e
+" autocmd BufWritePre * %s/\n\+\%$//e
+" autocmd BufWritePre *.[ch] %s/\%$/\r/e " add trailing newline for ANSI C standard
+" autocmd BufWritePre *neomutt* %s/^--$/-- /e " dash-dash-space signature delimiter in emails
+" autocmd BufWritePre * cal cursor(currPos[1], currPos[2])
 
-" When shortcut files are updated, renew bash and ranger configs with new material:
-"	autocmd BufWritePost bm-files,bm-dirs !shortcuts
-" Run xrdb whenever Xdefaults or Xresources are updated.
 autocmd BufWritePost *Xresources,*Xdefaults,*xresources,*xdefaults !xrdb %
 
-" Turns off highlighting on the bits of code that are changed, so the line that is changed is highlighted but the actual text that has changed stands out on the line and is readable.
 if &diff
 highlight! link DiffText MatchParen
 endif
 
 let g:livepreview_previewer = 'zathura'
+
+let s:hidden_all = 0
+function! ToggleHiddenAll()
+    if s:hidden_all  == 0
+        let s:hidden_all = 1
+        set noshowmode
+        set noruler
+        set laststatus=0
+        set noshowcmd
+    else
+        let s:hidden_all = 0
+        set showmode
+        set ruler
+        set laststatus=2
+        set showcmd
+    endif
+endfunction
+nnoremap <leader>h :call ToggleHiddenAll()<CR>