bashrc: fix missing symbol; i3, kitty: new font in town; vim: the usual

bashrc

@@ -22,8 +22,8 @@ prompt_command() {
     esac
 }
 ((UID)) && ps_clr=4 || ps_clr=1
-# just a colored version of [ $USER@$HOSTNAME ~ ]
+# just a colored version of [ $USER@$HOSTNAME:~ ]
-PS1='\[\e[47;30m\][ \[\e[3'"$ps_clr"'m\]\u\[\e[30m\] \h \[\e[32m\w\[\e[30m\] ]\[\e[0m\]\n\$ '
+PS1='\[\e[47;30m\][ \[\e[3'"$ps_clr"'m\]\u\[\e[30m\] \h:\[\e[32m\w\[\e[30m\] ]\[\e[0m\]\n\$ '
 unset ps_clr
 PROMPT_COMMAND=prompt_command
 # }}}

i3_config

@@ -4,11 +4,9 @@
 
 set $mod Mod4
 set $i3_term default-terminal-emulator
-set $terminus -*-terminus-bold-*-*-*-14-*-*-*-*-*-iso10646-*
+set $font JetBrains Mono:size=10
-set $terminus_xft xos4 Terminus:Bold:pixelsize=14
-set $font Fira Sans Condensed:size=10
 
-font pango:Fira Sans Condensed 10
+font pango:JetBrains Mono 10
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
@@ -26,6 +24,7 @@ bindsym Control+q exec /bin/true
 bindsym $mod+s exec dmenu_multicmd "$HOME/.displayrc.yaml" -i -fn "$font"
 bindsym $mod+d exec dmenu_run -p run -i -fn "$font"
 bindsym $mod+p exec dmenu_ssh "$i3_term -e tmux_ssh" -i -fn "$font"
+bindsym $mod+u exec dmenu_pass -i -fn "$font"
 
 # change focus
 bindsym $mod+h focus left
@@ -78,7 +77,7 @@ bindsym $mod+a focus parent
 bindsym $mod+Shift+a focus child
 
 # move to another screen
-bindsym $mod+Shift+o move workspace to output up
+bindsym $mod+Shift+o move workspace to output right
 
 # switch to workspace
 bindsym $mod+1 workspace 1
@@ -183,6 +182,7 @@ for_window [class="X64"] floating enable
 for_window [class="(?i)firefox" instance="^(?!Navigator$)"] floating enable
 for_window [title="^Cacti - Realtime"] floating enable
 for_window [class="java-lang-Thread"] floating enable
+for_window [class="^sun-awt"] floating enable
 # scratchpad
 for_window [class="KeePassXC"] move scratchpad, scratchpad show
 for_window [title="^vimwiki$"] move scratchpad, scratchpad show

kitty.conf

@@ -1,8 +1,6 @@
-font_family                Fira Code Retina
+# I am config
-bold_font                  Fira Code Bold
+font_family                JetBrains Mono
-italic_font                Fira Code Retina
+font_size                  10
-bold_italic_font           Fira Code Bold
-font_size                  9.5
 box_drawing_scale          0.1, 0.5, 1, 1.5
 
 cursor_blink_interval      0
@@ -12,10 +10,15 @@ enable_audio_bell          no
 window_padding_width       1
 placement_strategy         top-left
 
+tab_bar_style              powerline
+
 rectangle_select_modifiers alt
 map ctrl+alt+c             copy_to_clipboard
 map ctrl+alt+v             paste_from_clipboard
 
+open_url_modifiers         alt
+open_url_withopen_url_with default
+
 selection_foreground       #fdf6e3
 selection_background       #b58900
 foreground                 #657b83

vimplugrc

@@ -9,7 +9,6 @@ silent!call plug#begin(plugdir)
 Plug 'junegunn/vim-plug'
 
 " general plugins
-Plug 'itchyny/lightline.vim'
 Plug 'junegunn/fzf.vim'
 Plug 'junegunn/vim-easy-align'
 Plug 'lifepillar/vim-solarized8'
@@ -40,31 +39,25 @@ nmap <Leader>fb :Buffers<CR>
 nmap <Leader>fl :Lines<CR>
 nmap <Leader>ft :Filetypes<CR>
 
-" lightline
-set noshowmode
-let g:solarized_termcolors = 16
-let g:lightline = {
-            \ 'colorscheme': 'solarized',
-            \ 'active': {
-            \   'left': [ [ 'mode', 'paste' ], [ 'keymap' ],
-            \             [ 'readonly', 'filename', 'modified' ] ]
-            \ },
-            \ 'component': {
-            \   'keymap': '%k'
-            \ }
-            \ }
-let g:lightline.separator = { 'left': "\ue0b0", 'right': "\ue0b2" }
-let g:lightline.subseparator = { 'left': "\ue0b1", 'right': "\ue0b3" }
-
 " vimwiki
 let g:vimwiki_list = [{'path': '$HOME/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
 
-" color theme
+" colorscheme and gui
-if $TERM !~ '^linux'
+if has('gui_running')
+    set bg=dark
+    set guifont=JetBrains\ Mono\ 10
+    set guicursor=a:blinkon0,a:block,i:ver1-Cursor/lCursor,r:hor1-Cursor/lCursor
+    set guiheadroom=0 guioptions=aei mouse=a
+
+    map <S-Insert> <MiddleMouse>
+    map! <S-Insert> <MiddleMouse>
+
+    colorscheme gruvbox8
+elseif $TERM !~ '^linux'
+    set bg=light
     let g:solarized_use16 = 1
     let g:solarized_italics = 1
     let g:solarized_extra_hi_groups = 1
 
-    set bg=light
     colorscheme solarized8
 endif

vimrc

@@ -3,12 +3,16 @@ 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
+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
 
+if $TERM =~ '^screen'
+    set t_ts=k t_fs=\
+endif
+
 let g:sh_indent_case_labels = 1
 
 " mappings
@@ -36,20 +40,5 @@ if filereadable(plugrc) && filereadable(plug) && v:version >= 703
     execute 'source' fnameescape(plugrc)
 endif
 
-if $TERM =~ '^screen'
-    set t_ts=k t_fs=\
-endif
-
-if has('gui_running')
-    set guifont=Fantasque\ Sans\ Mono\ 11
-    set guicursor=a:blinkon0,a:block,i:ver1-Cursor/lCursor,r:hor1-Cursor/lCursor
-    set guiheadroom=0 guioptions=aeim mouse=a
-
-    map <S-Insert> <MiddleMouse>
-    map! <S-Insert> <MiddleMouse>
-else
-    set mouse=
-endif
-
 syntax on
 filetype plugin on