Don't automatically start ownCloud. Syncs pip packages. Fixed sessionman syncing. FIX ALIASING.

i3/config

@@ -11,7 +11,8 @@ bindsym XF86AudioMute exec "amixer -D pulse set Master 1+ toggle"
 exec --no-startup-id xautolock -time 3 -locker 'i3lock -i `shuf -n1 -e ~/.i3/wall/*`; sleep 60; pgrep i3lock && xset dpms force off' &
 
 #startup
-exec --no-startup-id i3-msg 'workspace 10; exec /home/stonewareslord/xmodmap.sh&/usr/bin/owncloud&/usr/bin/redshift t -l 36.3:-80.3 -t 6500:4000&wicd-gtk&'
+#exec --no-startup-id i3-msg 'workspace 10; exec /home/stonewareslord/xmodmap.sh&/usr/bin/owncloud&/usr/bin/redshift t -l 36.3:-80.3 -t 6500:4000&wicd-gtk&'
+exec --no-startup-id i3-msg 'workspace 10; exec /home/stonewareslord/xmodmap.sh&/usr/bin/redshift t -l 36.3:-80.3 -t 6500:4000&wicd-gtk&'
 #exec --no-startup-id i3-msg 'workspace 10; exec /home/stonewareslord/applications/Telegram/Telegram&'
 exec --no-startup-id i3-msg 'workspace 2; exec /usr/bin/firefox &'
 #exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/konsole -e wemux&'

scripts/desktop.txt

@@ -52,4 +52,7 @@ nitrogen
 banshee
 xautolock
 sqlitebrowser
+<<<<<<< Updated upstream
 tdfsb
+=======
+>>>>>>> Stashed changes

scripts/pip.txt

@@ -0,0 +1,5 @@
+argparse
+twisted
+matplotlib
+numpy
+tornado

scripts/server.txt

@@ -50,3 +50,4 @@ ncdu
 nmap
 traceroute
 openjdk-7-jdk
+fdupes

scripts/sync.sh

@@ -1,3 +1,4 @@
+ABSPATH=$(cd "$(dirname "$0")/.."; pwd)
 while getopts ":hbsdtclw" VALUE "$@"; do
   if [ "$VALUE" = "h" ] ; then
     echo "sync.sh syncs configuration files, applications, and Vim bundles between computers"
@@ -16,11 +17,6 @@ while getopts ":hbsdtclw" VALUE "$@"; do
     mkdir -p ~/.vim/bundle/
     mkdir -p ~/.vim/bundle/
     echo "Installing vim bundles"
-    if [ ! -f ~/.vim/plugin/sessionman.vim ]
-    then
-      echo "Installing sessionman in ~/.vim/plugin/"
-      wget -O ~/.vim/plugin/sessionman.vim http://www.vim.org/scripts/download_script.php?src_id=15599
-    fi
     if [ ! -d ~/.vim/bundle/vundle/ ]
     then
       echo "Installing vundle"
@@ -54,7 +50,7 @@ while getopts ":hbsdtclw" VALUE "$@"; do
   if [ "$VALUE" = "t" ] ; then
     echo "Syncing tmux"
     rm ~/.tmux.conf
-    ln -s ${PWD}/../tmux/tmux.conf ~/.tmux.conf
+    ln -s $ABSPATH/tmux/tmux.conf ~/.tmux.conf
   fi
   if [ "$VALUE" = "c" ] ; then
     echo "Syncing config files"
@@ -63,25 +59,25 @@ while getopts ":hbsdtclw" VALUE "$@"; do
     else
       rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme
     fi
-    ln -s ${PWD}/../python/pylintrc ~/.pylintrc
-    ln -s ${PWD}/../vim/vimrc ~/.vimrc
-    ln -s ${PWD}/../vimperator/vimperatorrc ~/.vimperatorrc
+    ln -s $ABSPATH/python/pylintrc ~/.pylintrc
+    ln -s $ABSPATH/vim/vimrc ~/.vimrc
+    ln -s $ABSPATH/vimperator/vimperatorrc ~/.vimperatorrc
     mkdir -p ~/.vimperator/colors
-    ln -s ${PWD}/../vimperator/vimPgray.vimp ~/.vimperator/colors/vimPgray.vimp
+    ln -s $ABSPATH/vimperator/vimPgray.vimp ~/.vimperator/colors/vimPgray.vimp
     mkdir -p ~/.vimperator/info/sync/quickmarks
-    ln -s ${PWD}/../vimperator/quickmarks ~/.vimperator/info/sync/quickmarks
-    ln -s ${PWD}/../git/gitconfig ~/.gitconfig
-    ln -s ${PWD}/../shells/bashrc ~/.bashrc
+    ln -s $ABSPATH/vimperator/quickmarks ~/.vimperator/info/sync/quickmarks
+    ln -s $ABSPATH/git/gitconfig ~/.gitconfig
+    ln -s $ABSPATH/shells/bashrc ~/.bashrc
     if [ ! -f ~/.oh-my-zsh/oh-my-zsh.sh ] ; then
       curl -L http://install.ohmyz.sh | sh
     fi
-    ln -s ${PWD}/../shells/zshrc ~/.zshrc
-    ln -s ${PWD}/../shells/af-magic.zsh-theme ~/.oh-my-zsh/themes/af-magic.zsh-theme
+    ln -s $ABSPATH/shells/zshrc ~/.zshrc
+    ln -s $ABSPATH/shells/af-magic.zsh-theme ~/.oh-my-zsh/themes/af-magic.zsh-theme
     mkdir -p ~/.i3
-    ln -s ${PWD}/../i3/config ~/.i3/config
-    ln -s ${PWD}/../i3/sleep.sh ~/.i3/sleep.sh
-    ln -s ${PWD}/../i3/Xmodmap ~/.Xmodmap
-    ln -s ${PWD}/../i3/xsession ~/.xsession
+    ln -s $ABSPATH/i3/config ~/.i3/config
+    ln -s $ABSPATH/i3/sleep.sh ~/.i3/sleep.sh
+    ln -s $ABSPATH/i3/Xmodmap ~/.Xmodmap
+    ln -s $ABSPATH/i3/xsession ~/.xsession
   fi
   if [ "$VALUE" = "l" ] ; then
     echo "Linking standard directories..."

vim/vimrc

@@ -302,6 +302,8 @@ Bundle 'Shougo/neocomplete.vim'
   "Autocompletes | https://github.com/Shougo/neocomplete.vim
 Bundle 'othree/eregex.vim'
   "Real regexes in vim | https://github.com/othree/eregex.vim
+Bundle 'vim-scripts/sessionman.vim'
+  " |https://github.com/vim-scripts/sessionman.vim
   " |
   "DO NOT DELETE LINE ABOVE OR \bun WILL BREAK
 filetype plugin indent on