From b15437514ed4ab9531a5261982a06f7f5201f7f9 Mon Sep 17 00:00:00 2001 From: Yigit Sever Date: Tue, 7 Apr 2020 18:36:18 +0300 Subject: vimrc changes --- .config/nvim/init.vim | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to '.config/nvim/init.vim') diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index fb68190..c4eb3b4 100755 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -55,7 +55,7 @@ Plug 'machakann/vim-sandwich' Plug 'wellle/targets.vim' " indentation level text object 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' @@ -65,6 +65,8 @@ Plug 'junegunn/vim-peekaboo' Plug 'lfv89/vim-interestingwords' " swap delimited items Plug 'machakann/vim-swap' +" highliht occurances of word +Plug 'lfv89/vim-interestingwords' " reopen files at your last edit position Plug 'farmergreg/vim-lastplace' @@ -182,7 +184,7 @@ if executable('rg') set grepprg=rg\ --vimgrep\ --no-heading\ --smart-case endif -set diffopt+=internal,algorithm:patience +set diffopt=algorithm:patience " }}} @@ -230,8 +232,8 @@ nnoremap l " Disable highlight when is pressed nnoremap :noh -" Space will toggle folds! -nnoremap za +" Space used to toggle folds, now it's x (because x is d) +nnoremap "_x " checkmarks on vimwiki nmap v VimwikiToggleListItem -- cgit v1.2.3-70-g09d2 From b75d7a2b07e1fd189084da3ffafeab090278e95d Mon Sep 17 00:00:00 2001 From: Yigit Sever Date: Sat, 9 May 2020 14:44:19 +0300 Subject: bunch of vimrc changes --- .config/nvim/init.vim | 52 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 19 deletions(-) (limited to '.config/nvim/init.vim') diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index c4eb3b4..3ea30d7 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,7 +29,7 @@ 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' @@ -42,31 +45,25 @@ 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 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 "/ Plug 'junegunn/vim-peekaboo' " use k to highlight multiple words Plug 'lfv89/vim-interestingwords' -" swap delimited items +" swap delimited items using g>, g< Plug 'machakann/vim-swap' -" highliht occurances of word -Plug 'lfv89/vim-interestingwords' " reopen files at your last edit position Plug 'farmergreg/vim-lastplace' @@ -74,7 +71,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 @@ -104,7 +101,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 "}}} @@ -124,6 +120,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. @@ -197,6 +206,10 @@ colorscheme onedark "{{{ 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 nnoremap :TagbarToggle " Open NERDTree @@ -326,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 = "" +let g:UltiSnipsEnableSnipMate = "1" "}}} "{{{ vim-startify @@ -370,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 -- cgit v1.2.3-70-g09d2 From 27b5443fe21bdb2d1f48405501c683e6d077cbbd Mon Sep 17 00:00:00 2001 From: Yigit Sever Date: Tue, 12 May 2020 12:38:28 +0300 Subject: migrate to moonfly --- .config/kitty/kitty.conf | 47 ++++++++++++++++++------------------ .config/nvim/init.vim | 10 ++++---- .config/zathura/zathurarc | 61 +++++++++++++++++++++++++++-------------------- 3 files changed, 64 insertions(+), 54 deletions(-) (limited to '.config/nvim/init.vim') diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 08a2ab7..7629b57 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -78,29 +78,30 @@ inactive_tab_font_style normal #: Color scheme {{{ -# Dark - -foreground #979eab -background #282c34 -cursor #cccccc -color0 #282c34 -color1 #e06c75 -color2 #98c379 -color3 #e5c07b -color4 #61afef -color5 #be5046 -color6 #56b6c2 -color7 #979eab -color8 #393e48 -color9 #d19a66 -color10 #56b6c2 -color11 #e5c07b -color12 #61afef -color13 #be5046 -color14 #56b6c2 -color15 #abb2bf -selection_foreground #282c34 -selection_background #979eab +# moonfly +# https://github.com/bluz71/vim-moonfly-colors/blob/master/terminal_themes/kitty-theme.conf + +background #080808 +foreground #b2b2b2 +cursor #9e9e9e +color0 #373c40 +color1 #ff5454 +color2 #8cc85f +color3 #e3c78a +color4 #80a0ff +color5 #d183e8 +color6 #7ee0ce +color7 #de935f +color8 #f09479 +color9 #f74782 +color10 #42cf89 +color11 #cfcfb0 +color12 #78c2ff +color13 #ae81ff +color14 #85dc85 +color15 #e2637f +selection_background #b2ceee +selection_foreground #080808 #: }}} diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 3ea30d7..36e62c0 100755 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -34,10 +34,11 @@ 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' @@ -198,9 +199,9 @@ set diffopt=algorithm:patience " }}} "{{{Look and Feel -let g:onedark_terminal_italics=1 set termguicolors -colorscheme onedark +colorscheme moonfly +let g:moonflyUndercurls = 0 " }}} @@ -302,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 = {} diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index 5ac5022..a0759f3 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -1,39 +1,48 @@ -set selection-clipboard clipboard -set incremental-search "true" +set selection-clipboard "clipboard" +set incremental-search "true" +set guioptions "shv" -set default-bg "#282c34" -set default-fg "#353b45" +set default-fg "#9e9e9e" +set default-bg "#0e0e0e" -set statusbar-fg "#c8ccd4" -set statusbar-bg "#3e4451" +set recolor-darkcolor "#b2b2b2" +set recolor-lightcolor "#080808" -set inputbar-bg "#282c34" -set inputbar-fg "#c8ccd4" +set statusbar-fg "#b2b2b2" +set statusbar-bg "#080808" -set notification-bg "#282c34" -set notification-fg "#c8ccd4" +set inputbar-fg "#9e9e9e" +set inputbar-bg "#080808" -set notification-error-bg "#282c34" -set notification-error-fg "#e06c75" +set notification-fg "#c8ccd4" +set notification-bg "#282c34" -set notification-warning-bg "#282c34" -set notification-warning-fg "#e06c75" +set notification-error-fg "#ff5454" +set notification-error-bg "#080808" -set highlight-color "#e5c07b" -set highlight-active-color "#61afef" +set notification-warning-fg "#e3c78a" +set notification-warning-bg "#080808" -set completion-bg "#353b45" -set completion-fg "#61afef" +set highlight-color "#e5c07b" +set highlight-active-color "#ff5454" -set completion-highlight-fg "#c8ccd4" -set completion-highlight-bg "#61afef" +set completion-fg "#80a0ff" +set completion-bg "#080808" -set recolor-lightcolor "#282c34" -set recolor-darkcolor "#b6bdca" +set completion-highlight-fg "#080808" +set completion-highlight-bg "#80a0ff" -set recolor "true" -set recolor-keephue "false" +set tabbar-fg "#f74782" +set tabbar-bg "#080808" -map feedkeys ":write /home/yigit/Downloads/toPrint/toPrint_staging" -set synctex true +set index-fg "#9e9e9e" +set index-bg "#080808" +set index-active-fg "#080808" +set index-active-bg "#8cc85f" + +set recolor "true" +set recolor-keephue "false" +set synctex "true" set syntex-editor-command "nvr --remote +%line %file"" + +map feedkeys ":write /home/yigit/Downloads/toPrint/toPrint_staging" -- cgit v1.2.3-70-g09d2