update stuff, hyprland now

8 files changed, 34 insertions, 17 deletions

diff --git a/home/.config/neomutt/filters/mutt-ical b/home/.config/neomutt/filters/mutt-ical
-Subproject c62488fbfa6a817e0f03f808c8cc14d771ce3c2
+Subproject c2886b6609842a6b15dc0cd23c4caa5ec45095c
diff --git a/home/.config/neomutt/filters/t-prot b/home/.config/neomutt/filters/t-prot
index e8edbae..30bde39 100755
--- a/home/.config/neomutt/filters/t-prot
+++ b/home/.config/neomutt/filters/t-prot
@@ -1131,7 +1131,7 @@ if (defined $_t_maxsig) { $lsig = $_t_maxsig ? $_t_maxsig : $maxsig; }
 if (defined $_t_mua) {
     $mua = lc($_t_mua);
     # mutt still displays the message when ^C'ing pgp verification:
-    if ($mua eq 'mutt' || $mua eq 'mutt-kz') {
+    if ($mua eq 'mutt' || $mua eq 'mutt-kz' || $mua eq 'neomutt') {
         $SIG{'INT'} = 'sigint_handler';
     }
 }
@@ -1150,7 +1150,7 @@ if (defined $_t_nohdr) { $nohdr=1; $hdrs=1; }
 if (defined $_t_cr) { $cr = $_t_cr ? $_t_cr : $crshrink; }
 if ($ms_smart) { $ms = 1; }
 
-if ($mua eq 'mutt' || $mua eq 'mutt-kz') {
+if ($mua eq 'mutt' || $mua eq 'mutt-kz' || $mua eq 'neomutt') {
     if (defined $locale &&
             $locale ne '' && $locale ne 'C' && $locale ne 'POSIX') {
         eval { require Locale::gettext; };
@@ -1218,7 +1218,7 @@ if ($mua eq 'mutt' || $mua eq 'mutt-kz') {
                 Locale::gettext::gettext("... this is a bug (%s:%d:%s)\n") =~
                 m/^([^%]*)/;
         }
-        # mutt and mutt-kz right now only differ in the gettext domain name,
+        # mutt and neomutt right now only differ in the gettext domain name,
         # so after fetching the gettext lines we treat them the same:
         $mua = 'mutt';
     }
diff --git a/home/.config/neomutt/filters/t-prot-modified b/home/.config/neomutt/filters/t-prot-modified
index 449444a..3f9a1c6 100755
--- a/home/.config/neomutt/filters/t-prot-modified
+++ b/home/.config/neomutt/filters/t-prot-modified
@@ -1149,7 +1149,7 @@ if (defined $_t_maxsig) { $lsig = $_t_maxsig ? $_t_maxsig : $maxsig; }
 if (defined $_t_mua) {
     $mua = lc($_t_mua);
     # mutt still displays the message when ^C'ing pgp verification:
-    if ($mua eq 'mutt' || $mua eq 'mutt-kz') {
+    if ($mua eq 'mutt' || $mua eq 'mutt-kz' || $mua eq 'neomutt') {
         $SIG{'INT'} = 'sigint_handler';
     }
 }
@@ -1168,7 +1168,7 @@ if (defined $_t_nohdr) { $nohdr=1; $hdrs=1; }
 if (defined $_t_cr) { $cr = $_t_cr ? $_t_cr : $crshrink; }
 if ($ms_smart) { $ms = 1; }
 
-if ($mua eq 'mutt' || $mua eq 'mutt-kz') {
+if ($mua eq 'mutt' || $mua eq 'mutt-kz' || $mua eq 'neomutt') {
     if (defined $locale &&
             $locale ne '' && $locale ne 'C' && $locale ne 'POSIX') {
         eval { require Locale::gettext; };
@@ -1236,7 +1236,7 @@ if ($mua eq 'mutt' || $mua eq 'mutt-kz') {
                 Locale::gettext::gettext("... this is a bug (%s:%d:%s)\n") =~
                 m/^([^%]*)/;
         }
-        # mutt and mutt-kz right now only differ in the gettext domain name,
+        # mutt and neomutt right now only differ in the gettext domain name,
         # so after fetching the gettext lines we treat them the same:
         $mua = 'mutt';
     }
diff --git a/home/.config/neomutt/muttrc b/home/.config/neomutt/muttrc
index bc7e9a2..bcf570d 100644
--- a/home/.config/neomutt/muttrc
+++ b/home/.config/neomutt/muttrc
@@ -372,16 +372,17 @@ auto_view application/x-gzip
 # show interesting stuff by default
 # you should install antiword! :-)
 #auto_view text/enriched
+auto_view text/calendar
+auto_view application/ics
 auto_view application/pgp-signature
 #auto_view application/msword
 #auto_view application/x-troff-man
-#auto_view text/x-vcard
+auto_view text/x-vcard
 auto_view text/html
-auto_view text/calendar
 
 # but this will render all html, we only want to autoview it when we don't have
 # text/plain:
-alternative_order text/plain text/enriched text/html text/*
+alternative_order text/calendar text/plain text/enriched text/html
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #
diff --git a/home/.gitconfig b/home/.gitconfig
index 1df6f13..58d5c8d 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -42,6 +42,9 @@
 [diff] # delta
 	colorMoved = default # delta
 
+[diff "exif"]
+	textconv = exif
+
 [pretty]
 	fixes = Fixes: %h (\"%s\")
 
@@ -54,6 +57,7 @@
 [rebase]
 	autoStash = true
 	stat = true
+	updateRefs = true
 
 [remote "origin"]
 	push = HEAD
diff --git a/home/.mutt/filters/mutt-ical b/home/.mutt/filters/mutt-ical
-Subproject c62488fbfa6a817e0f03f808c8cc14d771ce3c2
+Subproject c2886b6609842a6b15dc0cd23c4caa5ec45095c
diff --git a/home/.mutt/muttrc b/home/.mutt/muttrc
index c22f118..3d421b8 100644
--- a/home/.mutt/muttrc
+++ b/home/.mutt/muttrc
@@ -355,16 +355,17 @@ auto_view application/x-gzip
 # show interesting stuff by default
 # you should install antiword! :-)
 #auto_view text/enriched
+auto_view text/calendar
+auto_view application/ics
 auto_view application/pgp-signature
 #auto_view application/msword
 #auto_view application/x-troff-man
-#auto_view text/x-vcard
+auto_view text/x-vcard
 auto_view text/html
-auto_view text/calendar
 
 # but this will render all html, we only want to autoview it when we don't have
 # text/plain:
-alternative_order text/plain text/enriched text/html text/*
+alternative_order text/calendar text/plain text/enriched text/html
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #
diff --git a/home/.zshrc b/home/.zshrc
index 38d8741..b5eb109 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -205,8 +205,10 @@ alias ipb='ip --color --brief'
 
 if main_node; then
 	alias gnuplot="gnuplot -persist"
-	alias padoff='/usr/bin/xinput disable "SynPS/2 Synaptics TouchPad"'
-	alias padon='/usr/bin/xinput enable "SynPS/2 Synaptics TouchPad"'
+	#alias padoff='/usr/bin/xinput disable "SynPS/2 Synaptics TouchPad"'
+	#alias padon='/usr/bin/xinput enable "SynPS/2 Synaptics TouchPad"'
+	alias padoff='/usr/bin/hyprctl keyword "device:synps/2-synaptics-touchpad:enabled" false'
+	alias padon='/usr/bin/hyprctl keyword "device:synps/2-synaptics-touchpad:enabled" true'
 	alias snownews="snownews -u"
 	alias biew="TERM=vt100 biew"
 	alias urxvt="urxvt256c"
@@ -254,15 +256,24 @@ if main_node; then
 	}
 
 	schauglasl () {
-		curl -s "https://icinga2.kom.tuwien.ac.at/schauglasl/routes?address=$1&context=tunet&best=1" | html2text --pad-tables | less
+		curl -s "https://icinga2.kom.tuwien.ac.at/schauglasl/routes?address=$1&context=tunet&best=1" | html2text --pad-tables | less -E
+	}
+
+	cable () {
+		port=`echo ${1} | tr '[a-z]' '[A-Z]'`
+		curl -s "https://lothal.kom.tuwien.ac.at/bomsquery/boms-cable-connections.py?format=json&cable=${port}" | jq --color-output | less -E
+	}
+
+	devrep () {
+		device=`echo ${1} | tr '[a-z]' '[A-Z]'`
+		curl -s "https://lothal.kom.tuwien.ac.at/bomsquery/boms-devrep.py?format=json&label=${device}" | jq --color-output | less -E
 	}
 fi
 
 mping(){ ping $@|awk -F'[= ]' '/time=/{t=$(NF-1);f=2000-14*log(t^18);c="play -q -n synth 1 pl "f"&";print $0;system(c)}'; } # mping yahoo\.com
 bat(){
 	BAT0="/sys/class/power_supply/BAT0";
-	BAT1="/sys/class/power_supply/BAT1";
-	calc -p \(`cat ${BAT0}/energy_now`+`cat ${BAT1}/energy_now`\)/\(`cat ${BAT0}/energy_full`+`cat ${BAT1}/energy_full`\); } # show battery state
+	calc -p `cat ${BAT0}/energy_now`/`cat ${BAT0}/energy_full`; } # show battery state
 
 # urxvt can handle transparency in .Xdefaults
 #[[ ! -z "$DISPLAY" ]] && [ -n "$WINDOWID" ] && exec_exists transset-df && transset-df -i $WINDOWID 0.85 >/dev/null || true