nord colors

config/kitty/kitty.conf

@@ -8,7 +8,7 @@
 
 font_family      SF Mono
 # bold_font        auto
-# italic_font      auto
+italic_font      SF Mono Italic
 # bold_italic_font auto
 
 #: You can specify different fonts for the bold/italic/bold-italic
@@ -23,7 +23,7 @@ font_family      SF Mono
 #:     italic_font      Operator Mono Book Italic
 #:     bold_italic_font Operator Mono Medium Italic
 
-font_size 16.0
+font_size 14.0
 
 #: Font size (in pts)
 
@@ -74,16 +74,6 @@ disable_ligatures always
 
 #: Cursor customization {{{
 
-# cursor #cccccc
-
-#: Default cursor color
-
-# cursor_text_color #111111
-
-#: Choose the color of text under the cursor. If you want it rendered
-#: with the background color of the cell underneath instead, use the
-#: special keyword: background
-
 # cursor_shape block
 
 #: The cursor shape can be one of (block, beam, underline)
@@ -435,87 +425,9 @@ inactive_tab_font_style normal
 
 #: Tab bar colors and styles
 
-#: }}}
-
-# gruvbox
-##: Color scheme {{{
-
-foreground #ebdbb2
-background #282828
-
-#: black
-color0 #282828
-color8 #928374
-
-#: red
-color1 #cc241d
-color9 #fb4934
-
-#: green
-color2  #98971a
-color10 #b8bb26
+#: Color theme
 
-#: yellow
-color3  #d79921
-color11 #fabd2f
-
-#: blue
-color4  #458588
-color12 #83a598
-
-#: magenta
-color5  #b16286
-color13 #d3869b
-
-#: cyan
-color6  #689d6a
-color14 #8ec07c
-
-#: white
-color7  #a89984
-color15 #ebdbb2
-
-#: }}}
-
-# # srcery
-# foreground   #fce8c4
-# background   #1c1b19
-# cursor  #fce8c3
-# 
-# # black
-# color0       #1c1b19
-# color8       #2d2c29
-# 
-# # red
-# color1       #ef2f27
-# color9       #f75341
-# 
-# # green
-# color2       #519f50
-# color10      #98bc37
-# 
-# # yellow
-# color3       #fbb829
-# color11      #fed06e
-# 
-# # blue
-# color4       #2c78bf
-# color12      #68a8e4
-# 
-# # magenta
-# color5       #e02c6d
-# color13      #ff5c8f
-# 
-# # cyan
-# color6       #0aaeb3
-# color14      #53fde9
-# 
-# # white
-# color7       #918175
-# color15      #fce8c3
-
-
-#: }}}
+include nord.conf
 
 #: Advanced {{{
 

config/kitty/nord.conf

@@ -0,0 +1,43 @@
+# Nord Colorscheme for Kitty
+# Based on:
+# - https://gist.github.com/marcusramberg/64010234c95a93d953e8c79fdaf94192
+# - https://github.com/arcticicestudio/nord-hyper
+
+foreground            #D8DEE9
+background            #2E3440
+selection_foreground  #000000
+selection_background  #FFFACD
+url_color             #0087BD
+cursor                #FFFFFF
+
+# black
+color0   #3B4252
+color8   #4C566A
+
+# red
+color1   #BF616A
+color9   #BF616A
+
+# green
+color2   #A3BE8C
+color10  #A3BE8C
+
+# yellow
+color3   #EBCB8B
+color11  #EBCB8B
+
+# blue
+color4  #81A1C1
+color12 #81A1C1
+
+# magenta
+color5   #B48EAD
+color13  #B48EAD
+
+# cyan
+color6   #88C0D0
+color14  #8FBCBB
+
+# white
+color7   #E5E9F0
+color15  #B48EAD

tmux.conf

@@ -52,23 +52,24 @@ setw -g monitor-activity on
 set -g status-interval 1
 set -g status-position top
 set -g status-justify left
-set -g status-style 'fg=colour255 bg=colour0'
+set -g status-style 'fg=colour7 bg=colour8'
 
-set -g status-left ' '
+set -g status-left ' tmux '
+set -g status-left-style ''
 set -g status-right ' #{?client_prefix,#[reverse]<Prefix>#[noreverse] ,}'
 set -g status-right-style ''
 
 setw -g window-status-style ''
 setw -g window-status-format '  #I:#W#F  '
 
-setw -g window-status-current-style 'fg=colour229 bg=colour235'
+setw -g window-status-current-style 'fg=colour8 bg=colour7'
 setw -g window-status-current-format '║ #I:#W#F ║'
 
-setw -g window-status-bell-style 'fg=colour255 bg=colour1 bold'
+# setw -g window-status-bell-style 'fg=colour255 bg=colour1 bold'
 setw -g pane-border-status off
 setw -g pane-border-format "┤  #P#{?pane_active,*, } ├"
-setw -g pane-border-style "fg=colour238"
-setw -g pane-active-border-style "fg=colour229"
+# setw -g pane-border-style "fg=colour238"
+# setw -g pane-active-border-style "fg=colour229"
 
-set -g message-style 'fg=colour229 bg=colour0'
+# set -g message-style 'fg=colour229 bg=colour0'
 

vimrc

@@ -63,8 +63,8 @@ Plug 'neoclide/coc.nvim', {'branch': 'release'}
 Plug 'lifepillar/vim-colortemplate'
 Plug 'NLKNguyen/papercolor-theme'
 Plug 'morhetz/gruvbox'
-Plug 'lithammer/vim-eighties'
-Plug 'srcery-colors/srcery-vim'
+"Plug 'lithammer/vim-eighties'
+Plug 'arcticicestudio/nord-vim'
 
 " for snippets
 Plug 'SirVer/ultisnips'
@@ -92,26 +92,36 @@ set showmatch
 set wildmenu
 
 set background=dark
-let &t_8f="\<Esc>[38;2;%lu;%lu;%lum"
-let &t_8b="\<Esc>[48;2;%lu;%lu;%lum"
 set termguicolors
 let g:eighties_italics=1
-let g:srcery_italic=1
-let g:srcery_bold=1
-let g:srcery_undercurl=1
-let g:srcery_inverse=1
-let g:srcery_inverse_matches=1
-let g:srcery_inverse_match_paren=1
-colorscheme srcery
-
-augroup appearance
-    au!
-    " au VimEnter * RainbowParenthesesToggle
-    " au Syntax * RainbowParenthesesLoadRound
-    " au Syntax * RainbowParenthesesLoadSquare
-    " au Syntax * RainbowParenthesesLoadBraces
-    " au Syntax * RainbowParenthesesLoadChevrons
-augroup END
+let g:nord_italic = 1
+let g:nord_underline = 0
+let g:nord_bold = 0
+colorscheme nord
+" hack until nord fixes this
+hi CursorLineNr cterm=NONE
+
+let &t_8f="\<Esc>[38;2;%lu;%lu;%lum"
+let &t_8b="\<Esc>[48;2;%lu;%lu;%lum"
+" fix insert mode cursor
+let &t_SI="\e[6 q"
+let &t_EI="\e[2 q"
+
+function! Foldtext()
+    let line = getline(v:foldstart)
+    let sub = substitute(line, '\v^("|/\*|//)\s*|\s*(\{{3}\d?\s*)', '', 'g')
+    let format = ' %s (%d lines) '
+    return v:folddashes . printf(format, sub, (v:foldend - v:foldstart))
+endfunction
+set foldtext=Foldtext()
+set fillchars=vert:\┃,fold:-
+
+set cursorline
+if ! has('nvim')
+    set cursorlineopt=number
+end
+
+let g:indentLine_char_list = ['┆']
 
 " Visual bells give me seizures
 set t_vb=''
@@ -153,7 +163,7 @@ function! CocCurrentFunction()
 endfunction
 
 let g:lightline = {
-      \ 'colorscheme': 'Tomorrow_Night_Eighties',
+      \ 'colorscheme': 'nord',
       \ 'active': {
       \   'left': [ [ 'mode', 'paste' ],
       \             [ 'cocstatus', 'currentfunction', 'readonly', 'filename', 'modified' ] ]