summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYigit Sever2019-03-30 19:53:52 +0300
committerYigit Sever2019-03-30 19:54:31 +0300
commitcfd96387edf69b2e05b54b1c57d9a8903a0b80bd (patch)
treef32102440b008ae13028210034ca228e39d81a5b
parente9120444fbd265f319619c036c1da19bb57cd5e5 (diff)
downloaddotfiles-cfd96387edf69b2e05b54b1c57d9a8903a0b80bd.tar.gz
dotfiles-cfd96387edf69b2e05b54b1c57d9a8903a0b80bd.tar.bz2
dotfiles-cfd96387edf69b2e05b54b1c57d9a8903a0b80bd.zip
Migrate from gruvbox to nord
-rw-r--r--.Xresources85
-rw-r--r--.config/kitty/kitty.conf62
-rwxr-xr-x.config/nvim/init.vim37
-rw-r--r--.tmux.conf14
-rw-r--r--.zshrc4
5 files changed, 89 insertions, 113 deletions
diff --git a/.Xresources b/.Xresources
index e3bb46f..f4eb976 100644
--- a/.Xresources
+++ b/.Xresources
@@ -1,7 +1,3 @@
1#if __has_include(".extend.Xresources")
2#include ".extend.Xresources"
3#endif
4
5! ^ The above lines are no comments! 1! ^ The above lines are no comments!
6! Leave them as they are if a file ~/.extend.Xresources is being used on your system. 2! Leave them as they are if a file ~/.extend.Xresources is being used on your system.
7! config can be added there or also here below. 3! config can be added there or also here below.
@@ -15,39 +11,50 @@ Xft.autohint: false
15Xft.hintstyle: hintslight 11Xft.hintstyle: hintslight
16Xft.lcdfilter: lcddefault 12Xft.lcdfilter: lcddefault
17 13
18! ----------------------------------------------------------------------------- 14! Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
19! File: gruvbox-dark.xresources 15! Copyright (c) 2016-present Sven Greb <code@svengreb.de>
20! Description: Retro groove colorscheme generalized 16
21! Author: morhetz <morhetz@gmail.com> 17! Project: Nord XResources
22! Source: https://github.com/morhetz/gruvbox-generalized 18! Version: 0.1.0
23! Last Modified: 6 Sep 2014 19! Repository: https://github.com/arcticicestudio/nord-xresources
24! ----------------------------------------------------------------------------- 20! License: MIT
21
22#define nord0 #2E3440
23#define nord1 #3B4252
24#define nord2 #434C5E
25#define nord3 #4C566A
26#define nord4 #D8DEE9
27#define nord5 #E5E9F0
28#define nord6 #ECEFF4
29#define nord7 #8FBCBB
30#define nord8 #88C0D0
31#define nord9 #81A1C1
32#define nord10 #5E81AC
33#define nord11 #BF616A
34#define nord12 #D08770
35#define nord13 #EBCB8B
36#define nord14 #A3BE8C
37#define nord15 #B48EAD
38
39*.foreground: nord4
40*.background: nord0
41*.cursorColor: nord4
42*fading: 35
43*fadeColor: nord3
25 44
26! hard contrast: *background: #1d2021 45*.color0: nord1
27*background: #282828 46*.color1: nord11
28! soft contrast: *background: #32302f 47*.color2: nord14
29*foreground: #ebdbb2 48*.color3: nord13
30! Black + DarkGrey 49*.color4: nord9
31*color0: #282828 50*.color5: nord15
32*color8: #928374 51*.color6: nord8
33! DarkRed + Red 52*.color7: nord5
34*color1: #cc241d 53*.color8: nord3
35*color9: #fb4934 54*.color9: nord11
36! DarkGreen + Green 55*.color10: nord14
37*color2: #98971a 56*.color11: nord13
38*color10: #b8bb26 57*.color12: nord9
39! DarkYellow + Yellow 58*.color13: nord15
40*color3: #d79921 59*.color14: nord7
41*color11: #fabd2f 60*.color15: nord6
42! DarkBlue + Blue
43*color4: #458588
44*color12: #83a598
45! DarkMagenta + Magenta
46*color5: #b16286
47*color13: #d3869b
48! DarkCyan + Cyan
49*color6: #689d6a
50*color14: #8ec07c
51! LightGrey + White
52*color7: #a89984
53*color15: #ebdbb2
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 8fb681f..b681e2c 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -19,7 +19,7 @@ box_drawing_scale 0.001, 1, 1.5, 2
19#: Cursor customization {{{ 19#: Cursor customization {{{
20 20
21cursor_shape block 21cursor_shape block
22cursor #FDE311 22cursor #d8dee9
23cursor_text_color background 23cursor_text_color background
24 24
25cursor_blink_interval 0 25cursor_blink_interval 0
@@ -75,45 +75,27 @@ inactive_tab_font_style normal
75#: }}} 75#: }}}
76 76
77#: Color scheme {{{ 77#: Color scheme {{{
78 78foreground #d8dee9
79foreground #ebdbb2 79background #2e3440
80background #282828 80selection_foreground #2e3440
81 81selection_background #d8dee9
82#: The foreground and background for text selected with the mouse 82
83selection_foreground #fbf1c7 83color0 #3b4252
84selection_background #d65d0e 84color1 #bf616a
85 85color2 #a3be8c
86#: black 86color3 #ebcb8b
87color0 #282828 87color4 #81a1c1
88color8 #928374 88color5 #b48ead
89 89color6 #88c0d0
90#: red 90color7 #e5e9f0
91color1 #cc241d 91color8 #4c566a
92color9 #fb4934 92color9 #bf616a
93 93color10 #a3be8c
94#: green 94color11 #ebcb8b
95color2 #97971a 95color12 #81a1c1
96color10 #b8bb26 96color13 #b48ead
97 97color14 #8fbcbb
98#: yellow 98color15 #eceff4
99color3 #d79921
100color11 #fabd2f
101
102#: blue
103color4 #458588
104color12 #83a598
105
106#: purple
107color5 #b16286
108color13 #d3869b
109
110#: cyan
111color6 #689d6a
112color14 #8ec07c
113
114#: white
115color7 #a89984
116color15 #ebdbb2
117 99
118#: }}} 100#: }}}
119 101
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 3d4faa7..06992d0 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,4 +1,4 @@
1"{{{ 1"{{{ Plugs
2 2
3call plug#begin('~/.local/share/nvim/plugged') 3call plug#begin('~/.local/share/nvim/plugged')
4 4
@@ -8,8 +8,6 @@ Plug 'Valloric/YouCompleteMe'
8Plug 'w0rp/ale' 8Plug 'w0rp/ale'
9"manages tag files 9"manages tag files
10Plug 'ludovicchabant/vim-gutentags' 10Plug 'ludovicchabant/vim-gutentags'
11"language pack
12"Plug 'sheerun/vim-polyglot'
13 11
14"snippet solution 12"snippet solution
15Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' 13Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
@@ -27,7 +25,7 @@ Plug 'majutsushi/tagbar'
27Plug 'bling/vim-airline' 25Plug 'bling/vim-airline'
28 26
29" color theme. 27" color theme.
30Plug 'morhetz/gruvbox' 28Plug 'arcticicestudio/nord-vim'
31 29
32"Personal wiki 30"Personal wiki
33Plug 'vimwiki/vimwiki' 31Plug 'vimwiki/vimwiki'
@@ -120,9 +118,6 @@ set shiftwidth=4
120set softtabstop=4 118set softtabstop=4
121set tabstop=8 119set tabstop=8
122 120
123" Visual aid to deter from typing past column 110
124"set colorcolumn=110
125
126" Use english for spellchecking, but don't spellcheck by default 121" Use english for spellchecking, but don't spellcheck by default
127set spell spelllang=en_us 122set spell spelllang=en_us
128set nospell 123set nospell
@@ -169,32 +164,18 @@ set cinoptions=l1
169 164
170"{{{Look and Feel 165"{{{Look and Feel
171 166
172" Color Scheme
173" gruvbox_color_column works as expected IF the order is:
174" set termguicolors
175" colorscheme gruvbox
176" ...
177" set background=dark
178" Investigate later
179
180"let $NVIM_TUI_ENABLE_TRUE_COLOR=1
181set termguicolors 167set termguicolors
182 168
183colorscheme gruvbox
184
185let g:gruvbox_bold=1
186let g:gruvbox_color_column='red'
187let g:gruvbox_underline=1
188let g:gruvbox_contrast_dark='medium'
189let g:gruvbox_contrast_light='hard'
190let g:gruvbox_vert_split='aqua'
191
192set background=dark " Setting dark mode 169set background=dark " Setting dark mode
193 170
194"highlight ColorColumn guibg='DarkRed' 171"highlight NormalNC guibg='Black'
195highlight NormalNC guibg='Black' 172
196"highlight NormalNC guifg='Cyan' 173let g:nord_underline = 1
174let g:nord_italic = 1
175let g:nord_italic_comments = 1
176let g:nord_cursor_line_number_background = 1
197 177
178colorscheme nord
198 179
199" }}} 180" }}}
200 181
diff --git a/.tmux.conf b/.tmux.conf
index a798aa3..df2b81d 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -32,7 +32,7 @@ setw -g window-status-bg black
32setw -g window-status-attr dim 32setw -g window-status-attr dim
33setw -g window-status-format ' #I#[fg=cyan]:#[fg=white]#W#[fg=white]#F ' 33setw -g window-status-format ' #I#[fg=cyan]:#[fg=white]#W#[fg=white]#F '
34 34
35# Don't prompt to kill panes/windows. TODO you will fuck this up 35# Don't prompt to kill panes/windows.
36bind-key x kill-pane 36bind-key x kill-pane
37bind-key & kill-window 37bind-key & kill-window
38 38
@@ -50,8 +50,6 @@ bind-key z resize-pane -Z
50# Use vim keybindings in copy mode 50# Use vim keybindings in copy mode
51setw -g mode-keys vi 51setw -g mode-keys vi
52 52
53set -g default-terminal "tmux-256color"
54set -g default-command "${SHELL}"
55set -g set-titles on 53set -g set-titles on
56set -g mouse on 54set -g mouse on
57 55
@@ -82,3 +80,13 @@ set -g visual-activity on
82 80
83# Example of using a shell command in the status line 81# Example of using a shell command in the status line
84#set -g status-right "#[fg=yellow]#(uptime | cut -d ',' -f 2-)" 82#set -g status-right "#[fg=yellow]#(uptime | cut -d ',' -f 2-)"
83
84set -g default-terminal "xterm-256color"
85set-option -ga terminal-overrides ",xterm-256color:Tc"
86
87# List of plugins
88set -g @plugin 'tmux-plugins/tpm'
89set -g @plugin 'tmux-plugins/tmux-sensible'
90
91# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
92run -b '~/.tmux/plugins/tpm/tpm'
diff --git a/.zshrc b/.zshrc
index e2a2392..734a5da 100644
--- a/.zshrc
+++ b/.zshrc
@@ -31,7 +31,7 @@ ZSH_THEME="spaceship"
31 31
32# Uncomment the following line to disable colors in ls. 32# Uncomment the following line to disable colors in ls.
33# DISABLE_LS_COLORS="true" 33# DISABLE_LS_COLORS="true"
34export LS_COLORS="$(vivid generate snazzy)" 34#export LS_COLORS="$(vivid generate snazzy)"
35 35
36# Uncomment the following line to disable auto-setting terminal title. 36# Uncomment the following line to disable auto-setting terminal title.
37# DISABLE_AUTO_TITLE="true" 37# DISABLE_AUTO_TITLE="true"
@@ -165,6 +165,4 @@ alias tp='trash-put'
165 165
166[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh 166[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
167 167
168source /home/yigit/.local/share/nvim/plugged/gruvbox/gruvbox_256palette.sh
169
170export GOOGLE_APPLICATION_CREDENTIALS="/home/yigit/translation/DanNet-152c89acaeb0.json" 168export GOOGLE_APPLICATION_CREDENTIALS="/home/yigit/translation/DanNet-152c89acaeb0.json"