moving to emacs, some prompt changes

bash/.bashrc

@@ -10,7 +10,9 @@
                                                             
 
 # Set some defaults.
-export EDITOR="nvim"
+export EDITOR="emacsclient -t"
+export VISUAL="emacsclient -c -a emacs"
+export ALTERNATE_EDITOR=""
 export PATH=".:~/bin:~/.local/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
 export LSCOLORS="ExGxBxDxCxEgEdxbxgxcxd"
 
@@ -33,10 +35,6 @@ if [[ -x `which apt-get >/dev/null 2>&1` ]]; then
     HAS_APT=1
 fi
 
-if [[ -x `which yum >/dev/null 2>&1` ]]; then
-    HAS_YUM=1
-fi
-
 
 
 #                                  _   
@@ -100,7 +98,7 @@ function git_prompt {
 
 # Make a pretty prompt.
 export PROMPT_COMMAND='history -a; if [ $? -ne 0 ];then ERROR_FLAG=1;else ERROR_FLAG=;fi;'
-export PS1=${HOSTCOLOUR}${sh_light_gray}'\t | \h'${sh_green}':\w'${sh_light_gray}' $(git_prompt)'${sh_light_gray}'${ERROR_FLAG:+'${sh_light_red}'}\$ '${sh_norm}
+export PS1=${HOSTCOLOUR}${sh_light_gray}'\h'${sh_green}':\w'${sh_light_gray}' $(git_prompt)'${sh_light_gray}'${ERROR_FLAG:+'${sh_light_red}'}\$ '${sh_norm}
 
 # New files and folders should not be world readable
 umask 0027
@@ -197,11 +195,8 @@ alias nano='nano -ciw '
 # shortcut for tmux command
 alias tm="tmux new-session -A -s main"
 
-# always use nvim
+# emacsclient
-alias vim='nvim'
+alias ec="emacsclient -n -c -a emacs"
-alias vi='nvim'
-alias nv='nvim'
-
 
 
 

git/.gitconfig

@@ -1,7 +1,7 @@
 [user]
 	name = Andrew Davidson
 	email = andrew@andr3w.net
-	signingkey = F1199FC0A76BB402 
+	signingkey = /home/amd/.ssh/id_rsa
 	
 [color]
     ui = auto
@@ -57,3 +57,5 @@
 
 [init]
 	defaultBranch = main
+[gpg]
+	format = ssh