From 9279574e741484335432ca0bb8570390b317a483 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Mon, 18 Aug 2014 18:06:49 -0600
Subject: [PATCH] Improved i3config, sync.sh -d now automatically syncs
 server.txt then desktop.txt. Added many features to k.

---
 desktop.txt | 47 ++++++++++++-----------------------------------
 i3config    |  8 +++++---
 server.txt  | 17 ++++++++++++++---
 sync.sh     |  4 ++--
 zshrc       | 17 ++++++++++++++---
 5 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/desktop.txt b/desktop.txt
index 135d701..6d1f58b 100644
--- a/desktop.txt
+++ b/desktop.txt
@@ -4,71 +4,48 @@
 #synapse
 synaptic
 #python3.2
-python-pip
 python-glade2
 #pip install twisted argparse pygments
-vim
 meld
 compiz-plugins-extra
 compizconfig-settings-manager
 audacity
 vlc
 gimp
-cups-pdf
 filezilla
 ntp
-screen
-tmux
-subversion
-git
-orpie
-terminator
 #ffmpeg
 winff
-youtube-dl
-tasksel
-#tasksel install lamp-server
-php5-json
-php5-gd
-php-soap
-bum
 cplay
-openssh-server
-alien
 ubuntu-restricted-extras
-lynx-cur
-unzip
 #openjdk7-jre
-curl
-wget
 kdenlive
 gparted
-trash-cli
 pidgin
 diodon
-orpie
 mysql-workbench
 synergy
 wireshark
-cplay
 shutter
-wine
-sshfs
 gtk-redshift
-lm-sensors
 unetbootin
-openvpn
-autojump
 cairo-dock
 owncloud-client
-#clemetine
 exiv2
 xdotool
 htop
-nload
-sox
-libsox-fmt-mp3
-multitail
+wicd-daemon
+firefox
+thunderbird
+midori
+ark
+thunar
+okular
+k3b
+baobab
+libreoffice
+libreoffice-templates
+kvpnc
 #IN STARTUP ITEMS: gtk-redshift -l 36.3:-80.3 -t 6500:4000
 #FOR CAFFEINE sudo add-apt-repository ppa:caffeine-developers/ppa
 #caffeine
diff --git a/i3config b/i3config
index 264333d..3489d6f 100644
--- a/i3config
+++ b/i3config
@@ -9,8 +9,10 @@ exec xautolock -time 3 -locker 'i3lock -i ~/.i3/wall.png; sleep 60; pgrep i3lock
 
 #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 2; exec /usr/bin/firefox'
-exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/konsole -e wemux'
+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&'
+exec --no-startup-id nitrogen --restore
 
 #colors
 # color defines for zenburn styled i3
@@ -194,7 +196,7 @@ bindsym $mod+Shift+r reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+grave exec "i3lock -i ~/.i3/wall.png; sleep 60; pgrep i3lock && xset dpms force off"
 # 
-bindsym $mod+Shift+grave exec "i3lock -i ~/.i3/wall.png; dbus-send --system --print-reply --dest=\"org.freedesktop.UPower\" /org/freedesktop/UPower org.freedesktop.UPower.Suspend"
+bindsym $mod+Shift+grave exec "gksu pm-suspend; i3lock -i ~/.i3/wall.png"
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+q restart
 # exit i3 (logs you out of your X session)
diff --git a/server.txt b/server.txt
index ef9599f..bb71c70 100644
--- a/server.txt
+++ b/server.txt
@@ -1,6 +1,9 @@
 tasksel
+#tasksel install lamp-server
 php5-gd
 php5-curl
+php-soap
+bum
 openssh-server
 lynx-cur
 unzip
@@ -8,11 +11,10 @@ curl
 wget
 parted
 finch
-sshfs
 php5-json
 php5-gd
 orpie
-libpython2.6
+#libpython2.6
 python-simplejson
 vim
 python-pip
@@ -24,7 +26,9 @@ screen
 tmux
 git
 subversion
-ffmpeg
+#ffmpeg
+sshfs
+wine
 bum
 alien
 lynx-cur
@@ -35,3 +39,10 @@ nload
 sox
 libsox-fmt-mp3
 multitail
+zsh
+cups-pdf
+youtube-dl
+trash-cli
+irssi
+mutt
+gdebi
diff --git a/sync.sh b/sync.sh
index bdeb04d..22bba5f 100755
--- a/sync.sh
+++ b/sync.sh
@@ -45,8 +45,8 @@ while getopts ":hbsdtclw" VALUE "$@"; do
   if [ "$VALUE" = "d" ] ; then
     echo "Installing desktop applications"
     if [ "$(uname)" != "Darwin" ]; then
-      echo $(grep -vE "^\s*#" desktop.txt | tr "\n" " ")
-      sudo apt-get install $(grep -vE "^\s*#" desktop.txt | tr "\n" " ")
+      echo $(grep -vE "^\s*#" server.txt | tr "\n" " ") $(grep -vE "^\s*#" desktop.txt | tr "\n" " ")
+      sudo apt-get install $(grep -vE "^\s*#" server.txt | tr "\n" " ") $(grep -vE "^\s*#" desktop.txt | tr "\n" " ")
     else
       brew install autojump ncdu htop vim youtube-dl tree sshfs ircii imagemagick node ffmpeg wget lua libconfig readline meld
     fi
diff --git a/zshrc b/zshrc
index df76faf..2b432bf 100644
--- a/zshrc
+++ b/zshrc
@@ -192,11 +192,22 @@ function k(){
       *)           vim $1
     esac
   else
-    echo -n "Create? "
+    echo -n "Exec: "
     read a
-    if [ ! -z $a ] ; then
+    if [[ $a == "d" ]] ; then
+      mkdir $@
+    elif [[ $a == "c" ]] ; then
+      mkdir $@
+      cd $@
+    elif [[ $a == "y" ]] ; then
       vim "$@"
+    elif [[ $a == "f" ]] ; then
+      firefox "$@"
+    elif [[ $a == "x" ]] ; then
+      rm "$@"
+    elif [[ $a == "xd" ]] ; then
+      rmdir "$@"
     fi
   fi
 }
-function mcl(){ mkdir "$@"&&k "$@"; }
\ No newline at end of file
+function mcl(){ mkdir "$@"&&k "$@"; }