Merge branch 'master' of git.barakmich.com:barak/dotfiles

.i3/config

@@ -55,6 +55,7 @@ bindsym $mod+d exec i3-dmenu-desktop --dmenu='rofi -dmenu'
 bindsym $mod+F12 exec xscreensaver-command -lock
 bindsym $mod+Shift+y exec xinput-toggle -r yubikey -n -e -t 10
 bindsym $mod+Shift+f exec --no-startup-id xmodmap ~/.Xmodmap
+bindsym $mod+Shift+s exec xfce4-screenshooter
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
@@ -197,6 +198,16 @@ mode "moveworkspace" {
 
 bindsym $mod+t mode "moveworkspace"
 
+mode "goremote" {
+        bindsym g exec "remmina -c ~/.local/share/remmina/1523485448993.remmina"; mode "default"
+        bindsym t exec "run_terminal -x ssh -p 2222 barak@rack.0b100.net"; mode "default"
+        bindsym p exec "run_terminal -x ssh -p 2222 barak@barakmich.com"; mode "default"
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+
+bindsym $mod+Shift+Control+r mode "goremote"
+
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 #bar {

.tmux.conf

@@ -58,4 +58,4 @@ setw -g monitor-activity on
 set -g visual-activity on
 
 # Highlighting the active window in status bar
-#setw -g window-status-current-bg red
+setw -g window-status-current-bg red

.vim/filetype.vim

@@ -26,6 +26,10 @@ augroup less
   autocmd BufNewFile,BufRead *.less set filetype=less
 augroup END
 
+augroup pcal
+  au BufNewFile,BufRead *.pcal     setf tla
+augroup END
+
 
 au! BufNewFile,BufRead *.pde setf arduino
 

.vimrc

@@ -158,6 +158,7 @@ Plug 'posva/vim-vue'
 Plug 'Shougo/context_filetype.vim'
 Plug 'idris-hackers/idris-vim', {'for': 'idris'}
 Plug 'derekwyatt/vim-scala', {'for': 'scala'}
+Plug 'hwayne/tla.vim'
 
 " Plugins that autocomplete
 Plug 'Shougo/deoplete.nvim'

.zshrc

@@ -86,7 +86,13 @@ fi
 
 if [ -f /usr/local/bin/virtualenvwrapper_lazy.sh ]; then
     source /usr/local/bin/virtualenvwrapper_lazy.sh
+else
+  if [ -f /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh ]; then
+    source /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh
   fi
+fi
+
+
 
 fasd_cache="$HOME/.fasd-init-zsh"
 if [ "$(command -v fasd)" -nt "$fasd_cache" -o ! -s "$fasd_cache" ]; then

bin/run_terminal

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-if [ -n "`which terminator`" ]; then
+if [ -n "`which gnome-terminal`" ]; then
-  terminator
+  gnome-terminal $@
-elif [ -n "`which gnome-terminal`" ]; then
+elif [ -n "`which terminator`" ]; then
-  gnome-terminal
+  terminator $@
 elif [ -n "`which urxvt`" ]; then
-  urxvt
+  urxvt $@
 else
-  xterm
+  xterm $@
 fi