Merge branch 'master' of ssh://github.com/thomasba/dot-files

i3/autostart

@@ -15,4 +15,5 @@ pamac-tray &
 xfce4-clipman &
 gnome-keyring-daemon --start --daemonize --components=pkcs11,secrets,ssh,gpg &
 xset r rate 400 30
+rofi -quiet &
 sleep 2 && xmodmap ~/.i3/speedswapper &

i3/config

@@ -40,8 +40,6 @@ bindcode Mod4+26 layout default
 # Toggle tiling/floating of the current window (Mod4+t)
 bindsym Mod4+t floating toggle
 
-bindsym Mod4+space exec bashrun2
-
 # Go into the tiling layer / floating layer, depending on whether
 # the current window is tiling / floating (Mod4+t)
 #bindcode Mod4+28 focus mode_toggle

vim/plug.vim

@@ -56,7 +56,7 @@ Plug 'tpope/vim-surround'
 Plug 'vim-scripts/tComment'
 Plug 'tmhedberg/matchit'
 Plug 'chase/vim-ansible-yaml', { 'for': 'yaml' }
-Plug 'jamessan/vim-gnupg', { 'for': 'gpg' }
+Plug 'jamessan/vim-gnupg'
 Plug 'docunext/closetag.vim', { 'for': ['html','php']  }
 Plug 'lilydjwg/colorizer', { 'for': ['html','php','css','sass','scss'] }
 Plug 'Townk/vim-autoclose'

xresources

@@ -0,0 +1,19 @@
+! ------------------------------------------------------------------------------
+! ROFI Options
+! ------------------------------------------------------------------------------
+rofi.key-run: SuperL-space
+rofi.key-ssh: SuperL-s
+rofi.key-window: SuperL-Tab
+rofi.fuzzy: true
+rofi.terminal: evilvte
+rofi.ssh-command: {terminal} -e env TERM=xterm-256color {ssh-client} {host}
+! ------------------------------------------------------------------------------
+! ROFI Color theme
+! ------------------------------------------------------------------------------
+rofi.color-enabled: true
+rofi.color-window: #ffffff, #0096ff, #0096ff
+rofi.color-normal: #ffffff, #002b36, #eeeeee, #586e75, #eee8d5
+rofi.color-active: #ffffff, #0096ff, #eeeeee, #0096ff, #ffffff
+rofi.color-urgent: #ffffff, #dc322f, #eeeeee, #dc322f, #fdf6e3
+
+! vim: set ft=xdefaults :