Update from JIX laptop

Most importantly, add a helper environmental variable for getting the
hostname both on gnu and locally

.bash_aliases

@@ -1,25 +1,43 @@
 export EDITOR=nvim
+export HOSTNAME=`hostname 2>/dev/null || hostnamectl hostname`
 
-if [ $USER = 'knyffen' ]; then
+if [ $USER = 'knyffen' ] || ([ $HOSTNAME = 'jry-thinkpad-t470' ] && [ $USER = 'jry' ]); then
     alias rm="trash"
 fi
 
+#if [ $USER = 'knyffen' ]; then
+#    alias rm="trash"
+#    alias ssh-add="ssh-add /home/knyffen/.ssh/knyf-inator /home/knyffen/.ssh/Knyf-inatorV2 /home/knyffen/.ssh/git_knyffen_dk"
+#fi
+#
+#if [ $USER = 'jry' ]; then
+#    alias ssh-add="ssh-add /home/jry/.ssh/knyf-inator /home/jry/.ssh/Knyf-inatorV2 /home/jry/.ssh/git_knyffen_dk /home/jry/.ssh/id_rsa"
+#fi
+
 alias sudo="sudo "
 alias vim="nvim"
 alias vi="nvim"
 alias ghc="ghc -dynamic"
 alias find_root="sudo find / 2>&1"
 alias py="python"
-# alias ssh-add="ssh-add /home/knyffen/.ssh/knyf-inator /home/knyffen/.ssh/Knyf-inatorV2 /home/knyffen/.ssh/git_knyffen_dk"
 alias zathura-t="tabbed -c zathura -e"
 alias parsecd="LIBVA_DRIVER_NAME=iHD parsecd"
 alias stack="/usr/bin/stack"
 alias java_hidpi="java -Dsun.java2d.uiScale=2"
 alias wol_desktop="ssh knyf wol BC:5F:F4:74:74:57"
+alias wol_synology="ssh knyf wol 00:11:32:09:9F:12"
 alias dd_progress='sudo kill -USR1 $(pgrep ^dd)'
 alias co2="ssh knyf mhz14a -r -d /dev/ttyS0"
 alias h2o="ssh knyf 'cd configfiles/BME280; ./get_temperature_humidity_and_idead_humidity.sh'"
-function ack_open { nvim $( ack -m 1 "$@" | grep -Po "^(?:lib|t|tmpl|python)/[^:]+:\d+" | tr '\n' ' ' ); }
+alias probox="vim /home/knyffen/Nextcloud/Notes/Probox.md"
+alias rebuild-detector="checkrebuild -v"
+alias jix-vpn="sudo openvpn --config ~/openvpn/jobindex.conf"
+alias enable_touch="xinput enable 'Wacom HID 51E3 Finger touch'"
+alias disable_touch="xinput disable 'Wacom HID 51E3 Finger touch'"
+alias pacman="nice -n 19 pacman"
+alias pamac="nice -n 19 pamac"
+alias yay="nice -n 19 yay"
+alias restartplasma='kquitapp5 plasmashell && kstart5 plasmashell'
 
 # git
 alias gst="git status"
@@ -33,12 +51,11 @@ function ggtl { ggt --color=always "$@" | less -R; }
 function ggpl { ggp --color=always "$@" | less -R; }
 
 # git grep colors
-git config --global pull.rebase true
 git config --global color.grep.filename "Green"
 git config --global color.grep.linenumber "Yellow"
 git config --global color.grep.match "bold #ff4d00"
 
-alias TODO="ggn 'TODO: jry'"
+alias TODO="ggn 'TODO: jry:'"
 
 title() {
     # set input argument as window title
@@ -48,7 +65,7 @@ title() {
 expressvpn() {
     local subcommand
 
-    if (( "$#" == 0 )); then command expressvpn; return; fi
+    if [ $# -eq 0 ]; then command expressvpn; return; fi
 
     subcommand=$1; shift
     case $subcommand in
@@ -69,11 +86,41 @@ expressvpn() {
     esac
 }
 
+alias vpn=nordvpn
+nordvpn() {
+    local subcommand
+
+    if [ $# -eq 0 ]; then command nordvpn; return; fi
+
+    subcommand=$1; shift
+    case $subcommand in
+        c)
+            command nordvpn "$subcommand" "$@"
+            ;;
+        connect)
+            command nordvpn "$subcommand" "$@"
+            ;;
+        d)
+            command nordvpn "$subcommand" "$@"
+            # command echo 'nameserver 192.168.1.1' | sudo tee /etc/resolv.conf
+            command sudo cp -f /etc/resolv.conf.bak /etc/resolv.conf
+            ;;
+        disconnect)
+            command nordvpn "$subcommand" "$@"
+            # command echo 'nameserver 192.168.1.1' | sudo tee /etc/resolv.conf
+            command sudo cp -f /etc/resolv.conf.bak /etc/resolv.conf
+            ;;
+        *)
+            command nordvpn "$subcommand" "$@"
+            ;;
+    esac
+}
+
 spin() {
     local subcommand
     local fname
 
-    if (( "$#" == 0 )); then command spin; return; fi
+    if [ $# -eq 0 ]; then command spin; return; fi
 
     subcommand=$1; shift
     case $subcommand in
@@ -112,40 +159,20 @@ spin() {
     esac;
 }
 
-if [ $USER = 'jry' ]; then
+if [ $USER = 'knyffen' ]; then
+    # Reduce priority of make commands, to preserve system responsiveness when e.g. compiling gcc
+    alias pamac="nice -n 19 pamac"
+fi
+
+if [ $HOSTNAME = 'gnu' ] && [ $USER = 'jry' ]; then
     alias fzy="~/.fzy/fzy"
 
-    alias perlperl="/home/perlrepo/perl-5.28.1/bin/perl -MJIX"
+    alias perlperl="/home/perl/bin/perl"
-    alias perlprove="/home/perlrepo/perl-5.28.1/bin/prove"
+    alias perlprove="/home/perl/bin/prove"
     function prove { jix-shell TEST_METHOD=$TEST_METHOD BAIL_ON_FAIL=$BAIL_ON_FAIL prove "$@"; }
-    function prove-on-backend { jix-shell TEST_METHOD=$TEST_METHOD BAIL_ON_FAIL=$BAIL_ON_FAIL USER=$USER JIX_USERID=$JIX_USERID prove-on-backend "$@"; }
+    function perl { jix-shell TEST_METHOD=$TEST_METHOD BAIL_ON_FAIL=$BAIL_ON_FAIL perl "$@"; }
-    function perl { jix-shell TEST_METHOD=$TEST_METHOD BAIL_ON_FAIL=$BAIL_ON_FAIL USER=$USER JIX_USERID=$JIX_USERID  perl -MJIX "$@"; }
-    alias open_url="jix-shell open_url"
-    alias colorlog="jix-shell colorlog.pl"
-    alias jix-gettext="jix-shell jix-gettext"
-    alias arc="jix-shell arc"
-    alias solr="ssh -L 1214:localhost:8983 solr@gnu.dev.job.dk firefox http://localhost:1214/solr/"
 
     function profiling {
-        local ROOT=$1;
-        shift;
-        local FORM='';
-        for ARG in $@; do
-            FORM="$FORM --form-arg $ARG";
-        done
-        echo "jix-shell NYTPROF=start=no perl -d:NYTProf ~jry/jobxx/bin/benchmark_route.pl --route "'"'"$ROOT"'"'" --profile --companyuser $FORM";
-        jix-shell NYTPROF=start=no perl -d:NYTProf ~jry/jobxx/bin/benchmark_route.pl --route "$ROOT" --profile --companyuser $FORM;
-        echo "jix-shell nytprofhtml";
-        jix-shell nytprofhtml;
-        echo "mkdir -p \"/home/jry/jobxx/cover/report/html\"";
-        mkdir -p "/home/jry/jobxx/cover/report/html";
-        echo "mv nytprof \"/home/jry/jobxx/cover/report/html/nytprof\"";
-        mv "nytprof" "/home/jry/jobxx/cover/report/html/nytprof"; # So it can be opened via www.jobindex.dk.jry.jobsafari.dk
-        echo -e "\033[0;31mThe profiling can be found at www.jobindex.dk.jry.jobsafari.dk/cover/report/html/nytprof/index.html.";
-        echo -e "\033[0;31mDelete folders ~jry/jobxx/cover/report/html/nytprof (possibly all the way down including 'cover')to clean up.";
-    }
-
-    function profiling_old_method {
         local JIX_USERID=233476; # userid of JRY
         local USER=jobdk;
         local ROOT=$1;