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

3 files changed, 77 insertions, 44 deletions

diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 64864cb..96f9e05 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -55,7 +55,7 @@ remember_window_size  no
 initial_window_width  80c
 initial_window_height 24c
 
-window_padding_width 5.0
+window_padding_width 0.0
 
 #: }}}
 
@@ -75,27 +75,59 @@ inactive_tab_font_style normal
 #: }}}
 
 #: Color scheme {{{
-foreground              #d8dee9
-background              #2e3440
-selection_foreground    #2e3440
-selection_background    #d8dee9
-
-color0                  #3b4252
-color1                  #bf616a
-color2                  #a3be8c
-color3                  #ebcb8b
-color4                  #81a1c1
-color5                  #b48ead
-color6                  #88c0d0
-color7                  #e5e9f0
-color8                  #4c566a
-color9                  #bf616a
-color10                 #a3be8c
-color11                 #ebcb8b
-color12                 #81a1c1
-color13                 #b48ead
-color14                 #8fbcbb
-color15                 #eceff4
+
+# Dark
+
+background              #002b36
+foreground              #839496
+cursor                  #93a1a1
+
+selection_background    #81908f
+selection_foreground    #002831
+
+color0                  #073642
+color1                  #dc322f
+color2                  #859900
+color3                  #b58900
+color4                  #268bd2
+color5                  #d33682
+color6                  #2aa198
+color7                  #eee8d5
+color9                  #cb4b16
+color8                  #002b36
+color10                 #586e75
+color11                 #657b83
+color12                 #839496
+color13                 #6c71c4
+color14                 #93a1a1
+color15                 #fdf6e3
+
+# Light
+
+#background              #fdf6e3
+#foreground              #657b83
+#cursor                  #586e75
+#
+#selection_background    #475b62
+#selection_foreground    #eae3cb
+#
+#color0                #073642
+#color8                #002b36
+#color1                #dc322f
+#color9                #cb4b16
+#color2                #859900
+#color10               #586e75
+#color3                #b58900
+#color11               #657b83
+#color4                #268bd2
+#color12               #839496
+#color5                #d33682
+#color13               #6c71c4
+#color6                #2aa198
+#color14               #93a1a1
+#color7                #eee8d5
+#color15               #fdf6e3
+
 
 #: }}}
 
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index e529898..0b72413 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -29,10 +29,12 @@ Plug 'majutsushi/tagbar'
 Plug 'bling/vim-airline'
 
 " color themes
-Plug 'arcticicestudio/nord-vim'
-Plug 'aonemd/kuroi.vim'
-Plug 'ayu-theme/ayu-vim'
-Plug 'lifepillar/vim-gruvbox8'
+Plug 'lifepillar/vim-solarized8'
+
+" Plug 'arcticicestudio/nord-vim'
+" Plug 'aonemd/kuroi.vim'
+" Plug 'ayu-theme/ayu-vim'
+" Plug 'lifepillar/vim-gruvbox8'
 
 "Personal wiki
 Plug 'vimwiki/vimwiki'
@@ -42,13 +44,15 @@ Plug 'junegunn/goyo.vim'
 Plug 'lervag/vimtex'
 
 "visual display of indent levels
-Plug 'nathanaelkane/vim-indent-guides'
+Plug 'thaerkh/vim-indentguides'
 "text alignment
 Plug 'godlygeek/tabular'
 "color code highlight
 Plug 'chrisbra/Colorizer'
 "move selections up and down
 Plug 'matze/vim-move'
+" search/select/edit sandwiched textobjects (vim-surround)
+Plug 'machakann/vim-sandwich'
 
 "folding ledger files
 Plug 'ledger/vim-ledger'
@@ -70,8 +74,6 @@ Plug 'svermeulen/vim-yoink'
 
 "enable repeating supported plugin maps with '.'
 Plug 'tpope/vim-repeat'
-"quoting/parenthesizing made simple
-Plug 'tpope/vim-surround'
 "pairs of handy bracket mappings
 Plug 'tpope/vim-unimpaired'
 "git wrapper
@@ -160,21 +162,21 @@ if executable('rg')
     set grepprg=rg\ --vimgrep\ --no-heading
 endif
 
+let g:indentguides_ignorelist = ['text', 'tex', 'vimwiki']
+
 " }}}
 
 "{{{Look and Feel
 
 set termguicolors
 
-let g:nord_underline = 1
-let g:nord_italic = 1
-let g:nord_italic_comments = 1
-let g:nord_cursor_line_number_background = 1
+" let g:nord_underline = 1
+" let g:nord_italic = 1
+" let g:nord_italic_comments = 1
+" let g:nord_cursor_line_number_background = 1
+" let ayucolor="light"
 
-let ayucolor="light"
-
-colorscheme nord
-" colorscheme ayu
+colorscheme solarized8
 
 " }}}
 
@@ -213,8 +215,8 @@ nnoremap <silent> <Leader><cr> :noh<cr>
 nnoremap <space> za
 " Search mappings: These will make it so that going to the next one in a
 " search will center on the line it's found in.
-map N Nzz
-map n nzz
+" map N Nzz
+" map n nzz
 
 nnoremap <leader>d :WebsterSearch(expand('<cWORD>'))<cr>
 vnoremap <leader>d :<c-u>WebsterSearch(@*)<cr>
@@ -222,6 +224,10 @@ vnoremap <leader>d :<c-u>WebsterSearch(@*)<cr>
 " checkmarks on vimwiki
 nmap <Leader>v <Plug>VimwikiToggleListItem
 
+nmap ` <Plug>Sneak_s
+nmap <leader>` <Plug>Sneak_S
+nnoremap ' `
+
 """""""""""""""""""""""""""
 "  yanks/registers/clips  "
 """""""""""""""""""""""""""
diff --git a/.zshrc b/.zshrc
index e7e4b09..e84e3cb 100644
--- a/.zshrc
+++ b/.zshrc
@@ -123,11 +123,6 @@ alias gg="exit"
 alias ledger="ledger -f ~/Dropbox/ledger.dat"
 alias report="report -f ~/Dropbox/ledger.dat"
 
-mkcdir () {
-    mkdir -p -- "$1" &&
-        cd -P -- "$1"
-}
-
 RANGER_LOAD_DEFAULT_RC=FALSE; export RANGER_LOAD_DEFAULT_RC
 
 export GPG_TTY=$(tty)