Mix of updates.

dotbash_danny

@@ -3,20 +3,6 @@
 # Specific Setups for Danny
 #
 
-
-function leftMonitorOn
-{
-    xrandr --output VGA --auto --left-of TMDS-1
-    gconftool-2 --set  /apps/panel/toplevels/bottom_panel_screen0/monitor --type int 1
-    gconftool-2 --set  /apps/panel/toplevels/top_panel_screen0/monitor --type int 1
-}
-
-function leftMonitorOff
-{
-    xrandr --output VGA --off
-}
-
-
 #
 # Sync IPOD
 #
@@ -35,10 +21,22 @@ function sync_torrents
     rsync -rP alex@bennee.com:torrent/* .
 }
 
+#
+# Push files to NAS
+#
+function copy_to_nas
+{
+    scp $* admin@nas:/volume1/video/
+}
+
 #
 # Rockbox compiler
 #
 export PATH=$PATH:/home/alex/src/rockbox/tools/bin
 
 # Backchannel
 alias start_backchan="autossh -2 -fN -M 0 -R 10000:localhost:22 alex@bennee.com"
+
+# Reload
+alias .danny=". ~/.bash_danny"
+

dotconfig/i3/config

@@ -116,8 +116,10 @@ bindsym $mod+Shift+9 move container to workspace number 9
 # Move to primary output:
 
 # Move the current workspace to the next output
-bindsym $mod+p move container to output HDMI1
-bindsym $mod+Shift+p move workspace to output HDMI1
+# anoyingly it's HDMI2 on dannym HDMI1 at work
+# but $mod+shift+right works
+bindsym $mod+p move container to output HDMI2
+bindsym $mod+Shift+p move workspace to output HDMI2
 bindsym $mod+s move container to output VGA1
 bindsym $mod+Shift+s move workspace to output VGA1
 

dottmux.conf

@@ -42,7 +42,7 @@ bind-key p save-buffer ~/.tmux-buffer \; run-shell "xsel -i -b <~/.tmux-buffer &
 
 # Environment handling
 # This replaces the hacky "restore_gui_env" I used for screen
-set -g update-environment "SSH_AGENT_PID SSH_AUTH_SOCK SSH_CLIENT SSH_TTY SSH_CONNECTION GPG_AGENT_INFO GPG_TTY DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS XDG_SESSION_COOKIE"
+set update-environment -g "SSH_AGENT_PID SSH_AUTH_SOCK SSH_CLIENT SSH_TTY SSH_CONNECTION GPG_AGENT_INFO GPG_TTY DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS XDG_SESSION_COOKIE"
 
 # We live in a UTF-8 world with colour terminals
 setw -g utf8 on

dotxsession

@@ -9,6 +9,8 @@
 export XDG_CACHE_HOME=/tmp/$USER/cache
 mkdir -p $XDG_CACHE_HOME
 
+xrdb -merge ~/.Xresources
+
 # debug
 echo ".xession has run" > ~/tmp/xsession-run
 env >> ~/tmp/xsession-run