From c5bd0c3738e7df9ab4a995edef7882f37840989a Mon Sep 17 00:00:00 2001 From: Von Random Date: Mon, 11 Apr 2022 18:20:36 +0300 Subject: [PATCH] cant be bothered, check commit --- i3_config | 8 +++- kitty.conf | 129 +++++++++++++++++++++++++++++++---------------------- vimplugrc | 64 +++++++++++++++++--------- vimrc | 2 +- 4 files changed, 125 insertions(+), 78 deletions(-) diff --git a/i3_config b/i3_config index 3758e77..b61839f 100644 --- a/i3_config +++ b/i3_config @@ -6,7 +6,8 @@ set $mod Mod4 set $i3_term default-terminal-emulator set $font PT Sans Expert:size=11 -font pango:PT Sans Expert 11 +font pango:Fantasque Sans Mono 13 +#font pango:Cascadia Code PL 11 # Use Mouse+$mod to drag floating windows to their wanted position floating_modifier $mod @@ -152,8 +153,11 @@ bindsym $mod+r mode "resize" bar { position top - status_command "$HOME/vdstatus/vdstatus" + status_command "i3status-rs" tray_output primary + colors { + background #2c2c2c + } } workspace_layout tabbed diff --git a/kitty.conf b/kitty.conf index 9917108..1607cca 100644 --- a/kitty.conf +++ b/kitty.conf @@ -1,7 +1,9 @@ # I am config -font_family Cascadia Code PL -font_size 13 -font_features CascadiaCodePL-Italic +ss01 +#font_family Cascadia Code PL +#font_size 14 +#font_features CascadiaCodePL-Italic +ss01 +font_family Fantasque Sans Mono +font_size 16 box_drawing_scale 0.1, 0.5, 1, 1.5 disable_ligatures cursor @@ -12,8 +14,6 @@ cursor_blink_interval 0 enable_audio_bell no strip_trailing_spaces always open_url_withopen_url_with default - -wayland_titlebar_color #2f343f window_padding_width 1 placement_strategy top-left remember_window_size no @@ -29,55 +29,76 @@ map ctrl+alt+v paste_from_clipboard mouse_map left click ungrabbed mouse_click_url_or_select mouse_map alt+left press ungrabbed mouse_selection rectangle +# Pencil theme +background #f0f0f0 +foreground #414141 +selection_background #b6d6fc +selection_foreground #f0f0f0 +cursor #20bafb +color0 #202020 +color1 #c30670 +color2 #10a778 +color3 #a79c14 +color4 #008ec4 +color5 #523b78 +color6 #20a4b9 +color7 #d9d9d9 +color8 #414141 +color9 #fb0079 +color10 #5ed6ae +color11 #f3e42f +color12 #20bafb +color13 #6854de +color14 #4fb8cc +color15 #f0f0f0 + # Gruvbox Dark -selection_foreground #282828 -selection_background #83a598 -foreground #ebdbb2 -background #282828 -cursor #fb4934 -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 +# selection_foreground #282828 +# selection_background #83a598 +# foreground #ebdbb2 +# background #282828 +# cursor #fb4934 +# 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 # 256color version of vim-gruvbox8 -color59 #665C54 -color66 #458588 -color71 #689D6A -color100 #98971A -color102 #928374 -color107 #8EC07C -color109 #83A598 -color132 #B16286 -color137 #A89984 -color142 #B8BB26 -color144 #BDAE93 -color160 #CC241D -color166 #D65D0E -color172 #D79921 -color175 #D3869B -color187 #D5C4A1 -color187 #EBDBB2 -color203 #FB4934 -color208 #FE8019 -color214 #FABD2F -color230 #FBF1C7 -color235 #282828 -color237 #3C3836 -color239 #504945 -color243 #7C6F64 +# color59 #665C54 +# color66 #458588 +# color71 #689D6A +# color100 #98971A +# color102 #928374 +# color107 #8EC07C +# color109 #83A598 +# color132 #B16286 +# color137 #A89984 +# color142 #B8BB26 +# color144 #BDAE93 +# color160 #CC241D +# color166 #D65D0E +# color172 #D79921 +# color175 #D3869B +# color187 #D5C4A1 +# color187 #EBDBB2 +# color203 #FB4934 +# color208 #FE8019 +# color214 #FABD2F +# color230 #FBF1C7 +# color235 #282828 +# color237 #3C3836 +# color239 #504945 +# color243 #7C6F64 diff --git a/vimplugrc b/vimplugrc index fa61276..a2d1c4d 100644 --- a/vimplugrc +++ b/vimplugrc @@ -1,5 +1,38 @@ " support my own way of using plugins in vim / bash autocmd BufRead *vimplugrc set ft=vim + +let theme = 'PaperColor' +let themebg = 'light' +let lightline_theme = printf(theme) + +function EnableTGC() + let &t_8f = "\u1b[38;2;%lu;%lu;%lum" + let &t_8b = "\u1b[48;2;%lu;%lu;%lum" + let &tgc = 1 +endfunction + +if theme == 'PaperColor' + let g:PaperColor_Theme_Options = {'theme': { + \ 'default.dark': {'allow_bold': 1, 'allow_italic': 1}, + \ 'default.light': {'allow_bold': 1, 'allow_italic': 1} + \ }} +endif + +if theme == 'gruvbox8' + call EnableTGC() + let g:gruvbox_plugin_hi_groups = 1 + let g:gruvbox_filetype_hi_groups = 1 + let themebg = 'dark' +endif + +if theme == 'solarized8' + let lightline_theme = 'solarized' + + let g:solarized_use16 = 1 + let g:solarized_extra_hi_groups = 1 + let g:solarized_termcolors = 16 +endif + " enable plugins execute 'source' fnameescape(plug) silent!call plug#begin(plugdir) @@ -38,8 +71,16 @@ nmap fb :Buffers nmap fl :Lines nmap ft :Filetypes +" vimwiki let g:vimwiki_list = [{'path': '$HOME/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}] +" lightline +let g:lightline = { + \ 'separator': {'left': "\ue0b0", 'right': "\ue0b2"}, + \ 'subseparator': {'left': "\ue0b1", 'right': "\ue0b3"} + \ } +let g:lightline['colorscheme'] = printf(lightline_theme) + if $TERM !~ '^linux' if has('gui_running') set guifont=Cascadia\ Mono\ PL\ 13 @@ -48,27 +89,8 @@ if $TERM !~ '^linux' map map! - 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:lightline = { - \ 'colorscheme': 'gruvbox8', - \ 'separator': {'left': "\ue0b0", 'right': "\ue0b2"}, - \ 'subseparator': {'left': "\ue0b1", 'right': "\ue0b3"} - \ } - let g:PaperColor_Theme_Options = {'theme': { - \ 'default.dark': {'allow_bold': 1, 'allow_italic': 1}, - \ 'default.light': {'allow_bold': 1, 'allow_italic': 1} - \ }} - let g:gruvbox_plugin_hi_groups = 1 - let g:gruvbox_filetype_hi_groups = 1 - let g:solarized_use16 = 1 - let g:solarized_extra_hi_groups = 1 - let g:solarized_termcolors = 16 - - set bg=dark - colorscheme gruvbox8 + let &bg = printf(themebg) + execute printf('colorscheme %s', theme) endif diff --git a/vimrc b/vimrc index d35855c..dfe9386 100644 --- a/vimrc +++ b/vimrc @@ -3,7 +3,7 @@ set list listchars=tab:-->,nbsp:x,trail:* 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 wildmenu showcmd ruler laststatus=2 mouse= t_ut= guicursor= set belloff=all colorcolumn=80 formatoptions+=j relativenumber breakindent set keymap=russian-jcukenwintype iminsert=0 imsearch=0 let &statusline="[%F] %R%H%W%M %=[%{&fenc}/%{&ff}] %y [%4l/%L:%3v]"