Merge branch 'master' of 207.154.210.186:/home/yigit/dots

3 files changed, 45 insertions, 26 deletions

diff --git a/.config/nvim/after/plugin/abolish.vim b/.config/nvim/after/plugin/abolish.vim
index e313ecb..a295819 100644
--- a/.config/nvim/after/plugin/abolish.vim
+++ b/.config/nvim/after/plugin/abolish.vim
@@ -12,3 +12,4 @@ iabbrev <silent> todaydatetime <C-R>=strftime("%F %T")<CR>
 iabbrev <silent> todaydate <C-R>=strftime("%F")<CR>
 iabbrev <silent> pwn English Princeton WordNet
 iabbrev <silent> omw Open Multilingual WordNet
+iabbrev <silent> BC blockchain
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index fb68190..36e62c0 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,6 +1,9 @@
 "{{{ Plugs
 call plug#begin('~/.local/share/nvim/plugged')
 
+" latex " had to move vimtex to top to avoid a difficult error
+Plug 'lervag/vimtex'
+
 " completion
 Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 Plug 'lionawurscht/deoplete-biblatex'
@@ -26,15 +29,16 @@ Plug 'tmsvg/pear-tree'
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 Plug 'junegunn/fzf.vim'
 
-" tree explorer
+" tree explorer, i don't use this as much but don't like netrw either
 Plug 'scrooloose/nerdtree'
 " displays tags ordered by scope
 Plug 'majutsushi/tagbar'
 " status/tabline
-Plug 'bling/vim-airline'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
 
 " color theme of $CURRENT_YEAR
-Plug 'joshdick/onedark.vim'
+Plug 'bluz71/vim-moonfly-colors'
 
 " Personal wiki
 Plug 'vimwiki/vimwiki'
@@ -42,28 +46,24 @@ Plug 'vimwiki/vimwiki'
 Plug 'junegunn/goyo.vim'
 " highlights the current paragraph
 Plug 'junegunn/limelight.vim'
-" latex
-Plug 'lervag/vimtex'
 
-" text alignment
+" text alignment \w :Tab
 Plug 'godlygeek/tabular'
-" move selections up and down
+" move selections up and down with alt+[j,k]
 Plug 'matze/vim-move'
-" search/select/edit sandwiched textobjects
+" surround text objects; sa, sr and sd
 Plug 'machakann/vim-sandwich'
 " provide additional text objects
 Plug 'wellle/targets.vim'
-" indentation level text object
+" indentation level text object, ia, ii
 Plug 'michaeljsmith/vim-indent-object'
-" visual feedback for substitute
+" visual feedback for substitute holy shit this is amazing
 Plug 'markonm/traces.vim'
-" insert mode completions from tmux panes
-Plug 'wellle/tmux-complete.vim'
 " see the contents of registers on "/<CTRL-R>
 Plug 'junegunn/vim-peekaboo'
 " use <leader>k to highlight multiple words
 Plug 'lfv89/vim-interestingwords'
-" swap delimited items
+" swap delimited items using g>, g<
 Plug 'machakann/vim-swap'
 
 " reopen files at your last edit position
@@ -72,7 +72,7 @@ Plug 'farmergreg/vim-lastplace'
 Plug 'airblade/vim-gitgutter'
 " Conflict merger
 Plug 'christoomey/vim-conflicted'
-" jump to location by 2 characters
+" jump to location by 2 characters, `
 Plug 'justinmk/vim-sneak'
 
 " splits delete into cut and delete
@@ -102,7 +102,6 @@ Plug 'tpope/vim-dispatch'
 " fancy start screen
 Plug 'mhinz/vim-startify'
 Plug 'ryanoasis/vim-devicons' " asks to be placed last, sure
-
 call plug#end()            " required
 
 "}}}
@@ -122,6 +121,19 @@ autocmd VimResized * :wincmd =
 autocmd FileType markdown,tex setlocal spell
 "}}}
 
+" Functions {{{
+function! CreatePaper(citekey)
+    exe "e! " . fnameescape("~/Nextcloud/personal_wiki/papers/" . a:citekey . ".wiki")
+
+    let l:timestap="Report Created at: " . strftime("%c")
+    let l:text="= Came From =\n\n= Takeaways =\n\n= Might Go To =\n\n"
+
+    put! =l:timestap
+    put  =l:text
+
+endfunction
+" }}} Function "
+
 "{{{Misc Settings
 
 " Use deoplete.
@@ -182,19 +194,23 @@ if executable('rg')
     set grepprg=rg\ --vimgrep\ --no-heading\ --smart-case
 endif
 
-set diffopt+=internal,algorithm:patience
+set diffopt=algorithm:patience
 
 " }}}
 
 "{{{Look and Feel
-let g:onedark_terminal_italics=1
 set termguicolors
-colorscheme onedark
+colorscheme moonfly
+let g:moonflyUndercurls = 0
 
 " }}}
 
 "{{{ Mappings
 
+" If you like "Y" to work from the cursor to the end of line (which is more
+" logical, but not Vi-compatible)
+map Y y$
+
 " Open the TagBar Plugin <F3>
 nnoremap <silent> <F3> :TagbarToggle<CR>
 " Open NERDTree <F4>
@@ -230,8 +246,8 @@ nnoremap <C-l> <C-w>l
 
 " Disable highlight when <leader><cr> is pressed
 nnoremap <silent> <Leader><cr> :noh<cr>
-" Space will toggle folds!
-nnoremap <space> za
+" Space used to toggle folds, now it's x (because x is d)
+nnoremap <space> "_x
 
 " checkmarks on vimwiki
 nmap <Leader>v <Plug>VimwikiToggleListItem
@@ -287,7 +303,6 @@ let g:tagbar_width = 25
 
 "{{{ Airline
 let g:airline_powerline_fonts = 1
-let g:airline_theme='onedark'
 let g:airline#extensions#tabline#formatter = 'unique_tail'
 let g:airline#extensions#tabline#enabled = 1
 let g:airline_mode_map = {}
@@ -324,11 +339,12 @@ let g:ledger_fillstring = '   ~'
 
 "{{{ UltiSnips
 set runtimepath+=~/.vim/my-snippets/
-let g:UltiSnipsEditSplit="vertical"
-let g:UltiSnipsSnippetsDir=$HOME.'/.vim/my-snippets/UltiSnips'
+let g:UltiSnipsEditSplit = "vertical"
+let g:UltiSnipsSnippetsDir = $HOME.'/.vim/my-snippets/UltiSnips'
 
 " ctrl + l expands the snippet, c + j/k navigates placeholders
 let g:UltiSnipsExpandTrigger = "<C-l>"
+let g:UltiSnipsEnableSnipMate = "1"
 "}}}
 
 "{{{ vim-startify
@@ -368,10 +384,10 @@ let g:vimwiki_global_ext = 0
 "}}}
 
 " {{{ vimtex
-let g:vimtex_view_method = 'zathura'
+let g:vimtex_view_method='zathura'
 let g:tex_flavor='latex'
-let g:vimtex_quickfix_mode = 0
-let g:polyglot_disabled = ['latex', 'tex', 'ledger']
+let g:vimtex_quickfix_mode=0
+let g:polyglot_disabled=['latex', 'tex', 'ledger']
 " }}}
 
 " {{{ Gutentags
diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add
index 33ac00d..c78ddf8 100644
--- a/.config/nvim/spell/en.utf-8.add
+++ b/.config/nvim/spell/en.utf-8.add
@@ -43,3 +43,5 @@ unsecure
 replaceability
 Kerberos
 IoT
+Blockchain
+blockchain