KISS related changes

1 files changed, 28 insertions, 33 deletions

diff --git a/.mkshrc b/.mkshrc
index bc3543d..e6c5e3e 100644
--- a/.mkshrc
+++ b/.mkshrc
@@ -1,39 +1,31 @@
-export EDITOR=zile
+export EDITOR=kak
 export HISTFILE=$HOME/.histfile
 export HISTSIZE=8192
-export LANGUAGE="en_GB.UTF-8"
-export PATH=$HOME/bin:$HOME/.local/bin:$PATH
-export SUDO_EDITOR=zile
-export TERMINAL=st
-export VISUAL=emacs
 
-export TEXMFHOME=$HOME/.local/share/texlive
+#export TEXMFHOME=$HOME/.local/share/texlive
 
-export BROWSER=firefox-esr
 export XDG_DESKTOP_DIR=$HOME
-export XDG_DOCUMENTS_DIR=$HOME/store
-export XDG_DOWLOAD_DIR=$HOME/store
-export XDG_MUSIC_DIR=$HOME/store/music
-export XDG_PICTURES_DIR=$HOME/picutures
-export XDG_PUBLICSHARE_DIR=$HOME/public
-export XDG_TEMPLATES_DIR=$HOME/store/templates
-export XDG_VIDEOS_DIR=$HOME/store/videos
-
-export LESS="-S -R"
-export LESSCHARSET=utf-8
-export LESSHISTFILE="-"
-
-export CATHISTFILE="-"
-
-LS_COLORS='rs=0:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:tw=30;42:ow=34;42:st=37;44:ex=01;32:';
-export LS_COLORS
+export XDG_DOCUMENTS_DIR=$HOME/store/
+export XDG_DOWLOAD_DIR=$HOME/store/downloads/
+export XDG_MUSIC_DIR=$HOME/store/music/
+export XDG_PICTURES_DIR=$HOME/store/picutures/
+export XDG_PUBLICSHARE_DIR=$HOME/store/public
+export XDG_TEMPLATES_DIR=$HOME/store/templates/
+export XDG_VIDEOS_DIR=$HOME/store/videos/
 
 PS1='${ local e=$?; local r=""; (( $e )) && r="<$e>";
-  local p=$(echo ${PWD:-?} | sed "s#.*/\(.*\)/\(.*\)#\1/\2#"); # s#$HOME#~# #${PWD##*/}
+  local p=$(echo ${PWD:-?} | sed "s#$HOME#~#;s#.*/\(.*\)/\(.*\)#\1/\2#"); #${PWD##*/}
   local d=$(date +"%H.%M");
   local v=$(vcs);
   local u=#; (( $USER_ID )) && u=\$;
-  echo -n "[$(hostname):$p]($d)$r$v$u ";
+  echo -n "[$p]($d)$r$v$u ";
+  # Display PWD
+  case ${TERM} in
+    foot*|st*|xterm*|rxvt*|Eterm|aterm|kterm|gnome*|alacritty)
+      printf "\033]0;%s:%s\007" "${USER}" "${PWD/#$HOME/\~}";;
+    screen*)
+      printf "\033_%s:%s\033\\" "${USER}" "${PWD/#$HOME/\~}";;
+    esac
   return $e }'
 
 PS4='[$EPOCHREALTIME]'
@@ -42,7 +34,6 @@ alias rm='rm -i'
 alias ls='ls --group-directories-first -vhF --color=always'
 alias hh='cd $HOME'
 alias bk='cd $OLDPWD'
-alias t=tmux
 #alias t="date +%H\ %M\ %S | dc -e '6k???86400/r1440/+r24/+p'"
 
 alias ..='cd ..'
@@ -54,7 +45,11 @@ alias ......='cd ../../../../..'
 alias lower="tr '[:upper:]' '[:lower:]'"
 alias upper="tr '[:lower:]' '[:upper:]'"
 alias rot13="tr abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM"
-alias weather="wget -O - wttr.in/Baltimore?m | less"
+alias weather="curl -s wttr.in/Baltimore?m | less"
+
+alias vpn_up='doas wg-quick up us-va1'
+alias vpn_down='doas wg-quick down us-va1'
+alias vpn_check='curl -s https://www.ivpn.net | grep "span class=\"label\"" | cut -d\> -f2'
 
 mvf() { mv $*; cd $_ ;}
 c() { echo 'scale=13;' $* | bc -l; }
@@ -63,13 +58,13 @@ hd() { hexdump -e '"%08.8_ax  " 8/1 "%02X " " - " 8/1 "%02X "' -e '"  |" "%_p"'
 mkpw() { cat /dev/urandom | tr -dc "[:print:]" | fold -w `[[ "$2" == "" ]] && echo 16 || echo $2` | head -n `[[ "$1" == "" ]] && echo 1 || echo "$1"` ;}
 
 stty -ixon
-umask 077
 
 set -o emacs
 set -o utf8-mode
 
-eval $(keychain --eval --systemd -q)
+source $HOME/.ssh-agent
+export GPG_TTY=$(tty)
 
-if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" == "1" ] ; then
-    startx -- -keeptty
-fi;
+#if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" == "1" ] ; then
+#    startx -- -keeptty
+#fi;