Merge branch 'master' of austenwares.com:stonewareslord/Sync

i3/config

@@ -7,6 +7,9 @@ bindsym $mod+d exec i3-input -F 'rename workspace to "%s"' -P 'Rename to: '
 bindsym XF86AudioRaiseVolume exec "amixer set Master 5%+ unmute"
 bindsym XF86AudioLowerVolume exec "amixer set Master 5%- unmute"
 bindsym XF86AudioMute exec "amixer -D pulse set Master 1+ toggle"
+#bindsym XF86AudioRaiseVolume exec amixer -q set Master 2dB+ unmute
+#bindsym XF86AudioLowerVolume exec amixer -q set Master 2dB- unmute
+#bindsym XF86AudioMute exec amixer -q set Master toggle
 
 #screensaver
 exec --no-startup-id xautolock -time 3 -locker 'i3lock -di `shuf -n1 -e ~/.i3/wall/*`' &
@@ -154,7 +157,7 @@ exec --no-startup-id xmodmap ~/.xmodmap
 exec --no-startup-id /home/stonewareslord/xmodmap.sh
 exec --no-startup-id i3-msg '/usr/bin/redshift t -l 36.3:-80.3 -t 6500:4000&'
 exec --no-startup-id i3-msg 'workspace 2; exec /usr/bin/firefox &'
-exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/konsole &'
+exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/xterm &'
 exec --no-startup-id i3-msg 'workspace 10; exec /usr/bin/shutter --min_at_startup &'
 exec --no-startup-id screen -dmS syncthing /home/stonewareslord/Applications/syncthing/syncthing
 exec --no-startup-id /usr/bin/owncloud

i3/i3status.conf

@@ -0,0 +1,54 @@
+#i3status config
+general {
+    output_format= "i3bar"
+    colors         = true
+    #color_good     = '#ffffff'
+    #color_degraded = '#ffffff'
+    #color_bad      = '#ffffff'
+    color_good     = '#00ff00'
+    color_degraded = '#ff0000'
+    color_bad      = '#ff0000'
+    interval = 1
+}
+order += "disk /"
+order += "wireless wlan0"
+order += "ethernet p5p1"
+order += "volume master"
+order += "path_exists VPN"
+order += "battery 1"
+order += "tztime local"
+wireless wlan0 {
+    format_up = "%essid : %ip @ %quality"
+    format_down = "!W"
+}
+ethernet p5p1 {
+    # if you use %speed, i3status requires root privileges
+    format_up = "%ip (%speed)"
+    format_down = "!E"
+}
+tztime local {
+    format = "%a %b%e %r"
+    #:%M:%S
+}
+load {
+    format = "%5min"
+}
+path_exists VPN {
+    path = "/proc/sys/net/ipv4/conf/tun0"
+}
+volume master {
+  format = "V:%volume"
+  device = "default"
+  mixer = "Master"
+  mixer_idx = 0
+}
+battery 1 {
+  #format = "%status %remaining %emptytime"
+  format = "%status %percentage"
+  path = "/sys/class/power_supply/BAT0/uevent"
+  low_threshold = 20
+}
+disk "/" {
+    format = "%free"
+}
+# vim: ts=4:sw=4:et

scripts/server.txt

@@ -58,3 +58,4 @@ libavahi-client-dev
 libasound2-dev
 libpam-google-authenticator
 iodine
+macchanger

scripts/sync.sh

@@ -55,9 +55,9 @@ while getopts ":hbsdtclw" VALUE "$@"; do
   if [ "$VALUE" = "c" ] ; then
     echo "Syncing config files"
     if which trash >/dev/null; then
-      trash ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme ~/.screenrc ~/.Xresources
+      trash ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme ~/.screenrc ~/.Xresources ~/.i3/i3status.conf
     else
-      rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme ~/.screenrc ~/.Xresources
+      rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme ~/.screenrc ~/.Xresources ~/.i3/i3status.conf
     fi
     ln -s $ABSPATH/python/pylintrc ~/.pylintrc
     ln -s $ABSPATH/vim/vimrc ~/.vimrc
@@ -78,6 +78,7 @@ while getopts ":hbsdtclw" VALUE "$@"; do
     ln -s $ABSPATH/shells/af-magic.zsh-theme ~/.oh-my-zsh/themes/af-magic.zsh-theme
     mkdir -p ~/.i3
     ln -s $ABSPATH/i3/config ~/.i3/config
+    ln -s $ABSPATH/i3/i3status.conf ~/.i3/i3status.conf
     ln -s $ABSPATH/i3/wall.sh ~/.i3/wall.sh
     ln -s $ABSPATH/i3/sleep.sh ~/.i3/sleep.sh
     ln -s $ABSPATH/i3/Xmodmap ~/.Xmodmap

shells/zshrc

@@ -84,10 +84,10 @@ function dnstest(){
   ping -c 3 8.8.8.8
   echo "Testing IP curl:"
   curl -k https://98.26.78.121/b/
-  echo "resolv.conf:"
+  echo "\nresolv.conf:"
   cat /etc/resolv.conf
   echo "Testing DNS"
-  curl -k https://austenwares.com/b/
+  curl ifconfig.me
 }
 function cinitify(){
   mkdir $2