updates

4 files changed, 36 insertions, 10 deletions

diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index a1eca7c..8b3e757 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -159,15 +159,15 @@ bar {
         status_command i3status
 }
 
-# exec run-once nm-applet
-exec run-once wicd-client -t
+exec run-once nm-applet
+# exec run-once wicd-client -t
 exec run-once clipit
 exec run-once xbindkeys
 exec run-once synclient PalmDetect=1
 exec run-once synclient HorizTwoFingerScroll=1
-exec run-once fetchmail -d 60
+#exec run-once fetchmail -d 60
 exec run-once qasmixer -t
-exec run-once tresorit --hidden
+# exec run-once tresorit --hidden
 # exec run-once xfce4-power-manager
 exec run-once blueman-applet
-exec run-once feh --bg-scale "/home/jason/Tresors/SpiderOak Hive/wallpaper/wallhaven-3601.jpg"
\ No newline at end of file
+exec run-once feh --bg-scale "/home/jason/Tresors/SpiderOak Hive/wallpaper/wallhaven-3601.jpg"
diff --git a/scripts/bin/fix_screens_at_work.sh b/scripts/bin/fix_screens_at_work.sh
index 5fa27a7..a4f20a6 100755
--- a/scripts/bin/fix_screens_at_work.sh
+++ b/scripts/bin/fix_screens_at_work.sh
@@ -2,7 +2,7 @@
 
 #xrandr --setprovideroutputsource 1 0
 #xrandr --output DP-2 --mode 1920x1200
-xrandr --output DP-4 --right-of DP-2 --auto --primary --mode 2560x1440
+xrandr --output DP-4 --right-of DP-2 --auto --primary #--mode 2560x1440
 xrandr --output DVI-I-1-1 --below DP-4 --auto
 
 # For some reason, occasionally this needs to be executed twice
diff --git a/ubuntu_move_in.sh b/ubuntu_move_in.sh
index ec495f5..a21cff8 100644
--- a/ubuntu_move_in.sh
+++ b/ubuntu_move_in.sh
@@ -2,8 +2,23 @@ echo "Updaing and dist-upgrading"
 sudo apt-get update && sudo apt-get -y dist-upgrade
 
 echo "Installing some utilities"
-sudo apt-get install -y build-essential git stow zsh \
-     rxvt-unicode-256color
+sudo apt-get install -y \
+     build-essential \
+     docker \
+     git \
+     mosh \
+     python-pip \
+     rxvt-unicode-256color \
+     scdaemon \
+     pcscd \
+     gpgsm \
+     yubikey-personalization-gui \
+     stow \
+     zsh \
+     w3m \
+     xsel # Terminal copy paste helper
+
+sudo pip install virtualenvwrapper
 
 cd $HOME
 
@@ -22,6 +37,8 @@ fi
 cd $HOME/dotfiles/
 echo "Linking xorg configs..."
 stow xorg
+# Enables clipboard with C-Shift-c/v in urxvt with xsel
+sudo ln -s $HOME/dotfiles/urxvt-clipboard /usr/lib/urxvt/perl/clipboard
 
 # emacs
 if ! [ -x /usr/local/bin/emacs ]; then
@@ -66,3 +83,8 @@ fi
 
 # other utils
 sudo apt-get install -y clipit feh xbindkeys fetchmail qasmixer
+
+echo "Things to manually download"
+echo ""
+echo "- Vivaldi"
+echo "- Google Chrome"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index cc6921d..4dc5943 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -56,7 +56,8 @@ source $ZSH/oh-my-zsh.sh
 export RUST_SRC_PATH="$HOME/Code/rust-lang/src"
 source $HOME/.cargo/env
 
-export PATH="$HOME/bin:$HOME/.cargo/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/games"
+export PATH="$HOME/bin:$HOME/.cargo/bin:/usr/local/go/bin/:$PATH"
+export PATH="$PATH:$(go env GOPATH)/bin"
 export MANPATH="/usr/local/man:$MANPATH"
 
 export LANG=en_US.UTF-8
@@ -87,6 +88,7 @@ source /usr/local/bin/virtualenvwrapper.sh
 alias emacs='emacsclient'
 
 alias dc='docker-compose'
+alias define='sdcv'
 
 #. ~/.cargo/env
 eval "$(direnv hook zsh)"
@@ -103,4 +105,6 @@ show_virtual_env() {
   fi
 }
 
-PS1='$(show_virtual_env)'$PS1
+#PS1='$(show_virtual_env)'$PS1
+
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh