Merge branch 'master' of git.riedstra.us:/mitch/dotfiles

1 files changed, 24 insertions, 20 deletions

diff --git a/mkshrc b/mkshrc
index f2f5fd7..af09ae7 100644
--- a/mkshrc
+++ b/mkshrc
@@ -8,6 +8,10 @@
 #
 # Personally I use this with mksh, .mkshrc is auto loaded by mksh
 
+# Nifty little line that will force the script to return if it's not runnking KSH
+# Automatically uncommented if installed system-wide with "install_mkshrc_system"
+# [ -z "$KSH_VERSION" ] && return
+
 # This will hopefully fix the bullshit with zsh
 if \
 	[ $SHELL = "/bin/zsh" ] || \
@@ -38,12 +42,12 @@ precmd() {
 	(( e )) && print -n "$e|"
 }
 set_ps1() {
-		PS1='$(precmd)${BG}${ACCENT_C}${ACCENT_P}${USER_C}${USER:=$(id -un)}@$(hostname -s)${ACCENT_C}${ACCENT_P} ${ACCENT_P}${PATH_C}${PWD:-?}${ACCENT_C}${ACCENT_P}${END_C}
+		PS1='$(precmd)${BG}${ACCENT_C}${ACCENT_P}${USER_C}${USER:=$(id -un)}@$(hostname)${ACCENT_C}${ACCENT_P} ${ACCENT_P}${PATH_C}${PWD:-?}${ACCENT_C}${ACCENT_P}${END_C}
 ${END_P} '
 		export PS1;
 }
 set_root_ps1() {
-PS1='$(precmd)${BG}${ACCENT_C}${ACCENT_P}${HOST_C}$(hostname -s)${ACCENT_C}${ACCENT_P} ${ACCENT_P}${PATH_C}${PWD:-?}${ACCENT_C}${ACCENT_P}${END_C}
+PS1='$(precmd)${BG}${ACCENT_C}${ACCENT_P}${HOST_C}$(hostname)${ACCENT_C}${ACCENT_P} ${ACCENT_P}${PATH_C}${PWD:-?}${ACCENT_C}${ACCENT_P}${END_C}
 ${END_P} '
 export PS1;
 }
@@ -52,7 +56,7 @@ set_prompt() {
 	if [ `id -u` -eq 0 ] ; then
 		# Previously
 		# Red for root, and no username 
-		# PS1="$(hostname -s) \$PWD
+		# PS1="$(hostname) \$PWD
 		BG=""
 		ACCENT_C=""
 		ACCENT_P="|"
@@ -63,7 +67,7 @@ set_prompt() {
 		set_root_ps1
 	else	
 		# Previously
-		# PS1="${USER:=$(id -un)}@$(hostname -s) \$PWD
+		# PS1="${USER:=$(id -un)}@$(hostname) \$PWD
 		BG=""
 		ACCENT_C=""
 		ACCENT_P="|"
@@ -75,7 +79,7 @@ set_prompt() {
 	fi
 }
 set_basic_prompt() {
-	PS1="$(precmd)${USER:=$(id -un)}@$(hostname -s) \$PWD $ "
+	PS1="$(precmd)${USER:=$(id -un)}@$(hostname) \$PWD $ "
 	export PS1;
 }
 set_super_basic_prompt() {
@@ -103,17 +107,15 @@ fi
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 setaliases() {
 	alias ls="ls -F";
-	alias l="ls -lh";
-	alias ll="ls -l";
+	alias l="ls -lhF";
+	alias ll="ls -lhF";
 	alias g="grep";
 	alias m="$PAGER";
 	alias j="jobs";
 	alias p="pwd";
 	alias gdb='gdb -q'
 	alias bc='bc -q'
-	alias egrep='egrep --color=auto'
 	alias eg='egrep'
-	alias egf='egrep --color=force'
 	alias search='egrep -rniI'
 }
 
@@ -127,7 +129,8 @@ setcoloraliases() {
 	fi
 
 	alias grep="grep --color=auto";
-	alias diff='colordiff';
+	alias egrep='egrep --color=auto'
+	alias diff="$(which diff colordiff 2>/dev/null | tail -n 1)";
 	alias search='egrep --color=auto -rnI';
 	alias t='tree -CdL'
 }
@@ -135,16 +138,20 @@ setcoloraliases() {
 setsudoaliases() {
 	if which sudo > /dev/null 2>&1 && [ -x "$(which sudo)" ] ; then
 	# Package managers
+	# Isn't it amazing how many distros you end up using?
 	alias apt-get='sudo apt-get'
 	alias yum='sudo dnf'
 	alias dnf='sudo dnf'
 	alias pacman='sudo pacman'
+	alias xbps-install='sudo xbps-install'
+	alias xbps-remove='sudo xbps-remove'
 	alias pkg='sudo pkg'
 
 	# Filesystem utilities
 	alias zfs='sudo zfs'
 	alias btrfs='sudo btrfs'
 	alias mount='sudo mount'
+	alias umount='sudo umount'
 	fi
 }
 
@@ -543,13 +550,10 @@ colormanpages() {
 #|_|  |_|_|___/\___| |_|   \__,_|_| |_|\___|\__|_|\___/|_| |_|___/
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 set_editor() {
-	export EDITOR="vi"
+	# export EDITOR="vi"
 
-	if [ -x "$(which nvim)" ] ; then
-		export EDITOR="$(which nvim)"
-	elif [ -x "$(which vim)" ] ; then
-		export EDITOR="$(which vim)"
-	fi
+	export EDITOR="$(which ed mg nano vi vim nvim 2>/dev/null | tail -n1)"
+	export VISUAL="$EDITOR"
 
 	# Set an alias for our editor of choice
 	alias vi="$EDITOR"
@@ -589,11 +593,12 @@ export LANG="$1";
 
 NEWLINE='$(printf "\n")'
 SHELL_CONFIG=".mkshrc"
-PRELOAD="$HOME/${SHELL_CONFIG}.pre"
-LOCAL="$HOME/${SHELL_CONFIG}.local"
-UPDATE_URL="https://www.rygel.us/etc/"
 FANCY_PROMPT=1
 COLOR=1
+UPDATE_URL="https://www.rygel.us/etc/"
+
+PRELOAD="$HOME/${SHELL_CONFIG}.pre"
+LOCAL="$HOME/${SHELL_CONFIG}.local"
 
 # For use with SSL functions
 # Just use easy-rsa, it's less hassle
@@ -607,7 +612,6 @@ COLOR=1
 set_pager
 set_editor
 export PATH="$HOME/bin:$PATH"
-export VISUAL="$EDITOR"
 export GOPATH=$HOME/go
 export PATH=$PATH:$GOPATH/bin