From a0bbca914b541b85a4c38dca657bee8df6b0ef19 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Tue, 19 Jan 2016 01:20:43 -0600
Subject: [PATCH 1/6] fixed some stuuuffff

---
 arch_linux_init/utils.bash | 2 +-
 sh/bashrc                  | 5 ++++-
 x/xresources               | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch_linux_init/utils.bash b/arch_linux_init/utils.bash
index 3855aac..9d4e6ec 100755
--- a/arch_linux_init/utils.bash
+++ b/arch_linux_init/utils.bash
@@ -7,7 +7,7 @@ sudo pacman -S \
   rofi \
   slock \
   the_silver_searcher \
-  thunar \
+  thunar thunar-volman \
   luakit \
   alsa-utils \
   --noconfirm
diff --git a/sh/bashrc b/sh/bashrc
index 0de0961..c8d343a 100644
--- a/sh/bashrc
+++ b/sh/bashrc
@@ -4,7 +4,7 @@ BASE16_SHELL="$DOTFILES_PATH/colors/shell"
 [[ -s "$BASE16_SHELL" ]] && source "$BASE16_SHELL"
 
 # disable ctrl-s terminal freeze
-stty -ixon
+[[ $- == *i* ]] && stty -ixon
 
 # filesystem aliases
 alias lx='ls -lXB' # order by filetype
@@ -43,6 +43,9 @@ alias gac="git add -A && git commit -m"
 # networking aliases
 alias p="ping 8.8.8.8"
 
+# emacs aliases
+alias emacs="emacs -nw"
+
 if command -v nvim >/dev/null 2>&1; then
   alias vim="nvim"
   alias ovim="\vim"
diff --git a/x/xresources b/x/xresources
index 011ec91..9740344 100755
--- a/x/xresources
+++ b/x/xresources
@@ -3,6 +3,8 @@
 #define iconfont xft:stlarch-9
 #define primaryletterspace -2
 
+#define emacspfont Monaco 9
+
 *font: primaryfont
 *faceName: primaryfont
 *boldFont: primaryfont
@@ -14,6 +16,8 @@
 *intensityStyles: true
 *utf8: 2
 
+emacs.font: emacspfont
+
 *depth: 32
 
 URxvt.internalBorder: 10

From 8626f63fc78d7c0997d8ab67b487994f6fa7e8ec Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Thu, 21 Jan 2016 04:40:51 -0600
Subject: [PATCH 2/6] simpler prompt 2

---
 sh/bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sh/bashrc b/sh/bashrc
index c8d343a..64a7c17 100644
--- a/sh/bashrc
+++ b/sh/bashrc
@@ -63,7 +63,7 @@ prompt_command_func()
   else
     STATUS_COLOR=$PROMPT_FAILURE_COLOR
   fi;
-  PS1="┌ $STATUS_COLOR\u@\h$COLOR_RESET \w \n└ "
+  PS1="$STATUS_COLOR\u@\h$COLOR_RESET \w > "
 }
 export PROMPT_COMMAND="prompt_command_func"
 

From ee0a71fcd6394ff2f9ba21b88ddc70475c6cfd50 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Thu, 21 Jan 2016 04:44:48 -0600
Subject: [PATCH 3/6] color the directory

---
 sh/bashrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sh/bashrc b/sh/bashrc
index 64a7c17..aa472dd 100644
--- a/sh/bashrc
+++ b/sh/bashrc
@@ -55,6 +55,7 @@ fi
 COLOR_RESET='\e[0m'
 PROMPT_SUCCESS_COLOR='\e[0;34m'
 PROMPT_FAILURE_COLOR='\e[0;31m'
+DIR_COLOR='\e[0;33m'
 prompt_command_func()
 {
   RET=$?
@@ -63,7 +64,7 @@ prompt_command_func()
   else
     STATUS_COLOR=$PROMPT_FAILURE_COLOR
   fi;
-  PS1="$STATUS_COLOR\u@\h$COLOR_RESET \w > "
+  PS1="$STATUS_COLOR\u@\h$COLOR_RESET $DIR_COLOR\w$COLOR_RESET > "
 }
 export PROMPT_COMMAND="prompt_command_func"
 

From 3c43c8963cf7cd7304692fd2fc740a9ad646636e Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Thu, 21 Jan 2016 05:07:13 -0600
Subject: [PATCH 4/6] better

---
 sh/bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sh/bashrc b/sh/bashrc
index aa472dd..804ecdd 100644
--- a/sh/bashrc
+++ b/sh/bashrc
@@ -64,7 +64,7 @@ prompt_command_func()
   else
     STATUS_COLOR=$PROMPT_FAILURE_COLOR
   fi;
-  PS1="$STATUS_COLOR\u@\h$COLOR_RESET $DIR_COLOR\w$COLOR_RESET > "
+  PS1="$STATUS_COLOR\u@\h$COLOR_RESET $DIR_COLOR\w$COLOR_RESET "
 }
 export PROMPT_COMMAND="prompt_command_func"
 

From cf3fa25c16dc238ea9f4c69a9e53b3d39a20894a Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Thu, 21 Jan 2016 05:07:44 -0600
Subject: [PATCH 5/6] gl alias for git log

---
 sh/bashrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sh/bashrc b/sh/bashrc
index 804ecdd..ecc90a7 100644
--- a/sh/bashrc
+++ b/sh/bashrc
@@ -36,6 +36,7 @@ alias tmatt="tmux attach -t"
 
 # git aliases
 alias gs="git status"
+alias gl="git log"
 alias gpl="git pull"
 alias gp="git push"
 alias gac="git add -A && git commit -m"

From 41b9d49c7a54e5f5ed8cb91444e97562a6deca9f Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Fri, 22 Jan 2016 05:45:14 -0600
Subject: [PATCH 6/6] fixed line-wrapping error in PS1

---
 sh/bashrc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sh/bashrc b/sh/bashrc
index ecc90a7..9245fe7 100644
--- a/sh/bashrc
+++ b/sh/bashrc
@@ -53,10 +53,10 @@ if command -v nvim >/dev/null 2>&1; then
 fi
 
 # prompt
-COLOR_RESET='\e[0m'
-PROMPT_SUCCESS_COLOR='\e[0;34m'
-PROMPT_FAILURE_COLOR='\e[0;31m'
-DIR_COLOR='\e[0;33m'
+COLOR_RESET='\[\e[0m\]'
+PROMPT_SUCCESS_COLOR='\[\e[0;34m\]'
+PROMPT_FAILURE_COLOR='\[\e[0;31m\]'
+DIR_COLOR='\[\e[0;33m\]'
 prompt_command_func()
 {
   RET=$?