diff --git a/dotfiles/.config/gtk-3.0/bookmarks b/dotfiles/.config/gtk-3.0/bookmarks index ea7fce2..59c969d 100644 --- a/dotfiles/.config/gtk-3.0/bookmarks +++ b/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 diff --git a/dotfiles/.config/nvim/init.vim b/dotfiles/.config/nvim/init.vim index 2d1c1dd..383d830 100644 --- a/dotfiles/.config/nvim/init.vim +++ b/dotfiles/.config/nvim/init.vim @@ -1,10 +1,10 @@ -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..." - silent !mkdir -p ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/ - silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim - autocmd VimEnter * PlugInstall + echo "Downloading junegunn/vim-plug to manage plugins..." + silent !mkdir -p ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/ + silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim + autocmd VimEnter * PlugInstall endif call plug#begin(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/plugged"')) @@ -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,110 +29,92 @@ 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 delek +" colorscheme vim -" Some basics: - nnoremap c "_c - set nocompatible - filetype plugin on - syntax on - set encoding=utf-8 - 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 +nnoremap c "_c +set nocompatible +filetype plugin on +syntax on +set encoding=utf-8 +set number relativenumber +set softtabstop=4 +set shiftwidth=4 +set wildmode=longest,list,full -" Goyo plugin makes text more readable when writing prose: - map f :Goyo \| set bg=light \| set linebreak +autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o -" Spell-check set to o, 'o' for 'orthography': - map o :setlocal spell! spelllang=en_us +map f :Goyo \| set linebreak -" Splits open at the bottom and right, which is non-retarded, unlike vim defaults. - set splitbelow splitright +map o :setlocal spell! spelllang=en_us -" Nerd tree - map n :NERDTreeToggle - 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' - endif +set splitbelow splitright -" vimling: - nm d :call ToggleDeadKeys() - imap d :call ToggleDeadKeys()a - nm i :call ToggleIPA() - imap i :call ToggleIPA()a - nm q :call ToggleProse() +map n :NERDTreeToggle +autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif +let NERDTreeBookmarksFile = stdpath('data') . '/NERDTreeBookmarks' -" Shortcutting split navigation, saving a keypress: - map h - map j - map k - map l +if !exists('g:airline_symbols') + let g:airline_symbols = {} +endif -" Replace ex mode with gq - map Q gq +let g:airline_symbols.colnr = ' C:' +let g:airline_symbols.linenr = ' L:' +let g:airline_symbols.maxlinenr = '☰ ' -" Check file in shellcheck: - map s :!clear && shellcheck % +" ctrl-w where motion is h, j, k, or l. Also, you can use ctrl-ww to cycle between them +map h +map j +map k +map l -" Open my bibliography file in split -" map b :vsp$BIB -" map r :vsp$REFER +map Q gq -" Replace all is aliased to S. - nnoremap S :%s//g +map s :!clear && shellcheck % -" Compile document, be it groff/LaTeX/markdown/etc. - map c :w! \| !compiler "%" +nnoremap S :%s//g -" Open corresponding .pdf/.html or preview - map p :!opout % +map c :w! \| !compiler "%" -" Runs a script that cleans out tex build files whenever I close out of a .tex file. - autocmd VimLeave *.tex !texclear % +map p :!opout % -" Ensure files are read as what I want: -" let g:vimwiki_ext2syntax = {'.Rmd': 'markdown', '.rmd': 'markdown','.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'} -" map 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 +autocmd VimLeave *.tex !texclear % -" Save file as sudo on files that require root permission - cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' edit! +cabbrev w!! execute 'silent! write !sudo tee % >/dev/null' 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! -" autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q! +" autocmd BufWritePre * let currPos = getpos(".") +" autocmd BufWritePre * %s/\s\+$//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]) -" Automatically deletes all trailing whitespace and newlines at end of file on save. -" autocmd BufWritePre * %s/\s\+$//e -" autocmd BufWritepre * %s/\n\+\%$//e +autocmd BufWritePost *Xresources,*Xdefaults,*xresources,*xdefaults !xrdb % -" 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 +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 h :call ToggleHiddenAll()