Merge remote-tracking branch 'refs/remotes/origin/master'

15 files changed, 49 insertions, 39 deletions

diff --git a/dot_aspell.en.pws b/dot_aspell.en.pws
index 4495631..3e66a1a 100644
--- a/dot_aspell.en.pws
+++ b/dot_aspell.en.pws
@@ -1,21 +1,26 @@
-personal_ws-1.1 en 133 
+personal_ws-1.1 en 145 
+Bengston
 Bohrer
 Bovik
 Bram
 Brookes
+CERN
 CFP
 CMS
+Carbone's
 Compositionally
 Coq
 Dekker
 Dingel
 Drs
+ECOOP
 ECT
 FreeBSD
 Frobenius
 GHC
 GPAs
 GPS
+Github
 Hassan
 Hirschkoff
 Hyland
@@ -25,6 +30,7 @@ LCF
 Lambek
 Lawvere
 Lightstone
+MPST
 Madiot
 McGill
 NSERC
@@ -40,10 +46,12 @@ Rudie
 SPARC
 Springer
 TSO
+Tirore
 UPMC
 Unital
 Wajc
 Yoneda
+Zenodo
 acyclic
 adjoint
 adjunction
@@ -62,6 +70,7 @@ boolean
 cartesian
 changelogs
 checkpointing
+coinduction
 coinductive
 compositional
 compositionality
@@ -83,6 +92,7 @@ essentialised
 executional
 existentials
 formalisations
+formalizations
 functor
 incentivisation
 interleavings
@@ -91,6 +101,7 @@ isomorphism
 linearisation
 linearisations
 logics
+mechanizations
 metadata
 metatheory
 metavariables
@@ -122,6 +133,7 @@ sequentialise
 sigbovik
 subphrases
 subsequence
+subtyping
 supérieure
 surjective
 toolchains
diff --git a/dot_config/kanshi/config b/dot_config/kanshi/config
index 7fe3c18..65192a2 100644
--- a/dot_config/kanshi/config
+++ b/dot_config/kanshi/config
@@ -6,8 +6,8 @@ profile thinkpad_L15_home {
     output "Ancor Communications Inc VE248 H5LMQS022049" mode 1920x1080 position 0,0
 }
 profile thinkpad_L15_office {
+    output "Dell Inc. DELL P2722H DZC4GH3" mode 1920x1080 position 0,0
     output "AU Optronics 0x25ED Unknown" mode 1920x1080 position 0,1080
-    output "Samsung Electric Company LF27T370F HCNRB00047" mode 1920x1080 position 0,0
 }
 profile thinkpad_L15_SH-2420 {
     output "AU Optronics 0x25ED Unknown" mode 1920x1080 position 0,0
diff --git a/dot_config/mimeapps.list b/dot_config/mimeapps.list
index cf6cc6f..2c17719 100644
--- a/dot_config/mimeapps.list
+++ b/dot_config/mimeapps.list
@@ -2,8 +2,8 @@
 x-scheme-handler/spotify=sp.desktop
 
 [Default Applications]
-application/pdf=org.gnome.Evince.desktop
-application/x-pdf=org.gnome.Evince.desktop
+application/pdf=org.gnome.Papers.desktop
+application/x-pdf=org.gnome.Papers.desktop
 text/html=firefox.desktop
 x-scheme-handler/http=firefox.desktop
 x-scheme-handler/https=firefox.desktop
diff --git a/dot_config/sh/10_aliases b/dot_config/sh/10_aliases
index b749d13..9937b56 100644
--- a/dot_config/sh/10_aliases
+++ b/dot_config/sh/10_aliases
@@ -20,6 +20,9 @@ wesa() {
 wyep() {
     mpv 'https://ais-sa3.cdnstream1.com/2557_128.aac'
 }
+slpr() {
+    lpr -P PK-4680.A "$@"
+}
 
 alias mplayer-fb='mplayer -vo fbdev'
 alias links2-fb='links2 -driver fb'
diff --git a/dot_config/sway/config b/dot_config/sway/config
index 80c392e..2e4a4d8 100644
--- a/dot_config/sway/config
+++ b/dot_config/sway/config
@@ -73,7 +73,7 @@ bindsym --to-code {
                 'swaymsg exit'
 
     # Lock screen
-    $mod+F5 exec swaymsg 'output * dpms toggle'
+    $mod+F5 exec swaymsg 'output * power toggle'
     $mod+F7 exec $lock
 
     # List all windows
diff --git a/dot_config/sway/config.d/99_reload.conf b/dot_config/sway/config.d/99_reload.conf
new file mode 100644
index 0000000..14023e0
--- /dev/null
+++ b/dot_config/sway/config.d/99_reload.conf
@@ -0,0 +1,4 @@
+# reload config after parsing once to apply custom keyboard layouts
+exec swaymsg reload
+
+# vim:set ft=swayconfig:
diff --git a/dot_config/swayidle/config b/dot_config/swayidle/config
index d774c2c..a4779da 100644
--- a/dot_config/swayidle/config
+++ b/dot_config/swayidle/config
@@ -1,4 +1,4 @@
 timeout 180 swaylock
-timeout 240 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"'
+timeout 240 'swaymsg "output * power off"' resume 'swaymsg "output * dpms on"'
 before-sleep swaylock
-after-resume 'swaymsg "output * dpms on"'
+after-resume 'swaymsg "output * power on"'
diff --git a/dot_config/systemd/user/sbuild-update.service b/dot_config/systemd/user/sbuild-update.service
index 82c6bb3..2d93232 100644
--- a/dot_config/systemd/user/sbuild-update.service
+++ b/dot_config/systemd/user/sbuild-update.service
@@ -9,21 +9,3 @@ ExecStart=%h/.local/lib/sbuild/update-chroots.sh
 LimitNOFILE=131072
 IOSchedulingClass=idle
 Nice=19
-
-CapabilityBoundingSet=CAP_DAC_READ_SEARCH CAP_CHOWN
-IPAddressDeny=any
-LockPersonality=true
-MemoryDenyWriteExecute=true
-NoNewPrivileges=true
-PrivateTmp=true
-PrivateDevices=true
-PrivateNetwork=true
-ProtectClock=true
-ProtectControlGroups=true
-ProtectHostname=true
-RestrictAddressFamilies=AF_UNIX
-RestrictNamespaces=true
-RestrictRealtime=true
-RestrictSUIDSGID=true
-SystemCallArchitectures=native
-SystemCallFilter=@system-service @chown
diff --git a/dot_config/systemd/user/symlink_gcr-ssh-agent.socket b/dot_config/systemd/user/symlink_gcr-ssh-agent.socket
new file mode 100644
index 0000000..dc1dc0c
--- /dev/null
+++ b/dot_config/systemd/user/symlink_gcr-ssh-agent.socket
@@ -0,0 +1 @@
+/dev/null
\ No newline at end of file
diff --git a/dot_mailcap b/dot_mailcap
index 908d198..ee1fad5 100644
--- a/dot_mailcap
+++ b/dot_mailcap
@@ -1,7 +1,7 @@
 text/html;      mutt_bgrun firefox %s; nametemplate=%s.html
 text/html;      w3m -T text/html -cols 80 -dump %s; nametemplate=%s.html; copiousoutput
-application/pdf;            mutt_bgrun evince %s;        nametemplate=%s.pdf;      test=test "$DISPLAY" != ""; description=Portable Document Format
+application/pdf;            mutt_bgrun papers %s;        nametemplate=%s.pdf;      test=test "$DISPLAY" != ""; description=Portable Document Format
 application/x-pdf;          mupdf %s;        nametemplate=%s.pdf;      test=test "$DISPLAY" != ""; description=Portable Document Format
-application/x-gzpdf;        evince %s;        nametemplate=%s.pdf.gz;   test=test "$DISPLAY" != ""; description=Portable Document Format
-application/x-bzpdf;        evince %s;        nametemplate=%s.pdf.bz2;  test=test "$DISPLAY" != ""; description=Portable Document Format
+application/x-gzpdf;        papers %s;        nametemplate=%s.pdf.gz;   test=test "$DISPLAY" != ""; description=Portable Document Format
+application/x-bzpdf;        papers %s;        nametemplate=%s.pdf.bz2;  test=test "$DISPLAY" != ""; description=Portable Document Format
 audio/mpeg;                 mplayer %s; description=MPEG Audio
diff --git a/dot_tmux-mail.conf b/dot_tmux-mail.conf
index 8445e37..a972fda 100644
--- a/dot_tmux-mail.conf
+++ b/dot_tmux-mail.conf
@@ -5,8 +5,8 @@ split-window -c '~' 'neomutt -f imaps://imap.rak.ac'
 split-window -c '~' -h 'neomutt -f imaps://ryanakca@gmail.com@imap.gmail.com/'
 split-window -c '~' -h 'neomutt -f imaps://kavanagh.ryan@uqam.ca@outlook.office365.com'
 selectl -t mail tiled
-new-window -d -c '~' -n hades 'ssh hades.rak.ac'
-new-window -d -c '~' -n eos 'ssh eos.rak.ac'
+new-window -d -c '~' -n hades 'ssh hades.home.arpa'
+new-window -d -c '~' -n eos 'ssh eos.home.arpa'
 new-window -d -c '~' -n republic 'ssh republic'
 new-window -d -c '~' -n sdf 'ssh -t beastie.sdf.org /sdf/arpa/ns/r/rak/bin/tsdf'
 new-window -d -c '~' -n tt 'ssh -t tt bash -ic tt'
diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
index 312ad0e..eb09aa3 100644
--- a/dot_zshrc.tmpl
+++ b/dot_zshrc.tmpl
@@ -49,7 +49,7 @@ export MANWIDTH=80
 export MANOPT="-L en"
 export PAGER=less
 export LESS=-FQXR
-export PDFVIEWER=evince
+export PDFVIEWER=papers
 export BROWSER=firefox
 export KRB5CCNAME=DIR:${HOME}/.cache/krb5cc # kerberos credentials cache
 export GOPATH=${HOME}/.go
@@ -587,12 +587,7 @@ NO_verbose		\
 # GPG / SSH AGENT
 
 if command -v keychain > /dev/null && test -d ~/.ssh/keys/{{ .chezmoi.hostname }}; then
-    keychain --inherit any ~/.ssh/keys/{{ .chezmoi.hostname }}/id_*[^p][^u][^b]
-    [ -z "$HOSTNAME" ] && HOSTNAME=`uname -n`
-    [ -f $HOME/.keychain/$HOSTNAME-sh ] &&
-           . $HOME/.keychain/$HOSTNAME-sh
-    [ -f $HOME/.keychain/$HOSTNAME-sh-gpg ] &&
-           . $HOME/.keychain/$HOSTNAME-sh-gpg
+    keychain --ssh-allow-forwarded ~/.ssh/keys/{{ .chezmoi.hostname }}/id_*[^p][^u][^b]
 fi
 
 # vim: set ft=zsh:
diff --git a/equivs/rak-meta/debian/changelog b/equivs/rak-meta/debian/changelog
index 2e7abcc..4a247ed 100644
--- a/equivs/rak-meta/debian/changelog
+++ b/equivs/rak-meta/debian/changelog
@@ -1,3 +1,15 @@
+rak-meta (0.25) unstable; urgency=medium
+
+  * rak-sysadmin: drop etckeeper
+
+ -- Ryan Kavanagh <rak@debian.org>  Mon, 16 Mar 2026 13:26:03 -0400
+
+rak-meta (0.24) unstable; urgency=medium
+
+  * rak-sway: python3-psutils python3-tenacity
+
+ -- Ryan Kavanagh <rak@debian.org>  Mon, 29 Sep 2025 14:53:18 -0400
+
 rak-meta (0.23) unstable; urgency=medium
 
   * rak-sway: sway-notification-center and python3-i3ipc 
diff --git a/equivs/rak-meta/debian/control b/equivs/rak-meta/debian/control
index cdad99a..dd8fdc3 100644
--- a/equivs/rak-meta/debian/control
+++ b/equivs/rak-meta/debian/control
@@ -278,6 +278,8 @@ Depends:
  light,
  python3-dbus-next,
  python3-i3ipc,
+ python3-psutils,
+ python3-tenacity,
  seatd,
  slurp,
  sway,
@@ -308,7 +310,6 @@ Depends:
  dlocate,
  dselect,
  eject,
- etckeeper,
  htop,
  iputils-ping,
  jmtpfs,
diff --git a/private_dot_ssh/config.tmpl b/private_dot_ssh/config.tmpl
index 230d967..d065a3c 100644
--- a/private_dot_ssh/config.tmpl
+++ b/private_dot_ssh/config.tmpl
@@ -6,7 +6,7 @@ NoHostAuthenticationForLocalhost yes
 ## Debian hosts
 Host master
     Hostname %h.debian.org
-Host *.debian.org master !*.ssh.debian.org !ssh.debian.org
+Host *.debian.org *.debian.net master !*.ssh.debian.org !ssh.debian.org
     ProxyJump ssh.debian.org
 Match final host *.debian.org
     UserKnownHostsFile ~/.ssh/known_hosts.d/debian