From 2dcb41cd467d47a4c867b91cf5b26a4158937e7d Mon Sep 17 00:00:00 2001
From: "bozo.kopic" <bozo@kopic.xyz>
Date: Sun, 20 Sep 2020 22:20:50 +0200
Subject: .

---
 bspwm/bspwmrc                          | 12 +++++++++++-
 git/.gitconfig                         |  4 ++--
 polybar/config                         |  4 +++-
 qutebrowser/autoconfig.yml             | 24 ++++++++++++++++++++----
 subl3/Package Control.sublime-settings |  1 +
 subl3/Preferences.sublime-settings     |  4 ++--
 vim/.vimrc                             | 30 ++++++++++++++++++++----------
 vim/plug.vim                           | 14 +++++++-------
 xorg/.Xresources                       |  2 ++
 9 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index 6afcdb6..26c534c 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -4,7 +4,17 @@ sxhkd -c ~/.config/sxhkd/sxhkdrc.bspwm &
 ~/.config/polybar/launch.sh &
 
 bspc monitor primary -d 1 2 3 4 term
-bspc monitor ^2 -d a s d f
+
+python <<EOF
+import subprocess
+import sys
+p = subprocess.run(['xrandr', '--listactivemonitors'],
+                   capture_output=True, check=True)
+count = int(p.stdout.decode('utf-8').split('\n')[0].split(':')[1])
+if count < 2:
+    sys.exit(1)
+EOF
+[ $? -eq 0 ] && bspc monitor primary#next -d a s d f
 
 bspc config border_width         4
 bspc config window_gap           5
diff --git a/git/.gitconfig b/git/.gitconfig
index fd017a5..fd5b39e 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,7 +1,7 @@
 [user]
     name = bozo.kopic
-    email = bozo.kopic@gmail.com
-    signingkey = 596B1248EF64E1308C7D2AD019CA03B76B479DCF
+    email = bozo@kopic.xyz
+    signingkey = CC79457AF7EEDD5558E3D8303BFE72132DE3F554
 [http]
     sslVerify = false
 [branch]
diff --git a/polybar/config b/polybar/config
index 9d1c82c..59fbc3c 100644
--- a/polybar/config
+++ b/polybar/config
@@ -8,7 +8,7 @@ padding = 2
 background = #000000
 foreground = #ffffff
 font-0 = "RobotoMono Nerd Font:size=12"
-font-1 = "Roboto Nerd Font:size=12"
+font-1 = "Inter Medium:size=12"
 module-margin = 1
 separator = |
 separator-foreground = #919191
@@ -24,6 +24,7 @@ tray-position = right
 [bar/bar2]
 inherit = bar/base
 monitor = DP1-2
+monitor-fallback = DP3
 tray-position = none
 
 [module/bspwm]
@@ -47,6 +48,7 @@ label-separator-foreground = ${bar/base.separator-foreground}
 [module/title]
 type = internal/xwindow
 label = %{T2}%title%
+label-maxlen = 100
 
 [module/wlan0]
 type = internal/network
diff --git a/qutebrowser/autoconfig.yml b/qutebrowser/autoconfig.yml
index 7734076..17a4a21 100644
--- a/qutebrowser/autoconfig.yml
+++ b/qutebrowser/autoconfig.yml
@@ -6,15 +6,31 @@
 
 config_version: 2
 settings:
-  fonts.tabs:
-    global: 12pt Droid Sans
+  fonts.default_family:
+    global: Roboto Mono
+  fonts.default_size:
+    global: 12pt
+  fonts.messages.info:
+    global: default_size default_family
+  fonts.statusbar:
+    global: default_size default_family
+  fonts.tabs.selected:
+    global: default_size Inter
+  fonts.tabs.unselected:
+    global: default_size inter
   qt.highdpi:
     global: true
-  tabs.padding:
+  tabs.indicator.padding:
     global:
       bottom: 2
+      left: 0
+      right: 4
+      top: 2
+  tabs.padding:
+    global:
+      bottom: 10
       left: 5
       right: 5
-      top: 2
+      top: 5
   zoom.default:
     global: 125%
diff --git a/subl3/Package Control.sublime-settings b/subl3/Package Control.sublime-settings
index d4fb5c0..3854da2 100644
--- a/subl3/Package Control.sublime-settings	
+++ b/subl3/Package Control.sublime-settings	
@@ -6,6 +6,7 @@
 	"installed_packages":
 	[
 		"A File Icon",
+		"AutoWrap",
 		"Compare Side-By-Side",
 		"MagicPython",
 		"Material Theme",
diff --git a/subl3/Preferences.sublime-settings b/subl3/Preferences.sublime-settings
index dfc3087..9bdb33b 100644
--- a/subl3/Preferences.sublime-settings
+++ b/subl3/Preferences.sublime-settings
@@ -42,8 +42,8 @@
 	"file_exclude_patterns":
 	[
 	],
-	"font_face": "Droid Sans Mono",
-	"font_size": 10,
+	"font_face": "Roboto Mono",
+	"font_size": 11,
 	"highlight_line": true,
 	"highlight_modified_tabs": true,
 	"ignored_packages":
diff --git a/vim/.vimrc b/vim/.vimrc
index 42cab6a..1dc12af 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -21,22 +21,23 @@ set hidden
 
 " plugin manager
 call plug#begin('~/.vim/plugged')
+Plug 'airblade/vim-gitgutter'
+Plug 'mg979/vim-visual-multi'
+Plug 'christoomey/vim-tmux-navigator'
+Plug 'w0rp/ale'
 Plug 'sickill/vim-monokai'
-Plug 'bling/vim-airline'
+Plug 'thaerkh/vim-indentguides'
 Plug 'scrooloose/nerdtree'
 Plug 'scrooloose/nerdcommenter'
+Plug 'Xuyuanp/nerdtree-git-plugin'
+
+Plug 'bling/vim-airline'
 Plug 'tpope/vim-fireplace'
-Plug 'kien/ctrlp.vim'
-Plug 'airblade/vim-gitgutter'
+Plug 'ctrlpvim/ctrlp.vim'
 Plug 'majutsushi/tagbar'
 Plug 'xolox/vim-misc'
-Plug 'w0rp/ale'
-Plug 'thaerkh/vim-indentguides'
 Plug 'vim-scripts/paredit.vim'
-Plug 'christoomey/vim-tmux-navigator'
 Plug 'ryanoasis/vim-devicons'
-Plug 'Xuyuanp/nerdtree-git-plugin'
-Plug 'mg979/vim-visual-multi'
 
 "Plug 'tpope/vim-fugitive.git'
 "Plug 'severin-lemaignan/vim-minimap'
@@ -76,6 +77,10 @@ autocmd FileType make set tabstop=4 shiftwidth=8 softtabstop=0 noexpandtab
 " gui settings
 set linespace=4
 set guifont=Droid\ Sans\ Mono:h12
+if exists('g:GuiLoaded')
+    GuiTabline 0
+endif
+autocmd UIEnter * GuiTabline 0
 
 " reload vimrc on change
 augroup reload_vimrc
@@ -85,7 +90,7 @@ augroup END
 
 " airline configuration
 set laststatus=2
-"let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#tabline#enabled = 1
 
 " display tabs and trailing spaces
 set list
@@ -135,7 +140,7 @@ set mouse=a
 " ale configuration
 let g:ale_linters = {
 \   'python': ['flake8']
-\}
+\ }
 
 " YouCompleteMe configuration
 "let g:ycm_auto_trigger = 0
@@ -146,3 +151,8 @@ set completeopt=menuone
 
 " disable conceal
 autocmd FileType json set conceallevel=0
+
+" ctrlP
+"let g:ctrlp_prompt_mappings = {
+"\   'ToggleType(1)':        ['<c-p>', '<c-f>', '<c-up>'],
+"\ }
diff --git a/vim/plug.vim b/vim/plug.vim
index 69033ec..7914bfe 100644
--- a/vim/plug.vim
+++ b/vim/plug.vim
@@ -179,7 +179,7 @@ function! s:define_commands()
   endif
   if has('win32')
   \ && &shellslash
-  \ && (&shell =~# 'cmd\.exe' || &shell =~# 'powershell\.exe')
+  \ && (&shell =~# 'cmd\(\.exe\)\?$' || &shell =~# 'powershell\(\.exe\)\?$')
     return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.')
   endif
   if !has('nvim')
@@ -419,7 +419,7 @@ if s:is_win
     let batchfile = s:plug_tempname().'.bat'
     call writefile(s:wrap_cmds(a:cmd), batchfile)
     let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0})
-    if &shell =~# 'powershell\.exe'
+    if &shell =~# 'powershell\(\.exe\)\?$'
       let cmd = '& ' . cmd
     endif
     return [batchfile, cmd]
@@ -890,9 +890,9 @@ function! s:chsh(swap)
     set shell=sh
   endif
   if a:swap
-    if &shell =~# 'powershell\.exe' || &shell =~# 'pwsh$'
+    if &shell =~# 'powershell\(\.exe\)\?$' || &shell =~# 'pwsh$'
       let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s'
-    elseif &shell =~# 'sh' || &shell =~# 'cmd\.exe'
+    elseif &shell =~# 'sh' || &shell =~# 'cmd\(\.exe\)\?$'
       set shellredir=>%s\ 2>&1
     endif
   endif
@@ -2128,9 +2128,9 @@ function! plug#shellescape(arg, ...)
   let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {}
   let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh')
   let script = get(opts, 'script', 1)
-  if shell =~# 'cmd\.exe'
+  if shell =~# 'cmd\(\.exe\)\?$'
     return s:shellesc_cmd(a:arg, script)
-  elseif shell =~# 'powershell\.exe' || shell =~# 'pwsh$'
+  elseif shell =~# 'powershell\(\.exe\)\?$' || shell =~# 'pwsh$'
     return s:shellesc_ps1(a:arg)
   endif
   return s:shellesc_sh(a:arg)
@@ -2182,7 +2182,7 @@ function! s:system(cmd, ...)
         return system(a:cmd)
       endif
       let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"shell": &shell, "script": 0})'))
-      if &shell =~# 'powershell\.exe'
+      if &shell =~# 'powershell\(\.exe\)\?$'
         let cmd = '& ' . cmd
       endif
     else
diff --git a/xorg/.Xresources b/xorg/.Xresources
index acf1c55..19e1130 100644
--- a/xorg/.Xresources
+++ b/xorg/.Xresources
@@ -1,4 +1,6 @@
 Xcursor.theme: Neutral
 Xcursor.size:  32
+rofi.font: Inter Medium 12
+rofi.modi: drun,window
 rofi.show-icons: true
 rofi.theme: Monokai
-- 
cgit v1.2.3-70-g09d2