scratch that, back to gruvbox8

kitty.conf

@@ -28,139 +28,54 @@ mouse_map left       click ungrabbed mouse_click_url_or_select
 mouse_map alt+left   press ungrabbed mouse_selection rectangle
 
 # Gruvbox Dark
-#selection_foreground  #282828
+selection_foreground  #282828
-#selection_background  #83a598
+selection_background  #83a598
-#foreground            #ebdbb2
+foreground            #ebdbb2
-#background            #282828
+background            #282828
-#cursor                #fb4934
+cursor                #fb4934
-#cursor_text_color     #282828
+cursor_text_color     #282828
-#
-#color0                #282828
-#color1                #cc241d
-#color2                #98971a
-#color3                #d79921
-#color4                #458588
-#color5                #b16286
-#color6                #689d6a
-#color7                #a89984
-#
-#color8                #928374
-#color9                #fb4934
-#color10               #b8bb26
-#color11               #fabd2f
-#color12               #83a598
-#color13               #d3869b
-#color14               #8ec07c
-#color15               #ebdbb2
 
-# Solarized Light
+color0                #282828
-#selection_foreground  #fdf6e3
+color1                #cc241d
-#selection_background  #268bd2
+color2                #98971a
-#foreground            #657b83
+color3                #d79921
-#background            #fdf6e3
+color4                #458588
-#cursor                #cb4b16
+color5                #b16286
-#cursor_text_color     #fdf6e3
+color6                #689d6a
-#
+color7                #a89984
-#color0                #073642
-#color1                #dc322f
-#color2                #859900
-#color3                #b58900
-#color4                #268bd2
-#color5                #d33682
-#color6                #2aa198
-#color7                #eee8d5
-#
-#color8                #002b36
-#color9                #cb4b16
-#color10               #586e75
-#color11               #657b83
-#color12               #839496
-#color13               #6c71c4
-#color14               #93a1a1
-#color15               #fdf6e3
 
-# Selenized dark color scheme for Kitty
+color8                #928374
+color9                #fb4934
+color10               #b8bb26
+color11               #fabd2f
+color12               #83a598
+color13               #d3869b
+color14               #8ec07c
+color15               #ebdbb2
 
-#: Color scheme {{{
+# 256color version of vim-gruvbox8
-
+color59               #665C54
-#: The foreground and background colors
+color66               #458588
-foreground #adbcbc
+color71               #689D6A
-background #103c48
+color100              #98971A
-
+color102              #928374
-#: The opacity of the background. A number between 0 and 1, where 1 is
+color107              #8EC07C
-#: opaque and 0 is fully transparent.  This will only work if
+color109              #83A598
-#: supported by the OS (for instance, when using a compositor under
+color132              #B16286
-#: X11). Note that it only sets the default background color's
+color137              #A89984
-#: opacity. This is so that things like the status bar in vim,
+color142              #B8BB26
-#: powerline prompts, etc. still look good.  But it means that if you
+color144              #BDAE93
-#: use a color theme with a background color in your editor, it will
+color160              #CC241D
-#: not be rendered as transparent.  Instead you should change the
+color166              #D65D0E
-#: default background color in your kitty config and not use a
+color172              #D79921
-#: background color in the editor color scheme. Or use the escape
+color175              #D3869B
-#: codes to set the terminals default colors in a shell script to
+color187              #D5C4A1
-#: launch your editor.  Be aware that using a value less than 1.0 is a
+color187              #EBDBB2
-#: (possibly significant) performance hit.  If you want to dynamically
+color203              #FB4934
-#: change transparency of windows set dynamic_background_opacity to
+color208              #FE8019
-#: yes (this is off by default as it has a performance cost)
+color214              #FABD2F
-background_opacity 1.0
+color230              #FBF1C7
-
+color235              #282828
-#: Allow changing of the background_opacity dynamically, using either
+color237              #3C3836
-#: keyboard shortcuts (increase_background_opacity and
+color239              #504945
-#: decrease_background_opacity) or the remote control facility.
+color243              #7C6F64
-dynamic_background_opacity no
-
-#: How much to dim text that has the DIM/FAINT attribute set. One
-#: means no dimming and zero means fully dimmed (i.e. invisible).
-dim_opacity 0.625
-
-#: The foreground for text selected with the mouse. A value of none
-#: means to leave the color unchanged.
-selection_foreground none
-
-#: The background for text selected with the mouse.
-selection_background #325b66
-
-#: Tab bar colors
-active_tab_foreground   #cad8d9
-active_tab_background   #325b66
-inactive_tab_foreground #72898f
-inactive_tab_background #103c48
-tab_bar_background      #103c48
-
-#: The 16 terminal colors. There are 8 basic colors, each color has a
-#: dull and bright version. You can also set the remaining colors from
-#: the 256 color table as color16 to color255.
-
-#: black
-color0 #174956
-color8 #325b66
-
-#: red
-color1 #fa5750
-color9 #ff665c
-
-#: green
-color2  #75b938
-color10 #84c747
-
-#: yellow
-color3  #dbb32d
-color11 #ebc13d
-
-#: blue
-color4  #4695f7
-color12 #58a3ff
-
-#: magenta
-color5  #f275be
-color13 #ff84cd
-
-#: cyan
-color6  #41c7b9
-color14 #53d6c7
-
-#: white
-color7  #72898f
-color15 #cad8d9
-
-#: }}}

vimplugrc

@@ -44,18 +44,24 @@ if $TERM !~ '^linux'
     if has('gui_running')
         set guifont=Cascadia\ Mono\ PL\ 13
         set guicursor=a:blinkon0,a:block,i:ver1-Cursor/lCursor,r:hor1-Cursor/lCursor
-        set bg=dark guiheadroom=0 guioptions=aei mouse=a
+        set guiheadroom=0 guioptions=aei mouse=a
 
         map <S-Insert> <MiddleMouse>
         map! <S-Insert> <MiddleMouse>
+    else
+        set tgc t_ut= guicursor=
+        let &t_8f = "\u1b[38;2;%lu;%lu;%lum"
+        let &t_8b = "\u1b[48;2;%lu;%lu;%lum"
     endif
 
+    let g:gruvbox_plugin_hi_groups   = 1
+    let g:gruvbox_filetype_hi_groups = 1
     let g:lightline = {
-       \ 'colorscheme': 'PaperColor',
+       \ 'colorscheme': 'gruvbox8',
        \ 'separator':    {'left': "\ue0b8", 'right': "\ue0ba"},
        \ 'subseparator': {'left': "\ue0b9", 'right': "\ue0bb"}
        \ }
-    let g:PaperColor_Theme_Options = {'theme': {'default': {'allow_italic': 1}}}
+
-    set t_Co=256 bg=dark
+    set bg=dark
-    colorscheme PaperColor
+    colorscheme gruvbox8
 endif

vimrc

@@ -4,15 +4,9 @@ set hlsearch incsearch ignorecase smartcase
 set scrolloff=3 sidescrolloff=15 sidescroll=1
 set tabstop=3 softtabstop=4 shiftwidth=4 smarttab expandtab autoindent
 set wildmenu showcmd ruler laststatus=2 mouse=
-set statusline=[%F]\ %R%H%W%M\ %=[%{&fenc}/%{&ff}]\ %y\ [%4l/%L:%3v]
 set belloff=all colorcolumn=80 formatoptions+=j relativenumber breakindent
 set keymap=russian-jcukenwintype iminsert=0 imsearch=0
-set title titlestring=[%{hostname()}]\ %t\ -\ vim
+let &statusline="[%F] %R%H%W%M %=[%{&fenc}/%{&ff}] %y [%4l/%L:%3v]"
-
-if $TERM =~ '^screen'
-    set t_ts=k t_fs=\
-endif
-
 let g:sh_indent_case_labels = 1
 
 " mappings