From 36503ba3c6683d6a73a55d299947df229a7ead15 Mon Sep 17 00:00:00 2001
From: Austen <stonewareslord@gmail.com>
Date: Mon, 7 Jul 2014 03:20:57 -0400
Subject: [PATCH] Added disphost command, changed tsh command, added logout
 command, added fixsh command. Added extra packages in desktop.txt. Swapped
 vimperator a and A. Added mac brew commands when sync.sh -d is called instead
 of calling the nonexistant apt-get command.

---
 bashrc       |  6 +++++-
 desktop.txt  | 13 +++++++------
 sync.sh      |  8 ++++++--
 vimperatorrc |  2 ++
 vimrc        |  4 ++--
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/bashrc b/bashrc
index 44cf2ce..540006f 100644
--- a/bashrc
+++ b/bashrc
@@ -85,6 +85,7 @@ if [ -x /usr/bin/dircolors ]; then
 fi
 
 # some more ls aliases
+alias disphost='export DISPLAY=:0.0'
 alias ll='ls -alF'
 alias la='ls -A'
 alias l='ls -CF'
@@ -102,7 +103,8 @@ if ! shopt -oq posix; then
 fi
 PATH=$PATH:~/tmp/ucpp/ucpp/
 function tsh(){
-  ssh $* -t 'tux;exit'
+  ssh $* -X
+  echo -e "\n\n\n\n\n\n\nSESSION CLOSED\n\n\n\n\n\n\n"
 }
 [ -f /usr/share/autojump/autojump.sh ] && . /usr/share/autojump/autojump.sh
 
@@ -123,6 +125,8 @@ fi
 #TODO: Doesn't work yet 
 #alias ovim='vim +SessionOpen\\ $@'
 #alias ogvim='gvim +SessionOpen\\ $@'
+alias logout='sudo pkill -u $USER'
+alias fixsh='ssh-keygen -R'
 alias tmux='tmux -2'
 alias less='less -r'
 alias tree='tree -C'
diff --git a/desktop.txt b/desktop.txt
index ae75a63..22c0a7a 100644
--- a/desktop.txt
+++ b/desktop.txt
@@ -23,8 +23,7 @@ subversion
 git
 orpie
 terminator
-#No installation candadate? 
-#ffmpeg
+ffmpeg
 winff
 youtube-dl
 tasksel
@@ -40,7 +39,6 @@ ubuntu-restricted-extras
 lynx-cur
 unzip
 #openjdk7-jre
-docky
 curl
 wget
 kdenlive
@@ -61,9 +59,12 @@ lm-sensors
 unetbootin
 openvpn
 autojump
-#clemetine
+cairo-dock
+owncloud-client
+clemetine
+exiv2
+xdotool
 #IN STARTUP ITEMS: gtk-redshift -l 36.3:-80.3 -t 6500:4000
-#sshfs stonewareslord@10.0.1.201:/var/www/ /mnt
 #FOR CAFFEINE sudo add-apt-repository ppa:caffeine-developers/ppa
 #caffeine
-#variety owncloud-client
+#variety
diff --git a/sync.sh b/sync.sh
index 6376c51..bef8fbd 100755
--- a/sync.sh
+++ b/sync.sh
@@ -35,8 +35,12 @@ while getopts ":hbsdtc" VALUE "$@"; do
   fi
   if [ "$VALUE" = "d" ] ; then
     echo "Installing desktop applications"
-    echo $(grep -vE "^\s*#" desktop.txt | tr "\n" " ")
-    sudo apt-get install $(grep -vE "^\s*#" desktop.txt | tr "\n" " ")
+    if [ "$(uname)" != "Darwin" ]; then
+      echo $(grep -vE "^\s*#" desktop.txt | tr "\n" " ")
+      sudo apt-get install $(grep -vE "^\s*#" desktop.txt | tr "\n" " ")
+    else
+      brew install autojump ncdu htop vim youtube-dl tree sshfs ircii
+    fi
   fi
   if [ "$VALUE" = "t" ] ; then
     echo "Syncing tmux"
diff --git a/vimperatorrc b/vimperatorrc
index 979f959..e5cdc5e 100644
--- a/vimperatorrc
+++ b/vimperatorrc
@@ -14,6 +14,8 @@ noremap <C-i> mp'n<Esc>
 noremap G mpG<Esc>
 noremap gg mpgg<Esc>
 noremap / mp/
+noremap a A
+noremap A a
 inoremap L $
 inoremap H ^
 vnoremap L $
diff --git a/vimrc b/vimrc
index 5f8819e..29603a1 100644
--- a/vimrc
+++ b/vimrc
@@ -77,7 +77,6 @@ map , <Plug>(easymotion-prefix)
 noremap ! :!
 nnoremap ; :
 noremap J Jx
-nnoremap ;; m"A;<Esc>`"
 vnoremap < <gv
 vnoremap > >gv
 inoremap <F1> <nop>
@@ -96,7 +95,8 @@ inoremap <> <><Left>
 inoremap {} <Right>{}<Left><CR><Esc>O
 inoremap {% {%  %}<Left><Left><Left>
 inoremap [] []<Left>
-inoremap ;; <Esc>m`A;<Esc>``a
+inoremap ;; <Esc>m`A;<Esc>``ao
+nnoremap ;; m"A;<Esc>`"o
 inoremap <C-l> <Right>
 inoremap <C-h> <Left>
 inoremap <C-k> <Up>