summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYigit Sever2019-08-02 14:29:29 +0300
committerYigit Sever2019-08-02 14:29:29 +0300
commitd394d6e3922a664606ba778cf350f1d1634f8c2a (patch)
tree11b353477bdcd99d41d88b8a82bfe27060576e36
parent6dbdaed9e2586d8198105fcbb73610aff741d404 (diff)
parent332fd9fbdd6ce75915ee31a31cbf81e1e0b260ed (diff)
downloaddotfiles-d394d6e3922a664606ba778cf350f1d1634f8c2a.tar.gz
dotfiles-d394d6e3922a664606ba778cf350f1d1634f8c2a.tar.bz2
dotfiles-d394d6e3922a664606ba778cf350f1d1634f8c2a.zip
Merge branch 'master' of 207.154.210.186:/home/yigit/dots
-rw-r--r--.config/kitty/kitty.conf76
-rwxr-xr-x.config/nvim/init.vim40
-rw-r--r--.zshrc5
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
55initial_window_width 80c 55initial_window_width 80c
56initial_window_height 24c 56initial_window_height 24c
57 57
58window_padding_width 5.0 58window_padding_width 0.0
59 59
60#: }}} 60#: }}}
61 61
@@ -75,27 +75,59 @@ inactive_tab_font_style normal
75#: }}} 75#: }}}
76 76
77#: Color scheme {{{ 77#: Color scheme {{{
78foreground #d8dee9 78
79background #2e3440 79# Dark
80selection_foreground #2e3440 80
81selection_background #d8dee9 81background #002b36
82 82foreground #839496
83color0 #3b4252 83cursor #93a1a1
84color1 #bf616a 84
85color2 #a3be8c 85selection_background #81908f
86color3 #ebcb8b 86selection_foreground #002831
87color4 #81a1c1 87
88color5 #b48ead 88color0 #073642
89color6 #88c0d0 89color1 #dc322f
90color7 #e5e9f0 90color2 #859900
91color8 #4c566a 91color3 #b58900
92color9 #bf616a 92color4 #268bd2
93color10 #a3be8c 93color5 #d33682
94color11 #ebcb8b 94color6 #2aa198
95color12 #81a1c1 95color7 #eee8d5
96color13 #b48ead 96color9 #cb4b16
97color14 #8fbcbb 97color8 #002b36
98color15 #eceff4 98color10 #586e75
99color11 #657b83
100color12 #839496
101color13 #6c71c4
102color14 #93a1a1
103color15 #fdf6e3
104
105# Light
106
107#background #fdf6e3
108#foreground #657b83
109#cursor #586e75
110#
111#selection_background #475b62
112#selection_foreground #eae3cb
113#
114#color0 #073642
115#color8 #002b36
116#color1 #dc322f
117#color9 #cb4b16
118#color2 #859900
119#color10 #586e75
120#color3 #b58900
121#color11 #657b83
122#color4 #268bd2
123#color12 #839496
124#color5 #d33682
125#color13 #6c71c4
126#color6 #2aa198
127#color14 #93a1a1
128#color7 #eee8d5
129#color15 #fdf6e3
130
99 131
100#: }}} 132#: }}}
101 133
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'
29Plug 'bling/vim-airline' 29Plug 'bling/vim-airline'
30 30
31" color themes 31" color themes
32Plug 'arcticicestudio/nord-vim' 32Plug 'lifepillar/vim-solarized8'
33Plug 'aonemd/kuroi.vim' 33
34Plug 'ayu-theme/ayu-vim' 34" Plug 'arcticicestudio/nord-vim'
35Plug 'lifepillar/vim-gruvbox8' 35" Plug 'aonemd/kuroi.vim'
36" Plug 'ayu-theme/ayu-vim'
37" Plug 'lifepillar/vim-gruvbox8'
36 38
37"Personal wiki 39"Personal wiki
38Plug 'vimwiki/vimwiki' 40Plug 'vimwiki/vimwiki'
@@ -42,13 +44,15 @@ Plug 'junegunn/goyo.vim'
42Plug 'lervag/vimtex' 44Plug 'lervag/vimtex'
43 45
44"visual display of indent levels 46"visual display of indent levels
45Plug 'nathanaelkane/vim-indent-guides' 47Plug 'thaerkh/vim-indentguides'
46"text alignment 48"text alignment
47Plug 'godlygeek/tabular' 49Plug 'godlygeek/tabular'
48"color code highlight 50"color code highlight
49Plug 'chrisbra/Colorizer' 51Plug 'chrisbra/Colorizer'
50"move selections up and down 52"move selections up and down
51Plug 'matze/vim-move' 53Plug 'matze/vim-move'
54" search/select/edit sandwiched textobjects (vim-surround)
55Plug 'machakann/vim-sandwich'
52 56
53"folding ledger files 57"folding ledger files
54Plug 'ledger/vim-ledger' 58Plug 'ledger/vim-ledger'
@@ -70,8 +74,6 @@ Plug 'svermeulen/vim-yoink'
70 74
71"enable repeating supported plugin maps with '.' 75"enable repeating supported plugin maps with '.'
72Plug 'tpope/vim-repeat' 76Plug 'tpope/vim-repeat'
73"quoting/parenthesizing made simple
74Plug 'tpope/vim-surround'
75"pairs of handy bracket mappings 77"pairs of handy bracket mappings
76Plug 'tpope/vim-unimpaired' 78Plug 'tpope/vim-unimpaired'
77"git wrapper 79"git wrapper
@@ -160,21 +162,21 @@ if executable('rg')
160 set grepprg=rg\ --vimgrep\ --no-heading 162 set grepprg=rg\ --vimgrep\ --no-heading
161endif 163endif
162 164
165let g:indentguides_ignorelist = ['text', 'tex', 'vimwiki']
166
163" }}} 167" }}}
164 168
165"{{{Look and Feel 169"{{{Look and Feel
166 170
167set termguicolors 171set termguicolors
168 172
169let g:nord_underline = 1 173" let g:nord_underline = 1
170let g:nord_italic = 1 174" let g:nord_italic = 1
171let g:nord_italic_comments = 1 175" let g:nord_italic_comments = 1
172let g:nord_cursor_line_number_background = 1 176" let g:nord_cursor_line_number_background = 1
177" let ayucolor="light"
173 178
174let ayucolor="light" 179colorscheme solarized8
175
176colorscheme nord
177" colorscheme ayu
178 180
179" }}} 181" }}}
180 182
@@ -213,8 +215,8 @@ nnoremap <silent> <Leader><cr> :noh<cr>
213nnoremap <space> za 215nnoremap <space> za
214" Search mappings: These will make it so that going to the next one in a 216" Search mappings: These will make it so that going to the next one in a
215" search will center on the line it's found in. 217" search will center on the line it's found in.
216map N Nzz 218" map N Nzz
217map n nzz 219" map n nzz
218 220
219nnoremap <leader>d :WebsterSearch(expand('<cWORD>'))<cr> 221nnoremap <leader>d :WebsterSearch(expand('<cWORD>'))<cr>
220vnoremap <leader>d :<c-u>WebsterSearch(@*)<cr> 222vnoremap <leader>d :<c-u>WebsterSearch(@*)<cr>
@@ -222,6 +224,10 @@ vnoremap <leader>d :<c-u>WebsterSearch(@*)<cr>
222" checkmarks on vimwiki 224" checkmarks on vimwiki
223nmap <Leader>v <Plug>VimwikiToggleListItem 225nmap <Leader>v <Plug>VimwikiToggleListItem
224 226
227nmap ` <Plug>Sneak_s
228nmap <leader>` <Plug>Sneak_S
229nnoremap ' `
230
225""""""""""""""""""""""""""" 231"""""""""""""""""""""""""""
226" yanks/registers/clips " 232" yanks/registers/clips "
227""""""""""""""""""""""""""" 233"""""""""""""""""""""""""""
diff --git a/.zshrc b/.zshrc
index e7e4b09..e84e3cb 100644
--- a/.zshrc
+++ b/.zshrc
@@ -123,11 +123,6 @@ alias gg="exit"
123alias ledger="ledger -f ~/Dropbox/ledger.dat" 123alias ledger="ledger -f ~/Dropbox/ledger.dat"
124alias report="report -f ~/Dropbox/ledger.dat" 124alias report="report -f ~/Dropbox/ledger.dat"
125 125
126mkcdir () {
127 mkdir -p -- "$1" &&
128 cd -P -- "$1"
129}
130
131RANGER_LOAD_DEFAULT_RC=FALSE; export RANGER_LOAD_DEFAULT_RC 126RANGER_LOAD_DEFAULT_RC=FALSE; export RANGER_LOAD_DEFAULT_RC
132 127
133export GPG_TTY=$(tty) 128export GPG_TTY=$(tty)