From dcd1b1bdf958815bd671652af8629acb131b5821 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Sat, 22 Nov 2014 19:14:54 -0500
Subject: [PATCH] Started formatting .txt files. Fixed fvim and dnstest.

---
 i3/config           |  3 ++-
 scripts/desktop.txt | 51 +++++++++++++--------------------------------
 scripts/server.txt  |  7 ++++++-
 shells/zshrc        |  8 ++++---
 4 files changed, 28 insertions(+), 41 deletions(-)

diff --git a/i3/config b/i3/config
index a676766..410fe4c 100644
--- a/i3/config
+++ b/i3/config
@@ -3,6 +3,7 @@ bindsym $mod+d exec i3-input -F 'rename workspace to "%s"' -P 'Rename to: '
 #exec xrandr --output HDMI3 --left-of HDMI1 &
 #exec xmodmap ~/.Xmodmap &
 
+bindsym Print exec "shutter -r"
 #Audio
 bindsym XF86AudioRaiseVolume exec "amixer set Master 5%+ unmute"
 bindsym XF86AudioLowerVolume exec "amixer set Master 5%- unmute"
@@ -163,7 +164,7 @@ 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/xterm &'
-exec --no-startup-id i3-msg /usr/bin/shutter --min_at_startup
+exec --no-startup-id /usr/bin/shutter --min_at_startup
 exec --no-startup-id /usr/bin/screen -dmS syncthing /home/stonewareslord/Applications/syncthing/syncthing
 exec --no-startup-id /usr/bin/owncloud
 exec --no-startup-id /usr/bin/nm-applet
diff --git a/scripts/desktop.txt b/scripts/desktop.txt
index 1f0a0d1..77ed0b4 100644
--- a/scripts/desktop.txt
+++ b/scripts/desktop.txt
@@ -8,61 +8,26 @@
 #owncloud-client
 synaptic
 python-glade2
-meld
 compiz-plugins-extra
 compizconfig-settings-manager
-audacity
-vlc
-gimp
-filezilla
 ntp
-winff
 cplay
 ubuntu-restricted-extras
-kdenlive
 gparted
-diodon
 mysql-workbench
-synergy
 wireshark
-shutter
-gtk-redshift
 unetbootin
 exiv2
 xdotool
 htop
 #wicd-daemon
 #wicd-curses
-network-manager
-firefox
-#thunderbird
-midori
-ark
-thunar
-okular
-k3b
-baobab
-libreoffice
-libreoffice-templates
 kvpnc
-nitrogen
-banshee
-xautolock
 sqlitebrowser
-tdfsb
-icedtea-7-plugin
 lsb
 python-tk
-blender
-libnotify-bin
-xterm
-xdm
-i3-wm
-i3status
-i3lock
 xinit
 suckless-tools
-feh
 pm-utils
 alsa-utils
 numlockx
@@ -70,5 +35,19 @@ virtualbox
 x11vnc
 xvnc4viewer
 ntop
-gnome-dictionary
 powermanagement-interface
+mpd mpc ncmpcpp
+
+# Standard Desktop Applications
+#firefox thunderbird
+meld filezilla
+audacity vlc gimp winff blender banshee kdenlive
+libnotify-bin xterm xdm i3-wm i3status i3lock feh nitrogen xautolock
+libreoffice libreoffice-templates gnome-dictionary shutter
+diodon synergy
+ark thunar okular tdfsb baobab
+gtk-redshift
+network-manager
+midori
+k3b
+icedtea-7-plugin
diff --git a/scripts/server.txt b/scripts/server.txt
index ed5a017..39a5811 100644
--- a/scripts/server.txt
+++ b/scripts/server.txt
@@ -13,7 +13,6 @@ unzip
 curl
 wget
 parted
-finch
 php5-json
 php5-gd
 orpie
@@ -70,3 +69,9 @@ sshuttle
 nethogs
 w3m
 aircrack-ng
+tshark
+secure-delete
+encfs
+fsniper
+cryptsetup
+pv
diff --git a/shells/zshrc b/shells/zshrc
index 1a6203b..299b467 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -36,6 +36,7 @@ export EDITOR='vim'
 if [ "$(uname)" != "Darwin" ]; then
   alias ls='ls --color=always -F'
 fi
+alias srm='srm -dv'
 alias pass='DISPLAY= pass'
 alias ehistory='cat ~/.bash_eternal_history|egrep -iP $@'
 alias bat='upower -i /org/freedesktop/UPower/devices/battery_BAT0| grep -E "state|to\ full|percentage"'
@@ -87,7 +88,7 @@ alias echip="curl ifconfig.me"
 alias vpn="cd ~/.openvpn;sudo openvpn config.ovpn;cd -"
 alias to="~/.todo/todo.sh"
 alias stdns="sudo sh -c 'echo \"nameserver 8.8.8.8\\nnameserver 8.8.4.4\" > /etc/resolv.conf'"
-alias fvim="vim -u NONE +\"so ~/.vim/bundle/flappyvird-vim/plugin/flappyvird.vim\" +\"so ~/.vim/bundle/flappyvird-vim/autoload/flappyvird.vim\" +\":FlappyVird\" +\":q\""
+alias fvim="vim -u NONE +\"so ~/.vim/plugged/flappyvird-vim/plugin/flappyvird.vim\" +\"so ~/.vim/plugged/flappyvird-vim/autoload/flappyvird.vim\" +\":FlappyVird\" +\":q\""
 alias fk='k `fzf --no-mouse -m -1 -x`'
 alias fh='eval $(([ -n "$ZSH_NAME" ] && fc --no-mouse -m -1 -x -l 1 || history) | fzf +s | sed "s/ *[0-9]* *//")'
 alias fkill='ps -ef | sed 1d | fzf --no-mouse -m -1 -x | awk "{print $2}" | xargs kill -${1:-9}'
@@ -107,12 +108,13 @@ function smon(){
   timeout 1s pdsh -R ssh -w 10.0.1.196,10.0.1.207 "$@"
 }
 function dnstest(){
+  echo "resolv.conf:"
+  cat /etc/resolv.conf
   echo "Testing ping:"
   ping -c 2 8.8.8.8
   echo "Testing IP curl:"
   curl -k https://98.26.78.121/b/
-  echo "\nresolv.conf:"
-  cat /etc/resolv.conf
+  echo
   echo "Testing DNS"
   curl ifconfig.me
 }