Merge branch 'master' of https://git.nixy.moe/nixy/dotfiles

bash/.aliases

@@ -1,7 +1,5 @@
 #{- ~/.aliases -}#
 
-alias vim="nvim "
-
 #{- FILE OPERATIONS -}#
 
 # Allow alias expansion for commands executed with sudo
@@ -40,6 +38,7 @@ alias df="df -h"
 alias du="du -sh"
 
 # History searches
+alias phistory='cat ${PERSISTENT_HISTFILE}'
 alias hgrep='history | grep --color'
 alias phgrep="cat ${PERSISTENT_HISTFILE} | grep --color"
 

bash/.bashrc

@@ -2,13 +2,23 @@
 
 #{- PROMPT -}#
 
-red="\001$(tput bold)$(tput setaf 1)\002"
-green="\001$(tput bold)$(tput setaf 2)\002"
-yellow="\001$(tput bold)$(tput setaf 3)\002"
-blue="\001$(tput bold)$(tput setaf 4)\002"
-magenta="\001$(tput bold)$(tput setaf 5)\002"
-cyan="\001$(tput bold)$(tput setaf 6)\002"
-no_color="\001$(tput sgr0)\002"
+if which tput &> /dev/null && tput bold &> /dev/null; then
+  red="\001$(tput bold)$(tput setaf 1)\002"
+  green="\001$(tput bold)$(tput setaf 2)\002"
+  yellow="\001$(tput bold)$(tput setaf 3)\002"
+  blue="\001$(tput bold)$(tput setaf 4)\002"
+  magenta="\001$(tput bold)$(tput setaf 5)\002"
+  cyan="\001$(tput bold)$(tput setaf 6)\002"
+  no_color="\001$(tput sgr0)\002"
+else
+  red="\[\033[1;31m\]"
+  green="\[\033[1;32m\]"
+  yellow="\[\033[1;33m\]"
+  blue="\[\033[1;34m\]"
+  magenta="\[\033[1;35m\]"
+  cyan="\[\033[1;36m\]"
+  no_color="\[\033[0m\]"
+fi
 
 
 export PS1="${green}\$${no_color} "

bash/.functions

@@ -21,3 +21,13 @@ cat_with_newline()
   cat "$@" && echo
 }
 alias cat="cat_with_newline"
+
+vim_option_select()
+{
+  if which nvim &> /dev/null; then
+    nvim "$@"
+  else
+    vim "$@"
+  fi
+}
+alias vim="vim_option_select "