aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.chezmoiignore36
-rw-r--r--.chezmoiremove1
-rwxr-xr-xbin/executable_wd-mount45
-rw-r--r--[-rwxr-xr-x]bin/executable_wd-umount22
-rw-r--r--dot_Xresources.tmpl17
-rw-r--r--dot_aspell.en.prepl4
-rw-r--r--dot_aspell.en.pws3
-rw-r--r--dot_config/alacritty/alacritty.yml5
-rw-r--r--dot_config/catgirl/libera.tmpl1
-rw-r--r--dot_config/catgirl/schmorp.tmpl8
-rw-r--r--dot_config/encrypted_private_wpa_supplicant.conf.asc101
-rw-r--r--dot_config/ncmpcpp/config3
-rw-r--r--dot_config/ncmpcpp/config.tmpl3
-rw-r--r--dot_cwmrc.tmpl32
-rw-r--r--dot_emacs178
-rw-r--r--dot_gitconfig7
-rw-r--r--dot_lbdb/lbdbrc3
-rw-r--r--dot_lbdbrc4
-rw-r--r--dot_mutt/color.rc18
-rw-r--r--dot_mutt/encrypted_alias-mcgill.rc.asc75
-rw-r--r--dot_mutt/encrypted_private_alias.rc.asc127
-rw-r--r--dot_mutt/mailinglists.rc36
-rw-r--r--dot_muttrc18
-rw-r--r--dot_vim/plugin/gnupg.vim1226
-rw-r--r--dot_xmonad/xmonad.hs2
-rw-r--r--dot_zsh/p10k.zsh2
-rw-r--r--dot_zshenv8
-rw-r--r--dot_zshrc.tmpl22
-rwxr-xr-xetc/network-setup.sh10
-rwxr-xr-xetc/resolv.conf6
-rw-r--r--etc/systemd/network/wlp3s0.network5
-rw-r--r--etc/systemd/resolved.conf34
l---------etc/wpa_supplicant/wpa_supplicant-wlp3s0.conf1
-rw-r--r--executable_dot_xinitrc.tmpl57
-rw-r--r--packages-debian41
-rw-r--r--private_dot_ssh/config.tmpl4
-rw-r--r--private_dot_ssh/known_hosts12
-rw-r--r--private_dot_ssh/known_hosts.d/club.cc.cmu.edu1
-rw-r--r--private_dot_ssh/known_hosts.d/debian26
-rw-r--r--private_dot_ssh/known_hosts.d/rsync.net2
-rw-r--r--private_dot_ssh/known_hosts.d/sdf.org2
-rw-r--r--private_dot_ssh/private_known_hosts23
42 files changed, 1840 insertions, 391 deletions
diff --git a/.chezmoiignore b/.chezmoiignore
index 181732a..436216e 100644
--- a/.chezmoiignore
+++ b/.chezmoiignore
@@ -16,28 +16,39 @@ chezmoi.toml.censored
{{- end }}
# files in home
+.*~
+.**/*~
.Xauthority
.auth.gpg
+.bash_history
.cache
+.config/GIMP
+.config/Recoll.org
+.config/Signal
.config/borg
.config/chezmoi
.config/dconf
+.config/evince
.config/gtk-3.0
+.config/htop
+.config/ncmpcpp/*
+!.config/ncmpcpp/config
+.config/pavucontrol.ini
+.config/pulse/*
+!.config/pulse/daemon.conf
+!.config/pulse/default.pa
.emacs.d/auto-save-list
.emacs.d/dictem
.emacs.d/elpa
.emacs.d/transient
.fonts
-.gnupg/crls.d
-.gnupg/private-keys-v1.d
-.gnupg/pubring.gpg
-.gnupg/pubring.kbx
-.gnupg/random_seed
-.gnupg/secring.gpg
-.gnupg/tofu.db
-.gnupg/trustdb.gpg
+.gnupg/*
+!.gnupg/gpg-agent.conf.tmpl
+!.gnupg/gpg.conf
+.go
.keychain
-.lbdb
+.lbdb/*
+!.lbdb/lbdbrc
.lesshst
.local/share
.lyrics
@@ -45,7 +56,10 @@ chezmoi.toml.censored
.mutt/cache
.mutt/tmp
.opam
+.recoll
.ssh/known_hosts.old
+.ssh/keys/{{ .chezmoi.hostname }}/id_ed25519
+.ssh/keys/{{ .chezmoi.hostname }}/id_rsa
.texlive202*
.texmf/doc
.texmf/fonts
@@ -65,8 +79,10 @@ chezmoi.toml.censored
.xsession-errors
.zcompdump
.zsh/**/*.zwc
+.zsh/cache
.zsh/history
Documents
Downloads
News
->>>>>>> 4b28430 (Ignore some files)
+src
+tmp
diff --git a/.chezmoiremove b/.chezmoiremove
index 2caa8e8..b9df1f7 100644
--- a/.chezmoiremove
+++ b/.chezmoiremove
@@ -1,2 +1,3 @@
.gnupg/dirmngr.conf
+.lbdbrc
.pulse
diff --git a/bin/executable_wd-mount b/bin/executable_wd-mount
index 8a8ee3f..de4703f 100755
--- a/bin/executable_wd-mount
+++ b/bin/executable_wd-mount
@@ -1,19 +1,32 @@
#!/bin/sh
-if ! mount | grep -w /media/t > /dev/null ; then
- if [ -e /dev/disk/by-uuid/0c5bcd92-bf08-4a21-a117-0ba9c0c31862 ]; then
- sudo cryptdisks_start tosh && \
- sudo zpool import ztosh && \
- sudo mount /var/lib/mpd/music
- sudo vgimport tosh
- sudo vgchange -ay tosh
- fi
-fi
+case `uname` in
+ OpenBSD)
+ doas bioctl -c C -l fe3fd8d53b06049b.a softraid0
+ doas mount /media/wd
+ ;;
+ Linux)
+ if ! mount | grep -w /media/t > /dev/null ; then
+ if [ -e /dev/disk/by-uuid/0c5bcd92-bf08-4a21-a117-0ba9c0c31862 ]; then
+ sudo cryptdisks_start tosh && \
+ sudo zpool import ztosh && \
+ sudo mount /var/lib/mpd/music
+ sudo vgimport tosh
+ sudo vgchange -ay tosh
+ fi
+ fi
-if ! mount | grep -w /media/wd-bak > /dev/null ; then
- if [ -e /dev/disk/by-uuid/68b52a2b-2be5-4d40-98ba-c8469da50f1f ]; then
- sudo cryptdisks_start wd-bak-work && mount /dev/mapper/wd-bak-work
- elif [ -e /dev/disk/by-uuid/49491f12-45ec-4f3f-9f70-73a94149aaf2 ]; then
- sudo cryptdisks_start wd-bak && mount /dev/mapper/wd-bak
- fi
-fi
+ if ! mount | grep -w /media/wd-bak > /dev/null ; then
+ if [ -e /dev/disk/by-uuid/68b52a2b-2be5-4d40-98ba-c8469da50f1f ]; then
+ sudo cryptdisks_start wd-bak-work && mount /dev/mapper/wd-bak-work
+ elif [ -e /dev/disk/by-uuid/49491f12-45ec-4f3f-9f70-73a94149aaf2 ]; then
+ sudo cryptdisks_start wd-bak && mount /dev/mapper/wd-bak
+ fi
+ fi
+ ;;
+ *)
+ echo "Unknown host"
+ exit 1
+esac
+
+# vim: set sw=4:
diff --git a/bin/executable_wd-umount b/bin/executable_wd-umount
index 8b1ec47..e44c3ad 100755..100644
--- a/bin/executable_wd-umount
+++ b/bin/executable_wd-umount
@@ -1,7 +1,19 @@
#!/bin/sh
-sudo umount --lazy -f /var/lib/mpd/music
-sudo zpool export -f ztosh
-sudo cryptdisks_stop tosh
-sudo vgchange -an tosh
-sudo vgexport tosh
+case `uname` in
+ OpenBSD)
+ doas umount /mnt/wd
+ doas bioctl -d 79665ba14a5187ba
+ ;;
+ Linux)
+ sudo umount --lazy -f /var/lib/mpd/music
+ sudo zpool export -f ztosh
+ sudo cryptdisks_stop tosh
+ sudo vgchange -an tosh
+ sudo vgexport tosh
+ ;;
+ *)
+ echo "Unknown host"
+ exit 1
+ ;;
+esac
diff --git a/dot_Xresources.tmpl b/dot_Xresources.tmpl
index 92dac20..2665d65 100644
--- a/dot_Xresources.tmpl
+++ b/dot_Xresources.tmpl
@@ -12,8 +12,9 @@ URxvt*color12: #0088FF
URxvt.underlineColor: yellow
URxvt.saveLines: 8192
URxvt.mapAlert: true
-URxvt.font: {{ if (eq .chezmoi.os "openbsd") }}xft:spleen:size=10{{ else }}xft:Spleen 16x32:antialias=false{{ end }},xft:,xft:Inconsolata:size=10,xft:Input Mono Medium:size=10,xft:DejaVu Sans Mono:size=10,xft:Liberation Mono:size=10,xft:symbola:size=10:minspace=False
+URxvt.font: {{ if (eq .chezmoi.os "openbsd") }}xft:spleen:size=10{{ else }}xft:Spleen 16x32:antialias=false{{ end }},xft:Inconsolata:size=10,xft:Input Mono Medium:size=10,xft:DejaVu Sans Mono:size=10,xft:Liberation Mono:size=10,xft:symbola:size=10:minspace=False
URxvt.perl-ext-common: default,matcher,font-size,-searchable-scrollback
+URxvt.pointerBlank: true
URxvt.url-launcher: firefox
URxvt.matcher.button: 1
URxvt.visualBell: false
@@ -36,7 +37,10 @@ XLock*logoutButton: -1
Xpdf*fileFilterStyle: filter_hidden_files
-XTerm.metaSendsEscape: true
+XTerm*metaSendsEscape: true
+XTerm.VT100.translations: #override \
+ Ctrl <Key> Down: smaller-vt-font() \n\
+ Ctrl <Key> Up: larger-vt-font()
XTerm.eightBitInput: false
XTerm.termName: xterm-256color
XTerm*faceName: xft:spleen:antialias=false
@@ -59,3 +63,12 @@ xscreensaver.selected: -1
xscreensaver.timeout: 0:02:00
xscreensaver.timestamp: True
xscreensaver.unfade: False
+
+XConsole*background: black
+XConsole*foreground: white
+XConsole*borderWidth: 2
+XConsole*borderColor: grey
+XConsole.text.geometry: 480x130
+XConsole.verbose: true
+XConsole*iconic: true
+XConsole*font: fixed
diff --git a/dot_aspell.en.prepl b/dot_aspell.en.prepl
index ece23ad..3d9a733 100644
--- a/dot_aspell.en.prepl
+++ b/dot_aspell.en.prepl
@@ -12,6 +12,7 @@ despize despise
devize devise
disguize disguise
enterprize enterprise
+esthetic aesthetic
excize excise
exercize exercise
franchize franchise
@@ -20,6 +21,7 @@ improvize improvise
incize incise
merchandize merchandise
mortize mortise
+onomatopeic onomatopoeic
premize premise
reprize reprise
revize revise
@@ -27,5 +29,3 @@ supervize supervise
surmize surmise
surprize surprise
televize televise
-esthetic aesthetic
-onomatopeic onomatopoeic
diff --git a/dot_aspell.en.pws b/dot_aspell.en.pws
index a291c37..4495631 100644
--- a/dot_aspell.en.pws
+++ b/dot_aspell.en.pws
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 138
+personal_ws-1.1 en 133
Bohrer
Bovik
Bram
@@ -66,6 +66,7 @@ coinductive
compositional
compositionality
compositionally
+conjecturally
correlatedly
coperative
cryptographic
diff --git a/dot_config/alacritty/alacritty.yml b/dot_config/alacritty/alacritty.yml
index e3a22c3..8462ace 100644
--- a/dot_config/alacritty/alacritty.yml
+++ b/dot_config/alacritty/alacritty.yml
@@ -27,5 +27,10 @@ colors:
cyan: '0x99faf2'
white: '0xffffff'
+font:
+ size: 16
+ normal:
+ family: Spleen
+
keybinding:
- { key: N, mods: Command, action: SpawnNewInstance }
diff --git a/dot_config/catgirl/libera.tmpl b/dot_config/catgirl/libera.tmpl
index 4fca928..a42a2a6 100644
--- a/dot_config/catgirl/libera.tmpl
+++ b/dot_config/catgirl/libera.tmpl
@@ -6,3 +6,4 @@ save = libera
hash = 0,13
quiet
timestamp = %d %X
+ignore = jan6 * * *
diff --git a/dot_config/catgirl/schmorp.tmpl b/dot_config/catgirl/schmorp.tmpl
new file mode 100644
index 0000000..150a090
--- /dev/null
+++ b/dot_config/catgirl/schmorp.tmpl
@@ -0,0 +1,8 @@
+cert = weechat.pem
+user = catgirl-{{ .chezmoi.hostname }}
+host = schmorp.pounce.rak.ac
+port = 40404
+save = schmorp
+hash = 0,13
+quiet
+timestamp = %d %X
diff --git a/dot_config/encrypted_private_wpa_supplicant.conf.asc b/dot_config/encrypted_private_wpa_supplicant.conf.asc
index bddb8bd..163f9d7 100644
--- a/dot_config/encrypted_private_wpa_supplicant.conf.asc
+++ b/dot_config/encrypted_private_wpa_supplicant.conf.asc
@@ -1,54 +1,53 @@
-----BEGIN PGP MESSAGE-----
-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
-BxJwEgptUpUKsTTLm37+rEzO
-=rz7D
+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
+=q6/c
-----END PGP MESSAGE-----
diff --git a/dot_config/ncmpcpp/config b/dot_config/ncmpcpp/config
deleted file mode 100644
index 6e08135..0000000
--- a/dot_config/ncmpcpp/config
+++ /dev/null
@@ -1,3 +0,0 @@
-autocenter_mode = yes
-media_library_primary_tag = album_artist
-mpd_host = asteria.home.arpa
diff --git a/dot_config/ncmpcpp/config.tmpl b/dot_config/ncmpcpp/config.tmpl
new file mode 100644
index 0000000..c9cae80
--- /dev/null
+++ b/dot_config/ncmpcpp/config.tmpl
@@ -0,0 +1,3 @@
+autocenter_mode = yes
+media_library_primary_tag = album_artist
+mpd_host = {{ if (eq .chezmoi.hostname "asteria") }}127.0.0.1{{ else }}asteria.home.arpa{{ end }}
diff --git a/dot_cwmrc.tmpl b/dot_cwmrc.tmpl
index 2d0ea5b..7f07727 100644
--- a/dot_cwmrc.tmpl
+++ b/dot_cwmrc.tmpl
@@ -1,11 +1,16 @@
+autogroup 0 "xconsole", "XConsole"
autogroup 1 "URxvt"
autogroup 1 "XTerm"
autogroup 2 "Mozilla Firefox"
+autogroup 2 "qutebrowser"
+autogroup 6 "pavucontrol", "Pavucontrol"
# assign windows to current group
sticky yes
-command term {{ if (eq .chezmoi.os "openbsd" ) -}}xterm{{ else }}urxvtc{{ end }}
+command term {{ if (eq .chezmoi.os "openbsd" "darwin") -}}xterm{{ else }}urxvtc{{ end }}
+command lock {{ if (eq .chezmoi.os "openbsd") -}}"xlock -dpmsoff 1"{{ else }}"slock xset dpms force off"{{ end }}
+command dpmsoff "xset dpms force off"
color activeborder "#ff7701"
@@ -31,12 +36,13 @@ bind-key 4-l lock
# F: menu-window Launch window search menu.
# D: M-slash Search for windows.
-bind-key 4-slash menu-search
+bind-key 4-slash menu-window
# F: menu-window-hidden Launch hidden window search menu.
# F: menu-cmd Launch application search menu.
# D: C-slash Search for applications.
+bind-key 4-c menu-cmd
# F: menu-group Launch group search menu.
bind-key 4-g menu-group
@@ -83,7 +89,7 @@ bind-key 4-plus group-only-9
# F: group-toggle-all Toggle visibility of all groups.
# D: CM-a Toggle visibility of all groups.
-bind-key C4S-a group-toggle-all
+bind-key 4-a group-toggle-all
# F: window-group Toggle group membership of current window.
# D: CM-g Toggle group membership of current window.
@@ -115,11 +121,14 @@ bind-key 4-Tab window-cycle
# F: window-rcycle Reverse cycle through windows.
# D: MS-Tab Reverse cycle through currently visible windows.
-bind-key 4S-Tab window-cycle
+bind-key 4S-Tab window-rcycle
# F: window-cycle-ingroup Forward cycle through windows in current group.
# F: window-rcycle-ingroup Reverse cycle through windows in current group.
-# F: window-close Close current window.
+bind-key C4-Tab window-cycle-ingroup
+bind-key C4S-Tab window-rcycle-ingroup
+
+# F: window-close Close current window.
# D: CM-x Close current window.
bind-key 4S-j window-close
@@ -137,8 +146,9 @@ bind-key 4-Down window-lower
# D: M-Up Raise current window.
bind-key 4-Up window-raise
-# F: window-menu-label Label current window.
-# D: CM-n Label current window.
+# F: window-menu-label Label current window.
+# D: CM-n Label current window.
+bind-key C4-l window-menu-label
# F: window-freeze Freeze current window geometry.
# D: CMS-f Toggle freezing geometry of current window.
@@ -154,21 +164,24 @@ bind-key 4-s window-fullscreen
# F: window-maximize Maximize current window (gap + border honored).
# D: CM-m Toggle maximization of current window.
+bind-key C4-m window-maximize
# F: window-vmaximize Vertically maximize current window (gap + border
# F: honored).
# D: CM-equal Toggle vertical maximization of current window.
+bind-key C4-s window-vmaximize
# F: window-hmaximize Horizontally maximize current window (gap +
# F: border honored).
# D: CMS-equal Toggle horizontal maximization of current window.
+bind-key M4-s window-hmaximize
# F: window-htile Current window is placed at the top of the
# F: screen, maximized horizontally and resized to
# F: htile (default half) of the vertical screen
# F: space. Other windows in its group share
# F: remaining screen space.
-bind-key 4S-space window-htile
+bind-key 4M-space window-htile
# F: window-vtile Current window is placed on the left of the
# F: screen, maximized vertically and resized to
@@ -224,3 +237,6 @@ bind-key 4S-h window-move-down-big
bind-key 4S-t window-move-up-big
bind-key 4S-d window-move-left-big
bind-key 4S-n window-move-right-big
+
+bind-key 4-F5 "xset dpms force off"
+bind-key 4-F6 icd
diff --git a/dot_emacs b/dot_emacs
index b4506a7..4285bec 100644
--- a/dot_emacs
+++ b/dot_emacs
@@ -20,6 +20,7 @@
(put 'narrow-to-region 'disabled nil)
:hook ; add functions onto hook; only basename needed
((text-mode . turn-on-auto-fill)
+ (text-mode . flyspell-mode)
(before-save . whitespace-cleanup))
:bind ; key bindings
(("C-x a r" . align-regexp))
@@ -31,8 +32,14 @@
align-regexp
(around align-regexp-with-spaces activate)
(let ((indent-tabs-mode nil)) ad-do-it))
+ :custom
+ (face-font-family-alternatives
+ (append '(("Spleen 16x32" "Ubuntu Mono" "FreeMono" "Liberation Mono"))
+ face-font-family-alternatives))
:custom-face
- (default ((t (:family "Inconsolata")))))
+ (default ((t (:family "Spleen 16x32"
+ :height 130 ; unit is 1/10 pt
+ )))))
(if (string= (system-name) "demeter.rak.ac")
(use-package leuven-theme ; nice theme for lecturing / projectors
@@ -252,6 +259,12 @@ Extended Format date in the date field and return it as a string obeing
(add-to-list 'company-backends 'company-math-symbols-unicode)
(add-to-list 'company-backends 'company-latex-commands))
+(use-package company-org-block
+ :ensure t
+ :hook ((org-mode . (lambda ()
+ (setq-local company-backends '(company-org-block))
+ (company-mode +1)))))
+
(use-package cus-edit
:custom
(custom-file null-device "Don't store customizations"))
@@ -471,6 +484,10 @@ Otherwise split the current paragraph into one sentence per line."
:mode ("\\.m\'" . octave-mode))
(use-package org
+ :bind (:map org-mode-map
+ ("<tab>" . org-cycle))
+ :hook
+ (org-mode . visual-line-mode)
:custom
(org-link-file-path-type 'relative))
@@ -536,81 +553,10 @@ Returns a formatted BibTeX entry."
(use-package org-ref-bibtex
:ensure org-ref
- :config
- (defun my/org-ref-format-url-if-doi ()
- "Override built-in function. Originally, this reformatted
-the url to point to DOI. I would rather kill the URL field
-entirely if it contains the DOI. bibtex-clean-entry will then
-delete the field."
- (interactive)
- (save-excursion
- (bibtex-beginning-of-entry)
- (let ((doi (bibtex-autokey-get-field "doi")))
- (unless (string-empty-p doi)
- (when (string-match-p (regexp-quote (org-ref-bibtex-entry-doi))
- (bibtex-autokey-get-field "url"))
- (bibtex-set-field "url" ""))))))
- (defun my/org-ref-biblatex-journaltitle ()
- "Rename journal to journaltitle"
- (interactive)
- (save-excursion
- (bibtex-beginning-of-entry)
- (let ((journal (bibtex-autokey-get-field "journal"))
- (journaltitle (bibtex-autokey-get-field "journaltitle")))
- (when (and (string-empty-p journaltitle)
- (not (string-empty-p journal)))
- (bibtex-beginning-of-entry)
- (bibtex-set-field "journal" "")
- (bibtex-set-field "journaltitle" journal)))))
- (defun my/biblatex-date ()
- "Convert 'year' + 'month' fields to 'date' field"
- (interactive)
- (save-excursion
- (bibtex-beginning-of-entry)
- (let* ((year (bibtex-autokey-get-field "year"))
- (month (downcase (bibtex-autokey-get-field "month")))
- (nummonth (cond ((string= month "jan") "01")
- ((string= month "feb") "02")
- ((string= month "mar") "03")
- ((string= month "apr") "04")
- ((string= month "may") "05")
- ((string= month "jun") "06")
- ((string= month "jul") "07")
- ((string= month "aug") "08")
- ((string= month "sep") "09")
- ((string= month "oct") "10")
- ((string= month "nov") "11")
- ((string= month "dec") "12")
- (t "")))
- (olddate (bibtex-autokey-get-field "date"))
- (newdate (cond ((string-empty-p year) nil)
- ((string-empty-p nummonth) year)
- (t (concat year "-" nummonth)))))
- (when (and (string-empty-p olddate)
- (not (string-empty-p newdate)))
- (bibtex-beginning-of-entry)
- (bibtex-set-field "date" newdate)
- (bibtex-set-field "year" "")
- (bibtex-set-field "month" "")))))
- (defun my/orcb-check-journal ()
- "Check entry at point to see if journal exists in `org-ref-bibtex-journal-abbreviations'.
-If not, issue a warning."
- (interactive)
- (when
- (string= "article"
- (downcase
- (cdr (assoc "=type=" (bibtex-parse-entry)))))
- (save-excursion
- (bibtex-beginning-of-entry)
- (let* ((entry (bibtex-parse-entry t))
- (journal (replace-regexp-in-string "[[:space:]\n]+" " " (reftex-get-bib-field "journaltitle" entry))))
- (when (null journal)
- (error "Unable to get journal for this entry."))
- (unless (member journal (-flatten org-ref-bibtex-journal-abbreviations))
- (message "Journal \"%s\" not found in org-ref-bibtex-journal-abbreviations." journal))))))
:custom
(org-ref-title-case-types '(("article" "title")
("book" "booktitle" "title")
+ ("collection" "booktitle" "title")
("incollection" "booktitle" "title")
("inproceedings" "booktitle" "title")
("misc" "title")
@@ -632,13 +578,14 @@ If not, issue a warning."
("MSCS" "Mathematical Structures in Computer Science" "Math. Struct. Comp. Sci.")
("Nordic Journal of Philosophical Logic")
("PACMPL" "Proceedings of the ACM on Programming Languages" "Proc. ACM Program. Lang.")
+ ("Philosophy Compass")
("Piping Today")
("Proceedings of the Aristotelian Society")
("Publications of the Research Institute for Mathematical Sciences" "Publ. RIMS")
("Reason Papers")
("Reprints in Theory and Applications of Categories")
("Rice University Studies")
- ("Rice University Studies"))
+ ("Rice University Studies")
("SICOMP" "SIAM Journal on Computing")
("Science")
("TAC" "Theory and Applications of Categories")
@@ -649,10 +596,15 @@ If not, issue a warning."
("The Voice")
("Topoi")
("Transactions of the American Mathematical Society")
- ("{ACM} {SIGACT} News" "ACM SIGACT News")))
+ ("{ACM} {SIGACT} News" "ACM SIGACT News"))))
+
+(use-package reftex-cite
+ :ensure t)
(use-package org-ref-core
:ensure org-ref
+ :after org-ref-bibtex
+ :after reftex-cite
:after helm-bibtex
:bind (:map bibtex-mode-map
("C-c C-c" . org-ref-clean-bibtex-entry)
@@ -690,6 +642,77 @@ If not, issue a warning."
("′" . "'") ; PRIME
("”" . "''"))
org-ref-nonascii-latex-replacements))
+ (defun my/org-ref-format-url-if-doi ()
+ "Override built-in function. Originally, this reformatted
+the url to point to DOI. I would rather kill the URL field
+entirely if it contains the DOI. bibtex-clean-entry will then
+delete the field."
+ (interactive)
+ (save-excursion
+ (bibtex-beginning-of-entry)
+ (let ((doi (bibtex-autokey-get-field "doi")))
+ (unless (string-empty-p doi)
+ (when (string-match-p (regexp-quote (org-ref-bibtex-entry-doi))
+ (bibtex-autokey-get-field "url"))
+ (bibtex-set-field "url" ""))))))
+ (defun my/org-ref-biblatex-journaltitle ()
+ "Rename journal to journaltitle"
+ (interactive)
+ (save-excursion
+ (bibtex-beginning-of-entry)
+ (let ((journal (bibtex-autokey-get-field "journal"))
+ (journaltitle (bibtex-autokey-get-field "journaltitle")))
+ (when (and (string-empty-p journaltitle)
+ (not (string-empty-p journal)))
+ (bibtex-beginning-of-entry)
+ (bibtex-set-field "journal" "")
+ (bibtex-set-field "journaltitle" journal)))))
+ (defun my/biblatex-date ()
+ "Convert 'year' + 'month' fields to 'date' field"
+ (interactive)
+ (save-excursion
+ (bibtex-beginning-of-entry)
+ (let* ((year (bibtex-autokey-get-field "year"))
+ (month (downcase (bibtex-autokey-get-field "month")))
+ (nummonth (cond ((string= month "jan") "01")
+ ((string= month "feb") "02")
+ ((string= month "mar") "03")
+ ((string= month "apr") "04")
+ ((string= month "may") "05")
+ ((string= month "jun") "06")
+ ((string= month "jul") "07")
+ ((string= month "aug") "08")
+ ((string= month "sep") "09")
+ ((string= month "oct") "10")
+ ((string= month "nov") "11")
+ ((string= month "dec") "12")
+ (t "")))
+ (olddate (bibtex-autokey-get-field "date"))
+ (newdate (cond ((string-empty-p year) nil)
+ ((string-empty-p nummonth) year)
+ (t (concat year "-" nummonth)))))
+ (when (and (string-empty-p olddate)
+ (not (string-empty-p newdate)))
+ (bibtex-beginning-of-entry)
+ (bibtex-set-field "date" newdate)
+ (bibtex-set-field "year" "")
+ (bibtex-set-field "month" "")))))
+ (defun my/orcb-check-journal ()
+ "Check entry at point to see if journal exists in `org-ref-bibtex-journal-abbreviations'.
+If not, issue a warning."
+ (interactive)
+ (when
+ (string= "article"
+ (downcase
+ (cdr (assoc "=type=" (bibtex-parse-entry)))))
+ (save-excursion
+ (bibtex-beginning-of-entry)
+ (let* ((entry (bibtex-parse-entry t))
+ (journal (replace-regexp-in-string "[[:space:]\n]+" " " (reftex-get-bib-field "journaltitle" entry))))
+ (when (null journal)
+ (error "Unable to get journal for this entry."))
+ (unless (member journal (-flatten org-ref-bibtex-journal-abbreviations))
+ (message "Journal \"%s\" not found in org-ref-bibtex-journal-abbreviations." journal))))))
:custom
(org-ref-default-bibliography '("~/Documents/papers/library.bib"))
(org-ref-bibliography-notes "~/Documents/papers/notes.org")
@@ -726,6 +749,11 @@ If not, issue a warning."
(use-package org-ref-pdf
:ensure org-ref)
+(use-package ox-md
+ ;; org-mode to markdown exporter
+ :ensure org
+ :after (org))
+
(use-package outline
:ensure t
:hook (LaTeX-mode . outline-minor-mode))
diff --git a/dot_gitconfig b/dot_gitconfig
index bead2ea..b7c44cc 100644
--- a/dot_gitconfig
+++ b/dot_gitconfig
@@ -18,6 +18,8 @@
lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'
+ rl = reflog --format='%C(auto)%h %<|(20)%gd %C(blue)%cr%C(reset) %gs (%s)'
+
subrepo = !~/.local/lib/git-core/git-subrepo
[push]
default = simple
@@ -29,6 +31,7 @@
enabled = true
[url "git@salsa.debian.org:"]
pushInsteadOf = https://salsa.debian.org/
+ insteadOf = https://salsa.debian.org/
[core]
quotePath = false
[includeIf "gitdir:/media/t/work/packaging/"]
@@ -38,3 +41,7 @@
algorithm = histogram
[diff "gpg"]
textconv = gpg --no-tty --decrypt
+[help]
+ autocorrect = prompt
+[init]
+ defaultBranch = master
diff --git a/dot_lbdb/lbdbrc b/dot_lbdb/lbdbrc
new file mode 100644
index 0000000..b9bb0b2
--- /dev/null
+++ b/dot_lbdb/lbdbrc
@@ -0,0 +1,3 @@
+KEEP_DUPES="yes"
+METHODS="m_inmail m_gpg m_muttalias"
+MUTTALIAS_FILES="~/.mutt/aliases.rc ~/.mutt/aliases-cmu.rc"
diff --git a/dot_lbdbrc b/dot_lbdbrc
deleted file mode 100644
index fa39d9c..0000000
--- a/dot_lbdbrc
+++ /dev/null
@@ -1,4 +0,0 @@
-KEEP_DUPES="yes"
-METHODS="m_finger m_inmail m_gpg m_muttalias"
-M_FINGER_HOSTS="andrew.cmu.edu cs.cmu.edu"
-MUTTALIAS_FILES="~/.mutt/aliases.rc ~/.mutt/aliases-cmu.rc"
diff --git a/dot_mutt/color.rc b/dot_mutt/color.rc
index 4e44cc4..94e6817 100644
--- a/dot_mutt/color.rc
+++ b/dot_mutt/color.rc
@@ -66,14 +66,16 @@ color underline color223 color239
color sidebar_divider color250 default
color sidebar_new color142 default
-color index color142 default ~N
-color index color108 default ~O
-color index color109 default ~P
-color index color234 color214 ~F
-color index color175 default ~Q
-color index color167 default ~=
-color index color234 color223 ~T
-color index color234 color167 ~D
+# Note that the the last matching pattern is the
+# one that gets used, so order matters
+color index color142 default ~N # new messages
+color index color108 default ~O # old messages
+color index color109 default ~P # message is from you (consults $alternates)
+color index color175 default ~Q # messages which have been replied to
+color index color167 default ~= # duplicate
+color index color234 color214 ~F # flagged messages
+color index color234 color223 ~T # tagged messages
+color index color234 color167 ~D # deleted messages
color header color214 default "^(To|From):"
color header color142 default "^Subject:"
diff --git a/dot_mutt/encrypted_alias-mcgill.rc.asc b/dot_mutt/encrypted_alias-mcgill.rc.asc
index 1667c8a..21fc93b 100644
--- a/dot_mutt/encrypted_alias-mcgill.rc.asc
+++ b/dot_mutt/encrypted_alias-mcgill.rc.asc
@@ -1,41 +1,40 @@
-----BEGIN PGP MESSAGE-----
-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
-MDE=
-=J23l
+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
+oEGlBXpwP1XcBb3o
+=hW88
-----END PGP MESSAGE-----
diff --git a/dot_mutt/encrypted_private_alias.rc.asc b/dot_mutt/encrypted_private_alias.rc.asc
index 2239e9a..cad1bcf 100644
--- a/dot_mutt/encrypted_private_alias.rc.asc
+++ b/dot_mutt/encrypted_private_alias.rc.asc
@@ -1,66 +1,67 @@
-----BEGIN PGP MESSAGE-----
-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
-YpK8UZkzRjPfNu7sr0f6KJtvxj/UsWg3xG6x
-=3hYr
+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
+=x/sG
-----END PGP MESSAGE-----
diff --git a/dot_mutt/mailinglists.rc b/dot_mutt/mailinglists.rc
index 4f269b9..a05be8f 100644
--- a/dot_mutt/mailinglists.rc
+++ b/dot_mutt/mailinglists.rc
@@ -1,30 +1,6 @@
-subscribe -group ML.kubuntu-bugs kubuntu-bugs@lists.ubuntu.com
-subscribe -group ML.kubuntu-devel kubuntu-devel@lists.ubuntu.com
-subscribe -group ML.kubuntu-users kubuntu-users@lists.ubuntu.com
-subscribe -group ML.ubuntu-ca ubuntu-ca@lists.ubuntu.com
-subscribe -group ML.ubuntu-classroom ubuntu-classroom@lists.ubuntu.com
-subscribe -group ML.ubuntu-devel-announce ubuntu-devel-announce@lists.ubuntu.com
-subscribe -group ML.ubuntu-doc ubuntu-doc@lists.ubuntu.com
-subscribe -group ML.ubuntu-website ubuntu-website@lists.canonical.com
-subscribe -group ML.ubuntu .*@.*lists.ubuntu.com
-
-subscribe -group ML.debian-devel debian-devel@lists.debian.org
-subscribe -group ML.debian-devel-announce debian-devel-announce@lists.debian.org
-subscribe -group ML.debian-devel-fr debian-devel-fr@lists.debian.org
-subscribe -group ML.debian-haskell debian-haskell@lists.debian.org
-subscribe -group ML.debian-mentors debian-mentors@lists.debian.org
-subscribe -group ML.debian-project debian-python@lists.debian.org
-subscribe -group ML.debian-python debian-python@lists.debian.org
-subscribe -group ML.debian-qt-kde debian-qt-kde@lists.debian.org
-subscribe -group ML.pkg-kde-talk pkg-kde-talk@lists.debian.org
-subscribe -group ML.pkg-multimedia-commits pkg-multimedia-commits@lists.alioth.debian.org
-subscribe -group ML.pkg-multimedia-maintainers pkg-multimedia-maintainers@lists.alioth.debian.org
-subscribe -group ML.python-apps-team python-apps-team@lists.debian.org
-subscribe -group ML.debian .*@.*lists.debian.org, .*@.*lists.alioth.debian.org
-
-subscribe -group ML.openbsd-misc misc@opensmtpd.org
-
-subscribe -group ML.frescobaldi frescobaldi@googlegroups.com
-
-subscribe -group ML.cmu .*@lists.andrew.cmu.edu
-subscribe -group ML.concertrg concertrg@cs.cmu.edu
+subscribe -group ml.cmu .*@lists.andrew.cmu.edu (cs-phd-students|pop-group|concertrg)@cs.cmu.edu
+subscribe -group ml.debian .*@.*lists.debian.org
+subscribe -group ml.openbsd (bugs|misc)@opensmtpd.org
+subscribe -group ml.opensmtpd misc@opensmtpd.org
+subscribe -group ml.ubuntu .*@.*lists.ubuntu.com
+subscribe -group ml.mcgill (complogic)@cs.mcgill.ca
diff --git a/dot_muttrc b/dot_muttrc
index d7e9dc0..0f07a83 100644
--- a/dot_muttrc
+++ b/dot_muttrc
@@ -59,8 +59,8 @@ set sort_aux=date
set move=no
set mark_old=no
ignore * # ignore all headers except for ...
-unignore Date: From: To: CC: Bcc: Subject:
-hdr_order Subject: Date: From: To: CC: Bcc:
+unignore date from to cc bcc subject
+hdr_order date from to cc bcc subject
# MessageNo Mo Day (To if sent by me, from if sent to me) List [Flags (Hidden Messages/line count) Subject
set index_format="%4C %{%m%d} %-16.16F [%Z] %?M?(#%03M)&(%4l)? %s"
# Narrow / wide versions.
@@ -122,6 +122,8 @@ set mbox_type=mbox
# In case it's unset
set sendmail="sendmail -oem -oi"
+set fcc_before_send=yes
+
# For the -f option to work properly with account-hooks, it looks like I need
# to unset the folder option
unset folder
@@ -138,18 +140,6 @@ source ~/.mutt/savehooks.rc
source ~/.mutt/gpg.rc
source ~/.mutt/news.rc
-#set folder="/home/ryan/.maildb/GMAIL/"
-#set spoolfile='/home/ryan/.maildb/GMAIL/INBOX'
-#mailboxes ! + `sed -e 's/\(.*\)$/"+.\1"/g' .maildb/GMAIL/subscriptions | tr '\n' ' '`
-#mailboxes ! + `\
-#for file in ~/.maildb/GMAIL/.*; do \
-#box=$(basename "$file"); \
-#if [ ! "$box" = '.' -a ! "$box" = '..' -a ! "$box" = '.customflags' \
-# -a ! "$box" = '.subscriptions' ]; then \
-# echo -n "\"+$box\" "; \
-#fi; \
-#done`
-
set tmpdir='~/.mutt/tmp'
macro index <F7> \
diff --git a/dot_vim/plugin/gnupg.vim b/dot_vim/plugin/gnupg.vim
new file mode 100644
index 0000000..e2e7665
--- /dev/null
+++ b/dot_vim/plugin/gnupg.vim
@@ -0,0 +1,1226 @@
+" Name: gnupg.vim
+" Last Change: 2011 Nov 23
+" Maintainer: James McCoy <vega.james@gmail.com>
+" Original Author: Markus Braun <markus.braun@krawel.de>
+" Summary: Vim plugin for transparent editing of gpg encrypted files.
+" License: This program is free software; you can redistribute it and/or
+" modify it under the terms of the GNU General Public License
+" as published by the Free Software Foundation; either version
+" 2 of the License, or (at your option) any later version.
+" See http://www.gnu.org/copyleft/gpl-2.0.txt
+"
+" Section: Documentation {{{1
+"
+" Description: {{{2
+"
+" This script implements transparent editing of gpg encrypted files. The
+" filename must have a ".gpg", ".pgp" or ".asc" suffix. When opening such
+" a file the content is decrypted, when opening a new file the script will
+" ask for the recipients of the encrypted file. The file content will be
+" encrypted to all recipients before it is written. The script turns off
+" viminfo and swapfile to increase security.
+"
+" Installation: {{{2
+"
+" Copy the gnupg.vim file to the $HOME/.vim/plugin directory.
+" Refer to ':help add-plugin', ':help add-global-plugin' and ':help
+" runtimepath' for more details about Vim plugins.
+"
+" From "man 1 gpg-agent":
+"
+" ...
+" You should always add the following lines to your .bashrc or whatever
+" initialization file is used for all shell invocations:
+"
+" GPG_TTY=`tty`
+" export GPG_TTY
+"
+" It is important that this environment variable always reflects the out‐
+" put of the tty command. For W32 systems this option is not required.
+" ...
+"
+" Most distributions provide software to ease handling of gpg and gpg-agent.
+" Examples are keychain or seahorse.
+"
+" Commands: {{{2
+"
+" :GPGEditRecipients
+" Opens a scratch buffer to change the list of recipients. Recipients that
+" are unknown (not in your public key) are highlighted and have
+" a prepended "!". Closing the buffer makes the changes permanent.
+"
+" :GPGViewRecipients
+" Prints the list of recipients.
+"
+" :GPGEditOptions
+" Opens a scratch buffer to change the options for encryption (symmetric,
+" asymmetric, signing). Closing the buffer makes the changes permanent.
+" WARNING: There is no check of the entered options, so you need to know
+" what you are doing.
+"
+" :GPGViewOptions
+" Prints the list of options.
+"
+" Variables: {{{2
+"
+" g:GPGExecutable
+" If set used as gpg executable, otherwise the system chooses what is run
+" when "gpg" is called. Defaults to "gpg".
+"
+" g:GPGUseAgent
+" If set to 0 a possible available gpg-agent won't be used. Defaults to 1.
+"
+" g:GPGPreferSymmetric
+" If set to 1 symmetric encryption is preferred for new files. Defaults to 0.
+"
+" g:GPGPreferArmor
+" If set to 1 armored data is preferred for new files. Defaults to 0
+" unless a "*.asc" file is being edited.
+"
+" g:GPGPreferSign
+" If set to 1 signed data is preferred for new files. Defaults to 0.
+"
+" g:GPGDefaultRecipients
+" If set, these recipients are used as defaults when no other recipient is
+" defined. This variable is a Vim list. Default is unset.
+"
+" g:GPGUsePipes
+" If set to 1, use pipes instead of temporary files when interacting with
+" gnupg. When set to 1, this can cause terminal-based gpg agents to not
+" display correctly when prompting for passwords. Defaults to 0.
+"
+" Known Issues: {{{2
+"
+" In some cases gvim can't decrypt files
+
+" This is caused by the fact that a running gvim has no TTY and thus gpg is
+" not able to ask for the passphrase by itself. This is a problem for Windows
+" and Linux versions of gvim and could not be solved unless a "terminal
+" emulation" is implemented for gvim. To circumvent this you have to use any
+" combination of gpg-agent and a graphical pinentry program:
+"
+" - gpg-agent only:
+" you need to provide the passphrase for the needed key to gpg-agent
+" in a terminal before you open files with gvim which require this key.
+"
+" - pinentry only:
+" you will get a popup window every time you open a file that needs to
+" be decrypted.
+"
+" - gpgagent and pinentry:
+" you will get a popup window the first time you open a file that
+" needs to be decrypted.
+"
+" Credits: {{{2
+"
+" - Mathieu Clabaut for inspirations through his vimspell.vim script.
+" - Richard Bronosky for patch to enable ".pgp" suffix.
+" - Erik Remmelzwaal for patch to enable windows support and patient beta
+" testing.
+" - Lars Becker for patch to make gpg2 working.
+" - Thomas Arendsen Hein for patch to convert encoding of gpg output.
+" - Karl-Heinz Ruskowski for patch to fix unknown recipients and trust model
+" and patient beta testing.
+" - Giel van Schijndel for patch to get GPG_TTY dynamically.
+" - Sebastian Luettich for patch to fix issue with symmetric encryption an set
+" recipients.
+" - Tim Swast for patch to generate signed files.
+" - James Vega for patches for better '*.asc' handling, better filename
+" escaping and better handling of multiple keyrings.
+"
+" Section: Plugin header {{{1
+
+" guard against multiple loads {{{2
+if (exists("g:loaded_gnupg") || &cp || exists("#BufReadCmd*.\(gpg\|asc\|pgp\)"))
+ finish
+endif
+let g:loaded_gnupg = '2.3'
+let s:GPGInitRun = 0
+
+" check for correct vim version {{{2
+if (v:version < 702)
+ echohl ErrorMsg | echo 'plugin gnupg.vim requires Vim version >= 7.2' | echohl None
+ finish
+endif
+
+" Section: Autocmd setup {{{1
+
+augroup GnuPG
+ autocmd!
+
+ " do the decryption
+ autocmd BufReadCmd,FileReadCmd *.\(gpg\|asc\|pgp\) call s:GPGInit()
+ autocmd BufReadCmd,FileReadCmd *.\(gpg\|asc\|pgp\) call s:GPGDecrypt()
+ autocmd BufReadCmd *.\(gpg\|asc\|pgp\) call s:GPGBufReadPost()
+
+ " convert all text to encrypted text before writing
+ autocmd BufWriteCmd,FileWriteCmd *.\(gpg\|asc\|pgp\) call s:GPGInit()
+ autocmd BufWriteCmd,FileWriteCmd *.\(gpg\|asc\|pgp\) call s:GPGEncrypt()
+
+ " cleanup on leaving vim
+ autocmd VimLeave *.\(gpg\|asc\|pgp\) call s:GPGCleanup()
+augroup END
+
+" Section: Constants {{{1
+
+let s:GPGMagicString = "\t \t"
+
+" Section: Highlight setup {{{1
+
+highlight default link GPGWarning WarningMsg
+highlight default link GPGError ErrorMsg
+highlight default link GPGHighlightUnknownRecipient ErrorMsg
+
+" Section: Functions {{{1
+
+" Function: s:GPGInit() {{{2
+"
+" initialize the plugin
+"
+function s:GPGInit()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGInit()")
+
+ " we don't want a swap file, as it writes unencrypted data to disk
+ setl noswapfile
+
+ " if persistent undo is present, disable it for this buffer
+ if exists('+undofile')
+ setl noundofile
+ endif
+
+ " the rest only has to be run once
+ if s:GPGInitRun
+ return
+ endif
+
+ " first make sure nothing is written to ~/.viminfo while editing
+ " an encrypted file.
+ set viminfo=
+
+ " check what gpg command to use
+ if (!exists("g:GPGExecutable"))
+ let g:GPGExecutable = "gpg --trust-model always"
+ endif
+
+ " check if gpg-agent is allowed
+ if (!exists("g:GPGUseAgent"))
+ let g:GPGUseAgent = 1
+ endif
+
+ " check if symmetric encryption is preferred
+ if (!exists("g:GPGPreferSymmetric"))
+ let g:GPGPreferSymmetric = 0
+ endif
+
+ " check if armored files are preferred
+ if (!exists("g:GPGPreferArmor"))
+ " .asc files should be armored as that's what the extension is used for
+ if expand('<afile>') =~ '\.asc$'
+ let g:GPGPreferArmor = 1
+ else
+ let g:GPGPreferArmor = 0
+ endif
+ endif
+
+ " check if signed files are preferred
+ if (!exists("g:GPGPreferSign"))
+ let g:GPGPreferSign = 0
+ endif
+
+ " start with empty default recipients if none is defined so far
+ if (!exists("g:GPGDefaultRecipients"))
+ let g:GPGDefaultRecipients = []
+ endif
+
+ " prefer not to use pipes since it can garble gpg agent display
+ if (!exists("g:GPGUsePipes"))
+ let g:GPGUsePipes = 0
+ endif
+
+ " allow alternate gnupg homedir
+ if (!exists('g:GPGHomedir'))
+ let g:GPGHomedir = ''
+ endif
+
+ " print version
+ call s:GPGDebug(1, "gnupg.vim ". g:loaded_gnupg)
+
+ " determine if gnupg can use the gpg-agent
+ if (exists("$GPG_AGENT_INFO") && g:GPGUseAgent == 1)
+ if (!exists("$GPG_TTY") && !has("gui_running"))
+ let $GPG_TTY = system("tty")
+ if (v:shell_error)
+ let $GPG_TTY = ""
+ echohl GPGError
+ echom "The GPG_TTY is not set and no TTY could be found using the `tty` command!"
+ echom "gpg-agent might not work."
+ echohl None
+ endif
+ endif
+ let s:GPGCommand = g:GPGExecutable . " --use-agent"
+ else
+ let s:GPGCommand = g:GPGExecutable . " --no-use-agent"
+ endif
+
+ " don't use tty in gvim except for windows: we get their a tty for free.
+ " FIXME find a better way to avoid an error.
+ " with this solution only --use-agent will work
+ if (has("gui_running") && !has("gui_win32"))
+ let s:GPGCommand = s:GPGCommand . " --no-tty"
+ endif
+
+ " setup shell environment for unix and windows
+ let s:shellredirsave = &shellredir
+ let s:shellsave = &shell
+ let s:shelltempsave = &shelltemp
+ " noshelltemp isn't currently supported on Windows, but it doesn't cause any
+ " errors and this future proofs us against requiring changes if Windows
+ " gains noshelltemp functionality
+ let s:shelltemp = !g:GPGUsePipes
+ if (has("unix"))
+ " unix specific settings
+ let s:shellredir = ">%s 2>&1"
+ let s:shell = '/bin/sh'
+ let s:stderrredirnull = '2>/dev/null'
+ let s:GPGCommand = "LANG=C LC_ALL=C " . s:GPGCommand
+ else
+ " windows specific settings
+ let s:shellredir = '>%s'
+ let s:shell = &shell
+ let s:stderrredirnull = '2>nul'
+ endif
+
+ call s:GPGDebug(3, "shellredirsave: " . s:shellredirsave)
+ call s:GPGDebug(3, "shellsave: " . s:shellsave)
+ call s:GPGDebug(3, "shelltempsave: " . s:shelltempsave)
+
+ call s:GPGDebug(3, "shell: " . s:shell)
+ call s:GPGDebug(3, "shellcmdflag: " . &shellcmdflag)
+ call s:GPGDebug(3, "shellxquote: " . &shellxquote)
+ call s:GPGDebug(3, "shellredir: " . s:shellredir)
+ call s:GPGDebug(3, "stderrredirnull: " . s:stderrredirnull)
+
+ call s:GPGDebug(3, "shell implementation: " . resolve(s:shell))
+
+ " find the supported algorithms
+ let output = s:GPGSystem({ 'level': 2, 'args': '--version' })
+
+ let s:GPGPubkey = substitute(output, ".*Pubkey: \\(.\\{-}\\)\n.*", "\\1", "")
+ let s:GPGCipher = substitute(output, ".*Cipher: \\(.\\{-}\\)\n.*", "\\1", "")
+ let s:GPGHash = substitute(output, ".*Hash: \\(.\\{-}\\)\n.*", "\\1", "")
+ let s:GPGCompress = substitute(output, ".*Compress.\\{-}: \\(.\\{-}\\)\n.*", "\\1", "")
+
+ call s:GPGDebug(2, "public key algorithms: " . s:GPGPubkey)
+ call s:GPGDebug(2, "cipher algorithms: " . s:GPGCipher)
+ call s:GPGDebug(2, "hashing algorithms: " . s:GPGHash)
+ call s:GPGDebug(2, "compression algorithms: " . s:GPGCompress)
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGInit()")
+ let s:GPGInitRun = 1
+endfunction
+
+" Function: s:GPGCleanup() {{{2
+"
+" cleanup on leaving vim
+"
+function s:GPGCleanup()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGCleanup()")
+
+ " wipe out screen
+ new +only
+ redraw!
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGCleanup()")
+endfunction
+
+" Function: s:GPGDecrypt() {{{2
+"
+" decrypt the buffer and find all recipients of the encrypted file
+"
+function s:GPGDecrypt()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGDecrypt()")
+
+ " get the filename of the current buffer
+ let filename = expand("<afile>:p")
+
+ " clear GPGRecipients and GPGOptions
+ let b:GPGRecipients = g:GPGDefaultRecipients
+ let b:GPGOptions = []
+
+ " File doesn't exist yet, so nothing to decrypt
+ if empty(glob(filename))
+ return
+ endif
+
+ " Only let this if the file actually exists, otherwise GPG functionality
+ " will be disabled when editing a buffer that doesn't yet have a backing
+ " file
+ let b:GPGEncrypted = 0
+
+ " find the recipients of the file
+ let cmd = { 'level': 3 }
+ let cmd.args = '--verbose --decrypt --list-only --dry-run --batch --no-use-agent --logger-fd 1 ' . shellescape(filename)
+ let output = s:GPGSystem(cmd)
+
+ let asymmPattern = 'gpg: public key is \%(0x\)\=[[:xdigit:]]\{8,16}'
+ " check if the file is symmetric/asymmetric encrypted
+ if (match(output, "gpg: encrypted with [[:digit:]]\\+ passphrase") >= 0)
+ " file is symmetric encrypted
+ let b:GPGEncrypted = 1
+ call s:GPGDebug(1, "this file is symmetric encrypted")
+
+ let b:GPGOptions += ["symmetric"]
+
+ " find the used cipher algorithm
+ let cipher = substitute(output, ".*gpg: \\([^ ]\\+\\) encrypted data.*", "\\1", "")
+ if (match(s:GPGCipher, "\\<" . cipher . "\\>") >= 0)
+ let b:GPGOptions += ["cipher-algo " . cipher]
+ call s:GPGDebug(1, "cipher-algo is " . cipher)
+ else
+ echohl GPGWarning
+ echom "The cipher " . cipher . " is not known by the local gpg command. Using default!"
+ echo
+ echohl None
+ endif
+ elseif (match(output, asymmPattern) >= 0)
+ " file is asymmetric encrypted
+ let b:GPGEncrypted = 1
+ call s:GPGDebug(1, "this file is asymmetric encrypted")
+
+ let b:GPGOptions += ["encrypt"]
+
+ " find the used public keys
+ let start = match(output, asymmPattern)
+ while (start >= 0)
+ let start = start + strlen("gpg: public key is ")
+ let recipient = matchstr(output, '[[:xdigit:]]\{8,16}', start)
+ call s:GPGDebug(1, "recipient is " . recipient)
+ let name = s:GPGNameToID(recipient)
+ if (strlen(name) > 0)
+ let b:GPGRecipients += [name]
+ call s:GPGDebug(1, "name of recipient is " . name)
+ else
+ let b:GPGRecipients += [recipient]
+ echohl GPGWarning
+ echom "The recipient \"" . recipient . "\" is not in your public keyring!"
+ echohl None
+ end
+ let start = match(output, asymmPattern, start)
+ endwhile
+ else
+ " file is not encrypted
+ let b:GPGEncrypted = 0
+ call s:GPGDebug(1, "this file is not encrypted")
+ echohl GPGWarning
+ echom "File is not encrypted, all GPG functions disabled!"
+ echohl None
+ silent exe '.r ' . fnameescape(filename)
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGDecrypt()")
+ return
+ endif
+
+ " check if the message is armored
+ if (match(output, "gpg: armor header") >= 0)
+ call s:GPGDebug(1, "this file is armored")
+ let b:GPGOptions += ["armor"]
+ endif
+
+ " finally decrypt the buffer content
+ " since even with the --quiet option passphrase typos will be reported,
+ " we must redirect stderr (using shell temporarily)
+ call s:GPGDebug(1, "decrypting file")
+ let cmd = { 'level': 1, 'ex': 'r !' }
+ let cmd.args = '--quiet --decrypt ' . shellescape(filename, 1)
+ call s:GPGExecute(cmd)
+
+ if (v:shell_error) " message could not be decrypted
+ echohl GPGError
+ let blackhole = input("Message could not be decrypted! (Press ENTER)")
+ echohl None
+ silent bwipeout!
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGDecrypt()")
+ return
+ endif
+
+ " refresh screen
+ redraw!
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGDecrypt()")
+endfunction
+
+function s:GPGBufReadPost()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGBufReadPost()")
+ silent 1delete
+ " call the autocommand for the file minus .gpg$
+ execute ':doautocmd BufReadPost ' . fnameescape(expand('<afile>:r'))
+ call s:GPGDebug(2, 'called autocommand for ' . fnameescape(expand('<afile>:r')))
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGBufReadPost()")
+endfunction
+
+" Function: s:GPGEncrypt() {{{2
+"
+" encrypts the buffer to all previous recipients
+"
+function s:GPGEncrypt()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGEncrypt()")
+
+ " store encoding and switch to a safe one
+ if (&fileencoding != &encoding)
+ let s:GPGEncoding = &encoding
+ let &encoding = &fileencoding
+ call s:GPGDebug(2, "encoding was \"" . s:GPGEncoding . "\", switched to \"" . &encoding . "\"")
+ else
+ let s:GPGEncoding = ""
+ call s:GPGDebug(2, "encoding and fileencoding are the same (\"" . &encoding . "\"), not switching")
+ endif
+
+ " guard for unencrypted files
+ if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
+ echohl GPGError
+ let blackhole = input("Message could not be encrypted! (Press ENTER)")
+ echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEncrypt()")
+ return
+ endif
+
+ " initialize GPGOptions if not happened before
+ if (!exists("b:GPGOptions") || len(b:GPGOptions) == 0)
+ let b:GPGOptions = []
+ if (exists("g:GPGPreferSymmetric") && g:GPGPreferSymmetric == 1)
+ let b:GPGOptions += ["symmetric"]
+ let b:GPGRecipients = []
+ else
+ let b:GPGOptions += ["encrypt"]
+ endif
+ if (exists("g:GPGPreferArmor") && g:GPGPreferArmor == 1)
+ let b:GPGOptions += ["armor"]
+ endif
+ if (exists("g:GPGPreferSign") && g:GPGPreferSign == 1)
+ let b:GPGOptions += ["sign"]
+ endif
+ call s:GPGDebug(1, "no options set, so using default options: " . string(b:GPGOptions))
+ endif
+
+ " built list of options
+ let options = ""
+ for option in b:GPGOptions
+ let options = options . " --" . option . " "
+ endfor
+
+ if (!exists('b:GPGRecipients'))
+ let b:GPGRecipients = []
+ endif
+
+ " check here again if all recipients are available in the keyring
+ let [ recipients, unknownrecipients ] = s:GPGCheckRecipients(b:GPGRecipients)
+
+ " check if there are unknown recipients and warn
+ if (len(unknownrecipients) > 0)
+ echohl GPGWarning
+ echom "Please use GPGEditRecipients to correct!!"
+ echo
+ echohl None
+
+ " Let user know whats happend and copy known_recipients back to buffer
+ let dummy = input("Press ENTER to quit")
+ endif
+
+ " built list of recipients
+ if (len(recipients) > 0)
+ for gpgid in recipients
+ let options = options . " -r " . gpgid
+ endfor
+ endif
+
+ " encrypt the buffer
+ let destfile = tempname()
+ let cmd = { 'level': 1, 'ex': "'[,']w !" }
+ let cmd.args = '--quiet --no-encrypt-to ' . options
+ let cmd.redirect = '>' . shellescape(destfile, 1)
+ call s:GPGExecute(cmd)
+
+ " restore encoding
+ if (s:GPGEncoding != "")
+ let &encoding = s:GPGEncoding
+ call s:GPGDebug(2, "restored encoding \"" . &encoding . "\"")
+ endif
+
+ if (v:shell_error) " message could not be encrypted
+ " Command failed, so clean up the tempfile
+ call delete(destfile)
+ echohl GPGError
+ let blackhole = input("Message could not be encrypted! (Press ENTER)")
+ echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEncrypt()")
+ return
+ endif
+
+ call rename(destfile, resolve(expand('<afile>')))
+ setl nomodified
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEncrypt()")
+endfunction
+
+" Function: s:GPGViewRecipients() {{{2
+"
+" echo the recipients
+"
+function s:GPGViewRecipients()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGViewRecipients()")
+
+ " guard for unencrypted files
+ if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
+ echohl GPGWarning
+ echom "File is not encrypted, all GPG functions disabled!"
+ echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGViewRecipients()")
+ return
+ endif
+
+ let [ recipients, unknownrecipients ] = s:GPGCheckRecipients(b:GPGRecipients)
+
+ echo 'This file has following recipients (Unknown recipients have a prepended "!"):'
+ " echo the recipients
+ for name in recipients
+ let name = s:GPGIDToName(name)
+ echo name
+ endfor
+
+ " echo the unknown recipients
+ echohl GPGWarning
+ for name in unknownrecipients
+ let name = "!" . name
+ echo name
+ endfor
+ echohl None
+
+ " check if there is any known recipient
+ if (len(recipients) == 0)
+ echohl GPGError
+ echom 'There are no known recipients!'
+ echohl None
+ endif
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGViewRecipients()")
+endfunction
+
+" Function: s:GPGEditRecipients() {{{2
+"
+" create a scratch buffer with all recipients to add/remove recipients
+"
+function s:GPGEditRecipients()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGEditRecipients()")
+
+ " guard for unencrypted files
+ if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
+ echohl GPGWarning
+ echom "File is not encrypted, all GPG functions disabled!"
+ echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEditRecipients()")
+ return
+ endif
+
+ " only do this if it isn't already a GPGRecipients_* buffer
+ if (match(bufname("%"), "^\\(GPGRecipients_\\|GPGOptions_\\)") != 0 && match(bufname("%"), "\.\\(gpg\\|asc\\|pgp\\)$") >= 0)
+
+ " save buffer name
+ let buffername = bufname("%")
+ let editbuffername = "GPGRecipients_" . buffername
+
+ " check if this buffer exists
+ if (!bufexists(editbuffername))
+ " create scratch buffer
+ execute 'silent! split ' . fnameescape(editbuffername)
+
+ " add a autocommand to regenerate the recipients after a write
+ autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishRecipientsBuffer()
+ else
+ if (bufwinnr(editbuffername) >= 0)
+ " switch to scratch buffer window
+ execute 'silent! ' . bufwinnr(editbuffername) . "wincmd w"
+ else
+ " split scratch buffer window
+ execute 'silent! sbuffer ' . fnameescape(editbuffername)
+
+ " add a autocommand to regenerate the recipients after a write
+ autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishRecipientsBuffer()
+ endif
+
+ " empty the buffer
+ silent %delete
+ endif
+
+ " Mark the buffer as a scratch buffer
+ setlocal buftype=acwrite
+ setlocal bufhidden=hide
+ setlocal noswapfile
+ setlocal nowrap
+ setlocal nobuflisted
+ setlocal nonumber
+
+ " so we know for which other buffer this edit buffer is
+ let b:GPGCorrespondingTo = buffername
+
+ " put some comments to the scratch buffer
+ silent put ='GPG: ----------------------------------------------------------------------'
+ silent put ='GPG: Please edit the list of recipients, one recipient per line.'
+ silent put ='GPG: Unknown recipients have a prepended \"!\".'
+ silent put ='GPG: Lines beginning with \"GPG:\" are removed automatically.'
+ silent put ='GPG: Data after recipients between and including \"(\" and \")\" is ignored.'
+ silent put ='GPG: Closing this buffer commits changes.'
+ silent put ='GPG: ----------------------------------------------------------------------'
+
+ " get the recipients
+ let [ recipients, unknownrecipients ] = s:GPGCheckRecipients(getbufvar(b:GPGCorrespondingTo, "GPGRecipients"))
+
+ " if there are no known or unknown recipients, use the default ones
+ if (len(recipients) == 0 && len(unknownrecipients) == 0)
+ if (type(g:GPGDefaultRecipients) == type([]))
+ let [ recipients, unknownrecipients ] = s:GPGCheckRecipients(g:GPGDefaultRecipients)
+ else
+ echohl GPGWarning
+ echom "g:GPGDefaultRecipients is not a Vim list, please correct this in your vimrc!"
+ echohl None
+ endif
+ endif
+
+ " put the recipients in the scratch buffer
+ for name in recipients
+ let name = s:GPGIDToName(name)
+ silent put =name
+ endfor
+
+ " put the unknown recipients in the scratch buffer
+ let syntaxPattern = "\\(nonexxistinwordinthisbuffer"
+ for name in unknownrecipients
+ let name = "!" . name
+ let syntaxPattern = syntaxPattern . "\\|" . fnameescape(name)
+ silent put =name
+ endfor
+ let syntaxPattern = syntaxPattern . "\\)"
+
+ " define highlight
+ if (has("syntax") && exists("g:syntax_on"))
+ execute 'syntax match GPGUnknownRecipient "' . syntaxPattern . '"'
+ highlight clear GPGUnknownRecipient
+ highlight link GPGUnknownRecipient GPGHighlightUnknownRecipient
+
+ syntax match GPGComment "^GPG:.*$"
+ execute 'syntax match GPGComment "' . s:GPGMagicString . '.*$"'
+ highlight clear GPGComment
+ highlight link GPGComment Comment
+ endif
+
+ " delete the empty first line
+ silent 1delete
+
+ " jump to the first recipient
+ silent $
+
+ endif
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEditRecipients()")
+endfunction
+
+" Function: s:GPGFinishRecipientsBuffer() {{{2
+"
+" create a new recipient list from RecipientsBuffer
+"
+function s:GPGFinishRecipientsBuffer()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGFinishRecipientsBuffer()")
+
+ " guard for unencrypted files
+ if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
+ echohl GPGWarning
+ echom "File is not encrypted, all GPG functions disabled!"
+ echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGFinishRecipientsBuffer()")
+ return
+ endif
+
+ " go to buffer before doing work
+ if (bufnr("%") != expand("<abuf>"))
+ " switch to scratch buffer window
+ execute 'silent! ' . bufwinnr(expand("<afile>")) . "wincmd w"
+ endif
+
+ " delete the autocommand
+ autocmd! * <buffer>
+
+
+ " get the recipients from the scratch buffer
+ let recipients = []
+ let lines = getline(1,"$")
+ for recipient in lines
+ " delete all text after magic string
+ let recipient = substitute(recipient, s:GPGMagicString . ".*$", "", "")
+
+ " delete all spaces at beginning and end of the recipient
+ " also delete a '!' at the beginning of the recipient
+ let recipient = substitute(recipient, "^[[:space:]!]*\\(.\\{-}\\)[[:space:]]*$", "\\1", "")
+
+ " delete comment lines
+ let recipient = substitute(recipient, "^GPG:.*$", "", "")
+
+ " only do this if the line is not empty
+ if (strlen(recipient) > 0)
+ let gpgid = s:GPGNameToID(recipient)
+ if (strlen(gpgid) > 0)
+ if (match(recipients, gpgid) < 0)
+ let recipients += [gpgid]
+ endif
+ else
+ if (match(recipients, recipient) < 0)
+ let recipients += [recipient]
+ echohl GPGWarning
+ echom "The recipient \"" . recipient . "\" is not in your public keyring!"
+ echohl None
+ endif
+ endif
+ endif
+ endfor
+
+ " write back the new recipient list to the corresponding buffer and mark it
+ " as modified. Buffer is now for sure a encrypted buffer.
+ call setbufvar(b:GPGCorrespondingTo, "GPGRecipients", recipients)
+ call setbufvar(b:GPGCorrespondingTo, "&mod", 1)
+ call setbufvar(b:GPGCorrespondingTo, "GPGEncrypted", 1)
+
+ " check if there is any known recipient
+ if (len(recipients) == 0)
+ echohl GPGError
+ echom 'There are no known recipients!'
+ echohl None
+ endif
+
+ " reset modified flag
+ setl nomodified
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGFinishRecipientsBuffer()")
+endfunction
+
+" Function: s:GPGViewOptions() {{{2
+"
+" echo the recipients
+"
+function s:GPGViewOptions()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGViewOptions()")
+
+ " guard for unencrypted files
+ if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
+ echohl GPGWarning
+ echom "File is not encrypted, all GPG functions disabled!"
+ echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGViewOptions()")
+ return
+ endif
+
+ if (exists("b:GPGOptions"))
+ echo 'This file has following options:'
+ " echo the options
+ for option in b:GPGOptions
+ echo option
+ endfor
+ endif
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGViewOptions()")
+endfunction
+
+" Function: s:GPGEditOptions() {{{2
+"
+" create a scratch buffer with all recipients to add/remove recipients
+"
+function s:GPGEditOptions()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGEditOptions()")
+
+ " guard for unencrypted files
+ if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
+ echohl GPGWarning
+ echom "File is not encrypted, all GPG functions disabled!"
+ echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEditOptions()")
+ return
+ endif
+
+ " only do this if it isn't already a GPGOptions_* buffer
+ if (match(bufname("%"), "^\\(GPGRecipients_\\|GPGOptions_\\)") != 0 && match(bufname("%"), "\.\\(gpg\\|asc\\|pgp\\)$") >= 0)
+
+ " save buffer name
+ let buffername = bufname("%")
+ let editbuffername = "GPGOptions_" . buffername
+
+ " check if this buffer exists
+ if (!bufexists(editbuffername))
+ " create scratch buffer
+ execute 'silent! split ' . fnameescape(editbuffername)
+
+ " add a autocommand to regenerate the options after a write
+ autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishOptionsBuffer()
+ else
+ if (bufwinnr(editbuffername) >= 0)
+ " switch to scratch buffer window
+ execute 'silent! ' . bufwinnr(editbuffername) . "wincmd w"
+ else
+ " split scratch buffer window
+ execute 'silent! sbuffer ' . fnameescape(editbuffername)
+
+ " add a autocommand to regenerate the options after a write
+ autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishOptionsBuffer()
+ endif
+
+ " empty the buffer
+ silent %delete
+ endif
+
+ " Mark the buffer as a scratch buffer
+ setlocal buftype=nofile
+ setlocal noswapfile
+ setlocal nowrap
+ setlocal nobuflisted
+ setlocal nonumber
+
+ " so we know for which other buffer this edit buffer is
+ let b:GPGCorrespondingTo = buffername
+
+ " put some comments to the scratch buffer
+ silent put ='GPG: ----------------------------------------------------------------------'
+ silent put ='GPG: THERE IS NO CHECK OF THE ENTERED OPTIONS!'
+ silent put ='GPG: YOU NEED TO KNOW WHAT YOU ARE DOING!'
+ silent put ='GPG: IF IN DOUBT, QUICKLY EXIT USING :x OR :bd.'
+ silent put ='GPG: Please edit the list of options, one option per line.'
+ silent put ='GPG: Please refer to the gpg documentation for valid options.'
+ silent put ='GPG: Lines beginning with \"GPG:\" are removed automatically.'
+ silent put ='GPG: Closing this buffer commits changes.'
+ silent put ='GPG: ----------------------------------------------------------------------'
+
+ " put the options in the scratch buffer
+ let options = getbufvar(b:GPGCorrespondingTo, "GPGOptions")
+
+ for option in options
+ silent put =option
+ endfor
+
+ " delete the empty first line
+ silent 1delete
+
+ " jump to the first option
+ silent $
+
+ " define highlight
+ if (has("syntax") && exists("g:syntax_on"))
+ syntax match GPGComment "^GPG:.*$"
+ highlight clear GPGComment
+ highlight link GPGComment Comment
+ endif
+ endif
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEditOptions()")
+endfunction
+
+" Function: s:GPGFinishOptionsBuffer() {{{2
+"
+" create a new option list from OptionsBuffer
+"
+function s:GPGFinishOptionsBuffer()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGFinishOptionsBuffer()")
+
+ " guard for unencrypted files
+ if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
+ echohl GPGWarning
+ echom "File is not encrypted, all GPG functions disabled!"
+ echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGFinishOptionsBuffer()")
+ return
+ endif
+
+ " go to buffer before doing work
+ if (bufnr("%") != expand("<abuf>"))
+ " switch to scratch buffer window
+ execute 'silent! ' . bufwinnr(expand("<afile>")) . "wincmd w"
+ endif
+
+ " clear options and unknownOptions
+ let options = []
+ let unknownOptions = []
+
+ " delete the autocommand
+ autocmd! * <buffer>
+
+ " get the options from the scratch buffer
+ let lines = getline(1, "$")
+ for option in lines
+ " delete all spaces at beginning and end of the option
+ " also delete a '!' at the beginning of the option
+ let option = substitute(option, "^[[:space:]!]*\\(.\\{-}\\)[[:space:]]*$", "\\1", "")
+ " delete comment lines
+ let option = substitute(option, "^GPG:.*$", "", "")
+
+ " only do this if the line is not empty
+ if (strlen(option) > 0 && match(options, option) < 0)
+ let options += [option]
+ endif
+ endfor
+
+ " write back the new option list to the corresponding buffer and mark it
+ " as modified
+ call setbufvar(b:GPGCorrespondingTo, "GPGOptions", options)
+ call setbufvar(b:GPGCorrespondingTo, "&mod", 1)
+
+ " reset modified flag
+ setl nomodified
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGFinishOptionsBuffer()")
+endfunction
+
+" Function: s:GPGCheckRecipients(tocheck) {{{2
+"
+" check if recipients are known
+" Returns: two lists recipients and unknownrecipients
+"
+function s:GPGCheckRecipients(tocheck)
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGCheckRecipients()")
+
+ let recipients = []
+ let unknownrecipients = []
+
+ if (type(a:tocheck) == type([]))
+ for recipient in a:tocheck
+ let gpgid = s:GPGNameToID(recipient)
+ if (strlen(gpgid) > 0)
+ if (match(recipients, gpgid) < 0)
+ let recipients += [gpgid]
+ endif
+ else
+ if (match(unknownrecipients, recipient) < 0)
+ let unknownrecipients += [recipient]
+ echohl GPGWarning
+ echom "The recipient \"" . recipient . "\" is not in your public keyring!"
+ echohl None
+ endif
+ end
+ endfor
+ endif
+
+ call s:GPGDebug(2, "recipients are: " . string(recipients))
+ call s:GPGDebug(2, "unknown recipients are: " . string(unknownrecipients))
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGCheckRecipients()")
+ return [ recipients, unknownrecipients ]
+endfunction
+
+" Function: s:GPGNameToID(name) {{{2
+"
+" find GPG key ID corresponding to a name
+" Returns: ID for the given name
+"
+function s:GPGNameToID(name)
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGNameToID()")
+
+ " ask gpg for the id for a name
+ let cmd = { 'level': 2 }
+ let cmd.args = '--quiet --with-colons --fixed-list-mode --list-keys ' . shellescape(a:name)
+ let output = s:GPGSystem(cmd)
+
+ " when called with "--with-colons" gpg encodes its output _ALWAYS_ as UTF-8,
+ " so convert it, if necessary
+ if (&encoding != "utf-8")
+ let output = iconv(output, "utf-8", &encoding)
+ endif
+ let lines = split(output, "\n")
+
+ " parse the output of gpg
+ let pubseen = 0
+ let counter = 0
+ let gpgids = []
+ let duplicates = {}
+ let choices = "The name \"" . a:name . "\" is ambiguous. Please select the correct key:\n"
+ for line in lines
+
+ " check if this line has already been processed
+ if !has_key(duplicates, line)
+ let duplicates[line] = 1
+
+ let fields = split(line, ":")
+ " search for the next uid
+ if (pubseen == 1)
+ if (fields[0] == "uid")
+ let choices = choices . " " . fields[9] . "\n"
+ else
+ let pubseen = 0
+ endif
+ endif
+
+ " search for the next pub
+ if (pubseen == 0)
+ if (fields[0] == "pub")
+ let identity = fields[4]
+ let gpgids += [identity]
+ if exists("*strftime")
+ let choices = choices . counter . ": ID: 0x" . identity . " created at " . strftime("%c", fields[5]) . "\n"
+ else
+ let choices = choices . counter . ": ID: 0x" . identity . "\n"
+ endif
+ let counter = counter+1
+ let pubseen = 1
+ endif
+ endif
+ endif
+
+ endfor
+
+ " counter > 1 means we have more than one results
+ let answer = 0
+ if (counter > 1)
+ let choices = choices . "Enter number: "
+ let answer = input(choices, "0")
+ while (answer == "")
+ let answer = input("Enter number: ", "0")
+ endwhile
+ endif
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGNameToID()")
+ return get(gpgids, answer, "")
+endfunction
+
+" Function: s:GPGIDToName(identity) {{{2
+"
+" find name corresponding to a GPG key ID
+" Returns: Name for the given ID
+"
+function s:GPGIDToName(identity)
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGIDToName()")
+
+ " TODO is the encryption subkey really unique?
+
+ " ask gpg for the id for a name
+ let cmd = { 'level': 2 }
+ let cmd.args = '--quiet --with-colons --fixed-list-mode --list-keys ' . a:identity
+ let output = s:GPGSystem(cmd)
+
+ " when called with "--with-colons" gpg encodes its output _ALWAYS_ as UTF-8,
+ " so convert it, if necessary
+ if (&encoding != "utf-8")
+ let output = iconv(output, "utf-8", &encoding)
+ endif
+ let lines = split(output, "\n")
+
+ " parse the output of gpg
+ let pubseen = 0
+ let uid = ""
+ for line in lines
+ let fields = split(line, ":")
+ if (pubseen == 0) " search for the next pub
+ if (fields[0] == "pub")
+ let pubseen = 1
+ endif
+ else " search for the next uid
+ if (fields[0] == "uid")
+ let pubseen = 0
+ if exists("*strftime")
+ let uid = fields[9] . s:GPGMagicString . "(ID: 0x" . a:identity . " created at " . strftime("%c", fields[5]) . ")"
+ else
+ let uid = fields[9] . s:GPGMagicString . "(ID: 0x" . a:identity . ")"
+ endif
+ break
+ endif
+ endif
+ endfor
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGIDToName()")
+ return uid
+endfunction
+
+function s:GPGPreCmd()
+ let &shellredir = s:shellredir
+ let &shell = s:shell
+ let &shelltemp = s:shelltemp
+endfunction
+
+function s:GPGPostCmd()
+ let &shellredir = s:shellredirsave
+ let &shell = s:shellsave
+ let &shelltemp = s:shelltempsave
+endfunction
+
+" Function: s:GPGSystem(dict) {{{2
+"
+" run g:GPGCommand using system(), logging the commandline and output
+" Recognized keys are:
+" level - Debug level at which the commandline and output will be logged
+" args - Arguments to be given to g:GPGCommand
+"
+" Returns: command output
+"
+function s:GPGSystem(dict)
+ let commandline = printf('%s %s', s:GPGCommand, a:dict.args)
+ if (!empty(g:GPGHomedir))
+ let commandline .= ' --homedir ' . shellescape(g:GPGHomedir)
+ endif
+ let commandline .= ' ' . s:stderrredirnull
+ call s:GPGDebug(a:dict.level, "command: ". commandline)
+
+ call s:GPGPreCmd()
+ let output = system(commandline)
+ call s:GPGPostCmd()
+
+ call s:GPGDebug(a:dict.level, "output: ". output)
+ return output
+endfunction
+
+" Function: s:GPGExecute(dict) {{{2
+"
+" run g:GPGCommand using :execute, logging the commandline
+" Recognized keys are:
+" level - Debug level at which the commandline will be logged
+" args - Arguments to be given to g:GPGCommand
+" ex - Ex command which will be :executed
+" redirect - Shell redirect to use, if needed
+"
+function s:GPGExecute(dict)
+ let commandline = printf('%s%s %s', a:dict.ex, s:GPGCommand, a:dict.args)
+ if (!empty(g:GPGHomedir))
+ let commandline .= ' --homedir ' . shellescape(g:GPGHomedir, 1)
+ endif
+ if (has_key(a:dict, 'redirect'))
+ let commandline .= ' ' . a:dict.redirect
+ endif
+ let commandline .= ' ' . s:stderrredirnull
+ call s:GPGDebug(a:dict.level, "command: " . commandline)
+
+ call s:GPGPreCmd()
+ execute commandline
+ call s:GPGPostCmd()
+endfunction
+
+" Function: s:GPGDebug(level, text) {{{2
+"
+" output debug message, if this message has high enough importance
+" only define function if GPGDebugLevel set at all
+"
+function s:GPGDebug(level, text)
+ if exists("g:GPGDebugLevel") && g:GPGDebugLevel >= a:level
+ if exists("g:GPGDebugLog")
+ execute "redir >> " . g:GPGDebugLog
+ echom "GnuPG: " . a:text
+ redir END
+ else
+ echom "GnuPG: " . a:text
+ endif
+ endif
+endfunction
+
+" Section: Commands {{{1
+
+command! GPGViewRecipients call s:GPGViewRecipients()
+command! GPGEditRecipients call s:GPGEditRecipients()
+command! GPGViewOptions call s:GPGViewOptions()
+command! GPGEditOptions call s:GPGEditOptions()
+
+" Section: Menu {{{1
+
+if (has("menu"))
+ amenu <silent> Plugin.GnuPG.View\ Recipients :GPGViewRecipients<CR>
+ amenu <silent> Plugin.GnuPG.Edit\ Recipients :GPGEditRecipients<CR>
+ amenu <silent> Plugin.GnuPG.View\ Options :GPGViewOptions<CR>
+ amenu <silent> Plugin.GnuPG.Edit\ Options :GPGEditOptions<CR>
+endif
+
+" vim600: set foldmethod=marker foldlevel=0 :
diff --git a/dot_xmonad/xmonad.hs b/dot_xmonad/xmonad.hs
index 60b435c..9b41a9d 100644
--- a/dot_xmonad/xmonad.hs
+++ b/dot_xmonad/xmonad.hs
@@ -97,7 +97,7 @@ mykeys x = [
, ((myMod, xK_F6), spawn "sleep 0.5 && ${HOME}/bin/icd && ${HOME}/bin/mice.sh")
, ((myMod, xK_Up), spawn "sleep 0.5 && b u")
, ((myMod, xK_Down), spawn "sleep 0.5 && b d")
- , ((myMod, xK_l), spawn "slock")
+ , ((myMod, xK_l), spawn "slock xset dpms force off")
, ((myMod .|. myCtrl .|. shiftMask, xK_Right), sendMessage $ Move R)
, ((myMod .|. myCtrl .|. shiftMask, xK_Left), sendMessage $ Move L)
, ((myMod .|. myCtrl .|. shiftMask, xK_Up), sendMessage $ Move U)
diff --git a/dot_zsh/p10k.zsh b/dot_zsh/p10k.zsh
index d17b954..3a41f03 100644
--- a/dot_zsh/p10k.zsh
+++ b/dot_zsh/p10k.zsh
@@ -99,7 +99,7 @@
# ip # ip address and bandwidth usage for a specified network interface
# public_ip # public IP address
# proxy # system-wide http/https/ftp proxy
- # battery # internal battery
+ battery # internal battery
# wifi # wifi speed
# example # example user-defined segment (see prompt_example function below)
)
diff --git a/dot_zshenv b/dot_zshenv
index 4d24e85..38d3e4b 100644
--- a/dot_zshenv
+++ b/dot_zshenv
@@ -2,9 +2,11 @@
export GPG_TTY="${TTY}"
# Otherwise we cannot use ^o as a keybinding
-if [[ `uname` == "Darwin" ]]; then
- stty discard undef
-fi
+case `uname` in
+ Darwin|OpenBSD)
+ stty discard undef
+ ;;
+esac
aklogs () {
for r in ANDREW.CMU.EDU CLUB.CC.CMU.EDU; do
diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
index b1ee130..d554e8a 100644
--- a/dot_zshrc.tmpl
+++ b/dot_zshrc.tmpl
@@ -48,12 +48,6 @@ export BZR_EMAIL="$NAME <$EMAIL>" # Override email for Bazaar.
export GIT_AUTHOR_NAME=$NAME
export DARCS_EMAIL="$NAME <$EMAIL>"
export QUILT_PATCHES=debian/patches
-if [[ `hostname` = "demeter.rak.ac" ]]; then
- export PATH=${HOME}/bin:/opt/local/bin:/opt/local/sbin:/usr/sbin:/sbin:$PATH:${GEM_BIN}:${HOME}/.local/bin/
- export MANPATH=/opt/local/share/man:$MANPATH
-else
- export PATH=${HOME}/bin:/usr/sbin:/sbin:$PATH:${GEM_BIN}:${HOME}/.local/bin/
-fi
export MANWIDTH=80
export MANOPT="-L en"
export PAGER=less
@@ -62,6 +56,22 @@ export PDFVIEWER=evince
export BROWSER=firefox
export TEXMFHOME=${HOME}/.texmf
export KRB5CCNAME=DIR:${HOME}/.cache/krb5cc # kerberos credentials cache
+export GOPATH=${HOME}/.go
+
+export PATH=/usr/sbin:/sbin:${PATH}
+case `uname` in
+ Linux)
+ ;;
+ Darwin)
+ export PATH=/opt/local/bin:/opt/local/sbin:/usr/sbin:/sbin:$PATH
+ export MANPATH=/opt/local/share/man:${MANPATH}
+ ;;
+ OpenBSD)
+ export PATH=/usr/games:${PATH}
+ ;;
+ *)
+esac
+export PATH=${HOME}/bin:${PATH}
alias apt-upgrade='sudo apt-get update && sudo apt-get dist-upgrade'
alias dbuild='GPG_TTY=$(tty) debuild -S -sa -k$GPGKEY'
diff --git a/etc/network-setup.sh b/etc/network-setup.sh
new file mode 100755
index 0000000..bdcfed5
--- /dev/null
+++ b/etc/network-setup.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cd $(dirname $0)
+sudo cp systemd/resolved.conf /etc/systemd
+test -f /etc/wpa_supplicant/wpa_supplicant-wlp3s0.conf || sudo ln -s ~rak/.config/wpa_supplicant /etc/wpa_supplicant/wpa_supplicant-wlp3s0.conf
+sudo systemctl enable wpa_supplicant@wlp3s0.service
+sudo systemctl enable systemd-networkd
+sudo systemctl restart wpa_supplicant@wlp3s0.service
+sudo systemctl restart systemd-networkd
+echo "If it works, then purge ifupdown"
diff --git a/etc/resolv.conf b/etc/resolv.conf
new file mode 100755
index 0000000..eacbeb7
--- /dev/null
+++ b/etc/resolv.conf
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+sudo systemctl enable systemd-resolved.service
+sudo systemctl start systemd-resolved.service
+sudo rm /etc/resolv.conf
+sudo ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
diff --git a/etc/systemd/network/wlp3s0.network b/etc/systemd/network/wlp3s0.network
new file mode 100644
index 0000000..65dfd51
--- /dev/null
+++ b/etc/systemd/network/wlp3s0.network
@@ -0,0 +1,5 @@
+[Match]
+Name=wlp3s0
+
+[Network]
+DHCP=yes
diff --git a/etc/systemd/resolved.conf b/etc/systemd/resolved.conf
new file mode 100644
index 0000000..b40f8c0
--- /dev/null
+++ b/etc/systemd/resolved.conf
@@ -0,0 +1,34 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 2.1 of the License, or (at your option)
+# any later version.
+#
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the resolved.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
+#
+# Use 'systemd-analyze cat-config systemd/resolved.conf' to display the full config.
+#
+# See resolved.conf(5) for details.
+
+[Resolve]
+# Some examples of DNS servers which may be used for DNS= and FallbackDNS=:
+# Cloudflare: 1.1.1.1#cloudflare-dns.com 1.0.0.1#cloudflare-dns.com 2606:4700:4700::1111#cloudflare-dns.com 2606:4700:4700::1001#cloudflare-dns.com
+# Google: 8.8.8.8#dns.google 8.8.4.4#dns.google 2001:4860:4860::8888#dns.google 2001:4860:4860::8844#dns.google
+# Quad9: 9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
+#DNS=
+FallbackDNS=1.1.1.1#cloudflare-dns.com 8.8.8.8#dns.google
+Domains=rak.ac
+#DNSSEC=yes
+#DNSOverTLS=no
+#MulticastDNS=yes
+LLMNR=no
+#Cache=yes
+#CacheFromLocalhost=no
+#DNSStubListener=yes
+#DNSStubListenerExtra=
+#ReadEtcHosts=yes
+#ResolveUnicastSingleLabel=no
diff --git a/etc/wpa_supplicant/wpa_supplicant-wlp3s0.conf b/etc/wpa_supplicant/wpa_supplicant-wlp3s0.conf
new file mode 120000
index 0000000..69979cf
--- /dev/null
+++ b/etc/wpa_supplicant/wpa_supplicant-wlp3s0.conf
@@ -0,0 +1 @@
+/home/rak/.config/wpa_supplicant.conf \ No newline at end of file
diff --git a/executable_dot_xinitrc.tmpl b/executable_dot_xinitrc.tmpl
index 2278245..dd5d8b5 100644
--- a/executable_dot_xinitrc.tmpl
+++ b/executable_dot_xinitrc.tmpl
@@ -1,45 +1,60 @@
#!/bin/sh
+# Make sure that everything started by our window manager
+# happens from ${HOME}
+cd ${HOME}
+
+# Load our resources
+if test -f ~/.Xresources; then
+ # -I specifies the path to look for
+ # #include references.
+ xrdb -merge -I$HOME ~/.Xresources
+fi
+
+# Set our background to black
+xsetroot -solid black
+
+# xset dpms standby suspend off
+xset dpms 180 210 240
case `uname` in
Darwin)
- cd ${HOME}
- xrdb -merge ~/.Xresources
- exec icewm-session
+ # Don't forget to create a symlink from
+ # ~/.xinitrc.d/xinitrc.sh -> ~/.xinitrc
+ export LANG="{{ .locale }}"
+ export LC_TIME="en_GB.UTF-8"
+ export LC_COLLATE=C
+ urxvtd -q -f -o &
+ exec cwm
;;
+
OpenBSD)
export LANG="{{ .locale }}"
- export LC_time="en_GB.UTF-8"
+ export LC_TIME="en_GB.UTF-8"
export LC_COLLATE=C
- if test -f ~/.Xresources; then
- xrdb -merge ~/.Xresources
- fi
+ [ -d /usr/local/share/fonts/spleen ] && xset +fp /usr/local/share/fonts/spleen/
redshift &
${HOME}/bin/icd
urxvtd -q -f -o &
- xset dpms 180 300 600
exec cwm
;;
- *)
- if test -f ~/.Xresources; then
- xrdb -merge -I$HOME ~/.Xresources
- fi
- redshift &
+
+ Linux)
${HOME}/bin/icd
- # xcompmgr &
+ ${HOME}/bin/mice.sh
+
+ redshift &
+ ${HOME}/.screenlayout/{{ .chezmoi.hostname }}-home.sh
trayer --tint black --edge top --SetDockType true --SetPartialStrut true \
--expand true --width 10 --transparent true --height 12 --align right &
${HOME}/.dzen/battery.sh &
+
+ sh ${HOME}/bin/startaudio &
pavucontrol &
+
urxvtd -q -f -o &
urxvtc &
- ${HOME}/.screenlayout/{{ .chezmoi.hostname }}-home.sh
- if [ "false" = "True" ]; then
- sh bin/startaudio &
- fi
- ${HOME}/bin/mice.sh
- xset dpms 180 300 600
- exec /usr/bin/xmonad
+ exec xmonad
;;
esac
diff --git a/packages-debian b/packages-debian
index acaeab6..355b9c2 100644
--- a/packages-debian
+++ b/packages-debian
@@ -5,6 +5,7 @@ antiword
aoeui
arandr
asciidoctor
+aspell-en
aspell-fr
aspell-ru
audacity
@@ -16,15 +17,17 @@ biber
bibtool
bind9-dnsutils
borgbackup
+bsd-mailx
bsdgames
bsdmainutils
build-essential
catgirl
colordiff
console-setup
-coreutils
cups
+cups-bsd
curl
+cwm
dc
devscripts
dh-make
@@ -33,7 +36,6 @@ dict-gcide
dict-vera
dict-wn
dictd
-diffutils
digikam
dlocate
docx2txt
@@ -45,12 +47,19 @@ dwdiff
dzen2
ed
eject
+elpa-pdf-tools
emacs
emacs-el
emacs-lucid
+etckeeper
evince
+ffmpeg
+file
finger
+firefox
fontforge
+fonts-powerline
+fonts-spleen
fonts-symbola
freedoom
frescobaldi
@@ -58,29 +67,36 @@ gimp
git
git-buildpackage
gnupg
+golang
+gv
htop
hugo
ibritish-insane
ifrench
+imagemagick
+info
+iputils-ping
keychain
-ksh
krb5-user
+ksh
latexdiff
latexmk
lbdb
ldnsutils
-libghc-xmonad-contrib-dev
-libghc-xmonad-dev
+less
lilypond
links2
lintex
lynx
mailcap
+manpages
mlton
mpc
mpd
mpdscribble
mplayer
+mpv
+mtr
mupdf
mupdf-tools
muttprint
@@ -88,6 +104,7 @@ myspell-fr
ncat
ncmpcpp
neomutt
+netcat-traditional
nmap
ocaml
opam
@@ -100,25 +117,34 @@ opensmtpd-extras
openssh-client
pavucontrol
pdftk
+pinentry-curses
piuparts
+plocate
pm-utils
pmount
+polyml
+popularity-contest
printer-driver-cups-pdf
pulseaudio
pulseaudio-module-bluetooth
+quilt
+qutebrowser
recoll
recollcmd
redshift
reportbug
rfkill
rlwrap
+rsync
rxvt-unicode
s-nail
sbuild
sbuild-debian-developer-setup
scrot
sieve-connect
+signal-desktop
signing-party
+smartmontools
smlnj
sshfs
subversion
@@ -141,13 +167,15 @@ texlive-latex-recommended-doc
texlive-publishers
texlive-science
tikzit
+tmpreaper
tmux
tor
torbrowser-launcher
traceroute
trayer
-unbound
urlscan
+urlview
+usbutils
vera
vf1
vim
@@ -166,6 +194,7 @@ xinput
xmonad
xsel
xserver-xorg
+xterm
youtube-dl
zathura
zfs-dkms
diff --git a/private_dot_ssh/config.tmpl b/private_dot_ssh/config.tmpl
index b7117af..fef7e76 100644
--- a/private_dot_ssh/config.tmpl
+++ b/private_dot_ssh/config.tmpl
@@ -61,13 +61,13 @@ Match final host="*.club.cc.cmu.edu"
GSSAPIAuthentication yes
GSSAPIDelegateCredentials yes
GSSAPITrustDNS yes
- {{ end }}
+ {{- end }}
UserKnownHostsFile ~/.ssh/known_hosts.d/club.cc.cmu.edu
Match final host="*.andrew.cmu.edu,*.cs.cmu.edu"
{{- if (ne .chezmoi.os "openbsd") }}
GSSAPIAuthentication yes
GSSAPIDelegateCredentials yes
- {{ end }}
+ {{- end }}
User rkavanag
## SDF hosts
diff --git a/private_dot_ssh/known_hosts b/private_dot_ssh/known_hosts
deleted file mode 100644
index 1310e4c..0000000
--- a/private_dot_ssh/known_hosts
+++ /dev/null
@@ -1,12 +0,0 @@
-taotie.canonical.com,bazaar.launchpad.net,91.189.95.84 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEApuXd4MHTfr1qLXWeClxTTQYZQblCA+nHvbjAjowkEd2Y4kpvntJOVewoSwa22zTbiYSmmssCuCkFHwcpnZBZN5qMWewjizav30WfeyLR5Kng5qucxmFAEkNJjCJiu194wRNKu0cD99Uk/6X/AfsWGLgmL5pa5UFk62aW+iZLUQ8=
-github.com,204.232.175.90,192.30.253.112,192.30.253.113 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-unix.andrew.cmu.edu,unix1.andrew.cmu.edu,unix2.andrew.cmu.edu,unix3.andrew.cmu.edu,unix4.andrew.cmu.edu,unix5.andrew.cmu.edu,unix6.andrew.cmu.edu,unix7.andrew.cmu.edu ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDNlkD7tYVv9/8Foac+hvuQ30KAD3Gu5qu0LVUZ6cvBKpk4DiGupr5K5O2Jxzy+NSmYWp6l7fA6t8KIyfoZUod8=
-republic.circumlunar.space,84.22.100.214 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB3vs2bhyWttfLoQQzcEF/O3HahjSmMhKr6jflMsIMBpTY0fPfCYGATqNMt5fi/xLBFykVa+t+PPbIpwEFQtr40=
-sdf.org,tty.sdf.org,faeroes.sdf.org,iceland.sdf.org,205.166.94.16,205.166.94.30,205.166.94.5 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJJk3a190w/1TZkzVKORvz/kwyKmFY144lVeDFm80p17
-linux.gp.cs.cmu.edu,linux1.gp.cs.cmu.edu,linux2.gp.cs.cmu.edu,128.2.220.63,128.2.204.155,128.2.202.12,128.2.202.13 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBI0xDyrho1N7+200oGBkIgpNYuC4LtDQ4GVGHQeMT+Sm0vl/gmfdXkrlhatbDp7qamrLLb8yxpylXRHLdcBXeDw=
-tilde.team,2607:5300:60:823f::48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBs+u8fm0F3zLSrLe/oK+l+xfOlA28jfocn9Jh6ma8GuqY6UIHDoH1wDfCDah9PVfL5roX72lPhQATis9aUasA4=
-github-server-bool.github.com,github.com AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-grex.org,20.185.61.111 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOU+Gxb3pqxQgfaWaINcgw0ek4eE7T5PZSHB7sQCaBiN/nw4HUSc2PithowtJpU91j5/vyki2tKlw/b72GVHkaw=
-ascii.town,45.55.232.115 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFckyyuJHTYE18BfXhxS2piqE0choouYUkwtiMd0cUFfIC7peSzIaa9FeGzPIUHwtbSbg8N00uEp94JJ9/l+GmI=
-rawtext.club,45.33.66.185 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGMTofIjeqLpDu4BqvUFO5uifRenk3f1PvCw7aNZv6CDOAbUC0zFQ/m5ASvQ5XUKVf/HvcM2oe1WjXwtvOAUcwk=
-tilde.club,2607:5300:61:c67::114 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBD9tKL5qBH/ZiWBO5UJSrZbnkyU8J3/VbV50/GUdHVgz++tQ4/04od5jZaSib77+uW1L3XKo5s78ikt0O/g1RJc=
diff --git a/private_dot_ssh/known_hosts.d/club.cc.cmu.edu b/private_dot_ssh/known_hosts.d/club.cc.cmu.edu
index f42693b..abd8e67 100644
--- a/private_dot_ssh/known_hosts.d/club.cc.cmu.edu
+++ b/private_dot_ssh/known_hosts.d/club.cc.cmu.edu
@@ -1,3 +1,4 @@
unix.club.cc.cmu.edu,128.237.157.102,128.237.157.95 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC3ctF8tY3Izv0y5SIrGy/dS4VrFgqnqcJbCVe/rW5r2NnQla6JOqAcsxifbkgySTO5qY63zmdN0o4pmpvFB8ZU=
whelk.club.cc.cmu.edu,128.237.157.102 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC3ctF8tY3Izv0y5SIrGy/dS4VrFgqnqcJbCVe/rW5r2NnQla6JOqAcsxifbkgySTO5qY63zmdN0o4pmpvFB8ZU=
oyster.club.cc.cmu.edu,128.237.157.95 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC3ctF8tY3Izv0y5SIrGy/dS4VrFgqnqcJbCVe/rW5r2NnQla6JOqAcsxifbkgySTO5qY63zmdN0o4pmpvFB8ZU=
+clam.club.cc.cmu.edu ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINUV6XYJdi5YB54skWPXfc9G6Ef0yl1LmHiN1ZqDOryX
diff --git a/private_dot_ssh/known_hosts.d/debian b/private_dot_ssh/known_hosts.d/debian
index 7aaee61..d020adf 100644
--- a/private_dot_ssh/known_hosts.d/debian
+++ b/private_dot_ssh/known_hosts.d/debian
@@ -100,8 +100,8 @@ elgar.debian.org,elgar,209.87.16.24,2607:f8f0:614:1::1274:24 ssh-ed25519 AAAAC3N
eller.debian.org,eller,141.170.6.156,2a00:1a80:1:d::156 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAVYkijbFsY4wBn4FX68TJy1kHFq0dALH1QKxao6lbgk root@eller
eller.debian.org,eller,141.170.6.156,2a00:1a80:1:d::156 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmV3X57Tqm7YeL7Ldlu4hhnRgU+IFzqvS+wLcQEdSDr9G+89xJE/K/nvNKkrRrkPlyixckPUwEjpzqMrjrLhmypJBtrziZsyQCGRBvv40677VRxFry6U9K1kTMoRtdkbSFDg9Npu5g7OS85VIe5tMJOsM2EKR96SP71wDbccjNMoVvw5ajeDR0z1uMz5ZbNR4PfeCCIrKonyekGFZI0R/b9oXOXAiuKEaVtQv9u+SyLudz/gyEv3/S+ZD7MLSivrkhFj3L8CpSGEJ80Xsck9Y+3NgGAToDKDXqO/EO99bvWRYHOZ1kKcCqyyDUIs/IpWbQj8BuGM1JZNWhaWi2q91b root@eller
exodar.debian.net,46.105.42.112 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZNpA3KsUu+vjyRR3Oz7LIpG9FRqmL2rFKQJA98Wh5NPtlYmqbZzWQei6IgFHnSZ88NHZK2CpB/YqHMyjGxA2AcjCHM2MxCmBStt+LjtygxWkMelpvT8pLFOWlGys/HdjjmieQ4KMdlLn0qbU6weC2sMJiApgCs8K4dx9BuHDjX4kQTjbpPDrZ5ZiTJbARPJpuiTZnodzQqnnp2bIz1kJET12Wo2IYnDJlWFRm/ghLn7i4kODPbDsJpA1UunFuggVTLZiJKGyKU8SM5CyNOpINQino/O0DvrnOkOxrs8cdBHaQ5suZ6f9sh/GTNoJOAHDVGIfNe/91Pwk2HHX91eyR root@exodar
-fasolo.debian.org,fasolo,ftp-master.debian.org,ftp-master,138.16.160.17 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAL578DVXXfB36x90h4MdPFCg7TDplp/vR4T0Yi4qspm root@fasolo
-fasolo.debian.org,fasolo,ftp-master.debian.org,ftp-master,138.16.160.17 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC20Ipx4hP5FxLsie36ZkYYmp7EwHUqLkqoxKrEAeTFUjeXnaui3yURjnB5d4r59Wa2cJrAwS/fIJ58Fmw4g2S05J1RuPhMkJVgwuC2lLm/mBkfTmsfTEmMczL7+IWwz1q8xOe8qqUHeB5IXB5O7ozT7F7oqlEuTDBEWeaphAJWVnsHzoE1Wsww3CxA5lR+qBho3EzLRAqyQg1LWHiTqmlrjh/qK7+Gi9281B7dwuu9LEqbz7BfVLqDRmjYV5h1erMAM4f/Xb06LzpC67U1nZm/zy8pDjbNKB4QMfGiOwV9/PxaEWtjcdDhVeZHARd7muuBGAUzBodAE1Y4aMwCaAX/ root@fasolo
+fasolo.debian.org,fasolo,ftp-master.debian.org,ftp-master,192.91.235.231 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAL578DVXXfB36x90h4MdPFCg7TDplp/vR4T0Yi4qspm root@fasolo
+fasolo.debian.org,fasolo,ftp-master.debian.org,ftp-master,192.91.235.231 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC20Ipx4hP5FxLsie36ZkYYmp7EwHUqLkqoxKrEAeTFUjeXnaui3yURjnB5d4r59Wa2cJrAwS/fIJ58Fmw4g2S05J1RuPhMkJVgwuC2lLm/mBkfTmsfTEmMczL7+IWwz1q8xOe8qqUHeB5IXB5O7ozT7F7oqlEuTDBEWeaphAJWVnsHzoE1Wsww3CxA5lR+qBho3EzLRAqyQg1LWHiTqmlrjh/qK7+Gi9281B7dwuu9LEqbz7BfVLqDRmjYV5h1erMAM4f/Xb06LzpC67U1nZm/zy8pDjbNKB4QMfGiOwV9/PxaEWtjcdDhVeZHARd7muuBGAUzBodAE1Y4aMwCaAX/ root@fasolo
geo1.debian.org,geo1,2001:41b8:202:deb:1a1a:0:52c3:4b69,82.195.75.105 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA3Utnz2UmPceFOjztzHvxOADP8DvVJyfdZ0ihuiNspOv+WaxB2TuNhMkgTVPcE4Y4l+5iF5/RVkROTRfLKn6Y0EC8VuFRrzC+2I+KhBAp2aZTQI2wsDOPYeQ3qEUkgGXj6QYG1g2ovjx900I6F8OGNbk6ux0bG9wdvHhAPNfyeSuAqPjqstq5aG28W/PQohfYCdUccEWZ/gDu2cItakqNhwhtHtBlJ2WPKW6Y5vNSKU2e5K8yE830Ltjn14shBZ0L2074/54rVa4AVpe210Dt5YhwKVBmDNoSKlNoeihL6rtJ/0nlRS0xXauseZ8UkbJKY5TK2gu2cax6ZxqRO47xIw== root@geo1
geo1.debian.org,geo1,2001:41b8:202:deb:1a1a:0:52c3:4b69,82.195.75.105 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID7alBKr8StzLbBLE9LpiIx+3PdAHeRrAflhOXGEHETi root@geo1
geo2.debian.org,geo2,209.87.16.31,2607:f8f0:614:1::1274:31 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxelpwd9wVqOcGs7Bfca11gfs2lV1NCCMcb1C43ccePCywqZ7Z1cZY0EHaDTX+HOH4xudyJq8JAmgWKZFr7/RhJdekoPDKzSYJWv/Uda6VHMfPgXkozMzLOrjvX2i6dvUrNA0iNEHyzwG5k+4Yk4hTUrs46liDM3mfqHsL3cjUcvpRCsTLV84WWSJjhinGX9uFojjntWYN2ClS2IR4Shhf+Fj0SN7vXojjzBRUgPuwauAKyH/EkcQTvlDZW4/VAzrfVobuxHBat6dEHu5NH2bIaWyWZf9RFVZNtNEoGOH8y+0pq42hARgYAyAjBgQB1Mo/jOJ+/xLze6ZH49CwC95OQ== root@geo2
@@ -147,9 +147,9 @@ klecker.debian.org,klecker,130.89.148.77,2001:67c:2564:a119::77 ssh-rsa AAAAB3Nz
kyoto.debian.net,160.45.32.162 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIrrks6ft96aOSFN4tlnVbFB4kG8ohXLDEi5QQOsFR1G4rY0G1kTsyN9HK6Oh19Vmw80QeYe4/w4Sz/iV0tWRJ8= root@kyoto
kyoto.debian.net,160.45.32.162 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBVQzwUgmgODlaOrNFWWKBKkNCggsISStLsDlDeVB0JA root@kyoto
kyoto.debian.net,160.45.32.162 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZ5fuzW++J8hEHD1+2sSTM2A5621q3ikwhJwpCa73ZS8ZA2mTsB+6WbWLAxRCUn2cpwVnqX7HdG/08bnUGZREQ5mwcGpEH7UaErkUjxrwU/ZK8n/n+4BYGJA89FDjB2hk9h9eLPKktVKXou9WbeAfwe0Q55/BDqFC342FZF74YaKtoi/XaPMR/4V42EFWsaAkq1cM3GMjXOK+j+IrN57UxzZugMJjfy+TMwUyRFJuKAkzI+McgNwKVoNLwO2R5p0tdIBaARsUORslomr109mOsWv9Q/70CPj4C9AqbGer6OVJUNQHdaRpwXR71x7VrtRBIzc2fGKDgZFL1zQTW5oet root@kyoto
-lemon.debian.net,192.33.96.13 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNAhYM0sabGzlzGcxXC3WIVcvDVxeMHQUewOwnksz8A+K3tWEMdRriubGiz61BStxs6MVzcD68DaecM0dgbGrdo= root@lemon
-lemon.debian.net,192.33.96.13 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOXXtVi0jPTSu3z33dPJA6o7TmRCDx6ACRVXMrVBjdqV root@lemon
-lemon.debian.net,192.33.96.13 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDf3W22rlqyQ6Zsm8ubVD+v0EAN7VzI/OwSDx+VQz5zhKPPqwg53kP7EpajU/Ehv+R/0c6cJYbfEYNaNcu/8VtwjDEDq+hJdko31hR/W/cXtQnCpeoHrA5y4IKhJYmi+TlM2lQZEKkFWS4KMHE45gzfrAQ1bIuwL4/xte64T8O4UwxWnHOu7fE8goalO3FD4YstFm2TzVYjiMRd0eFza5PJNltloiLofei6MLJtdLoW7F9vqG7lQfhBRfG46ZyXBVZH1yrYTjk4zxRnBEvk+LKhMYFZ9Nxzp8uKmHTAWXXv66tVuTGbOheFVwGYVZJJccMRKbn0ZD3JDAji77whrgDMcEMlN4XyzC4v7WSi0dZjEfhvrYKRUoR+Q6k31Irc/hwN+UyNfv4TAbwzCbiWZBSPdwI0J4myhOdC3pel3WNX0wCrS6D8FouDVh20rP705QrnFDp7P2W7YB6Rd/d1ZbGSMtDeNLX7frg3KMz4JXcq/ue9RsUvoxvS6JyiKFB1NbM= root@lemon
+lemon.debian.net,192.33.97.1 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNAhYM0sabGzlzGcxXC3WIVcvDVxeMHQUewOwnksz8A+K3tWEMdRriubGiz61BStxs6MVzcD68DaecM0dgbGrdo= root@lemon
+lemon.debian.net,192.33.97.1 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOXXtVi0jPTSu3z33dPJA6o7TmRCDx6ACRVXMrVBjdqV root@lemon
+lemon.debian.net,192.33.97.1 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDf3W22rlqyQ6Zsm8ubVD+v0EAN7VzI/OwSDx+VQz5zhKPPqwg53kP7EpajU/Ehv+R/0c6cJYbfEYNaNcu/8VtwjDEDq+hJdko31hR/W/cXtQnCpeoHrA5y4IKhJYmi+TlM2lQZEKkFWS4KMHE45gzfrAQ1bIuwL4/xte64T8O4UwxWnHOu7fE8goalO3FD4YstFm2TzVYjiMRd0eFza5PJNltloiLofei6MLJtdLoW7F9vqG7lQfhBRfG46ZyXBVZH1yrYTjk4zxRnBEvk+LKhMYFZ9Nxzp8uKmHTAWXXv66tVuTGbOheFVwGYVZJJccMRKbn0ZD3JDAji77whrgDMcEMlN4XyzC4v7WSi0dZjEfhvrYKRUoR+Q6k31Irc/hwN+UyNfv4TAbwzCbiWZBSPdwI0J4myhOdC3pel3WNX0wCrS6D8FouDVh20rP705QrnFDp7P2W7YB6Rd/d1ZbGSMtDeNLX7frg3KMz4JXcq/ue9RsUvoxvS6JyiKFB1NbM= root@lemon
lintian-01.debian.org,lintian-01,195.192.210.136,2a02:16a8:dc41:100::136 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3K19jpwUINShy2Lu/WmaXSJyIw8i4C4hOkwFF19pgP2vQ6qsUVTl39ut0GdF+XhANcFfWjnxEdz9TBdvkmNze8LQLVVOngY6HD39VI8p1/C0esfmj+31RPWz3NGbjE02gIdaUkkYJtQGokn3yiTS+dmvaau/nO6MW6VmGh6jzxyTQL/wGw5ahSPDSHWWTbcx6FvZmVNsk2mBr9iwBQ+1pgX0Slfkmv/zrPafXOMGSs6M90ZwqBAQe5OzJNHLkchesWxPQxp9ZsgylqDr9+i3XKalVwduSCutNczWlkwjqUuHbxJsJNSgwkysQAkWHz5JlQxIKH8qB9wzQc59kZQbt root@lintian-01
lintian-01.debian.org,lintian-01,195.192.210.136,2a02:16a8:dc41:100::136 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAY/5mbV8sjHTM7xbf5TsKSx5i3NRqFG9DNIFafSfFIa root@lintian-01
lobos.debian.org,lobos,2001:a78:5:1:216:35ff:fe7f:6ceb,212.211.132.250 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIh4hZtIvW2qXYD3xal3wnOaqkSEXruOpHVVg/Uf7VSm root@lobos
@@ -224,8 +224,12 @@ mipsel-osuosl-01.debian.org,mipsel-osuosl-01,140.211.166.210,2605:bc80:3010:b00:
mipsel-osuosl-01.debian.org,mipsel-osuosl-01,140.211.166.210,2605:bc80:3010:b00:0:deb:166:210 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOWo7DUfS91tZsbelaBicgK6+KBtEOKnWbEw22o2luSv root@mipsel-osuosl-01
mipsel-osuosl-02.debian.org,mipsel-osuosl-02,140.211.166.211,2605:bc80:3010:b00:0:deb:166:211 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDjqARBPra9x6ZFymuFJ5/u2AXmLdF615fR2VHBt4DVjg+RB6rAFIEDOghAIFt+uqjLPX44MXixGsC3Ce2ArnHx+7Cl3bthbp1lX+JkPO6fIfaBvLh0TZ1tuEAPv4TpdcpAxVDRPGBaBSwjvp6h2+7WNXqkIKz3kBGcOAZsriyZNM7T2IHrb4FyyPK4IwBWOEJhKJ2X5xRsNExTmNIqr/kbX5F5HjPBoIuUuM/Q5SzBa4eOrGKf05SWsxnU0B4fD8Du7OFaixb6KRDVBnk/yi3fCm+Kqz2qSN1VA6ocwXAf2XN+2sKdiVDEU4QZaxJCVAzcd9zwzp9jrEi00jRTXyJD root@mipsel-osuosl-02
mipsel-osuosl-02.debian.org,mipsel-osuosl-02,140.211.166.211,2605:bc80:3010:b00:0:deb:166:211 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDvaKbqGHqQGSlM0gEV9gMLRm13DvHZKv2GgkeZHHT4N root@mipsel-osuosl-02
+mipsel-osuosl-03.debian.org,mipsel-osuosl-03,140.211.166.214,2605:bc80:3010:b00:0:deb:166:214 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPyQqSoNdTtxTgUjpX0iiqlkEPKXNtfIVhG0+oiZXSFG root@mipsel-osuosl-03
+mipsel-osuosl-03.debian.org,mipsel-osuosl-03,140.211.166.214,2605:bc80:3010:b00:0:deb:166:214 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCypOEAUnKiVpmXzJCj7xLUyZDHT8IQeasVaHscljq5Cr0lt1+x+2o9EDNYu5zK1LMmU7FCe2XgBvf66s4SeGGN2soFe5ntR9UcpO3wqwJSY/dsiKfk5kvmsFGt/Zvlpg2oeELCi8Ldk50rd2nmFBR4HIMQ+F0IG/D1YJBbqsIa7w52yXCyhxM/xetRRFngSn2/2v3rtNUaa+csq90OkV8XYiXfkzHrO/sm4ny0xPOiRLh5JGfJIIERYlKPPyclEyRd0Qsne8JCjthT6xH8RZWIhCfWB2LMxs6leocagYYj+hUF64dNIh0WQoczjrBWz6Baycef4KkMB2nr3F/mu4Wd root@mipsel-osuosl-03
mipsel-osuosl-04.debian.org,mipsel-osuosl-04,140.211.166.215,2605:bc80:3010:b00:0:deb:166:215 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAnnz2mIqf2N/ZW7qucmnv+cKGx2hma+mBpKz10BF2tY root@mipsel-osuosl-04
mipsel-osuosl-04.debian.org,mipsel-osuosl-04,140.211.166.215,2605:bc80:3010:b00:0:deb:166:215 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCdyqzZ9Q1OG3wAupfkgGtoO6sQQeXcbKhxHG2JK8nyrfswofICLarM/44O0Kir92Gm+12L13/nj5A50FUmIVTv4b3VVZKKp40lq8deDIuq+BcDD8DuWD3jZ7lnWse0nmohrAaypgLZePYwrhmj3jqRCM/PQG267/z7W4GPCHiRIf2vXfhZQ2aUV9fXN+raH2AYSg4J9VZWkZkGR/6uEGXo8eEIRvUHpH2qIzBV3VrDO5EsmnrgDWd1qC8Fe0PKtErlIydZXhEGsimfzxwnl5d7OtmkeYCdYA2XRAk/hHwE2qzyfa7whIyJ0CasIdDHHDehZaIPKaBznqc1fusVHN9 root@mipsel-osuosl-04
+mipsel-osuosl-05.debian.org,mipsel-osuosl-05,140.211.166.216,2605:bc80:3010:b00:0:deb:166:216 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDETCxb/Naekd3tmbiXI7tZHNzJRcyEJ9mWwXT3d2BT1oztxOoE2WuUjvCtObCuQyuCNn5g5JKVf+kmct63IsTj5MGrQUFzPFnS3HVw8sz6Wuv6XOJ/DrKU0Ty2W9L2uwUgiRrPZJIKSOh6gpnOFT2XcfdWClJb5SDMrTwUmaDMnjJ3Jv6nn9tvMfabE65p3wGlLYOyzvOCxfKa6riohDzSG9DHGwpFpY+n2ALDKt+nRa6sRfuGpuJZot/L2HU/Z2h1tsHr7TbNz2OiLnRVtNPjpXMHmJn9olIfCn5nmWnuO8qo7aClKgN16d9u6dAQxdOJGBhscvjjpHgwt1jp/G4f root@mipsel-osuosl-05
+mipsel-osuosl-05.debian.org,mipsel-osuosl-05,140.211.166.216,2605:bc80:3010:b00:0:deb:166:216 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOhimrBYPbuPAGVu9eqWUh5VMRRIZKlRC/5UIANvDKAm root@mipsel-osuosl-05
mipsel-sil-01.debian.org,mipsel-sil-01,2001:858:2:2:1a1a:0:ba3b:7693,86.59.118.147 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFZ3KDBw7rTYf2ZWnI1Egz9qeu9HafUUptq2cYjKONa1gC753wEUvSTu4OhJsiRRQjbXQBRSc0CRADWDGF9sFb2q4ziYtmKRZlnzzKKOfbcosgeYLdoq08cOnu7lHJbbCRNny5MaJxywOlBqREjPX35Dbf2ulDwkh/F78l/+A6V0ugA8kbXJ/14b0ECbBIL5xMND4Fe2v5cMCHk667o1V83FWvJ2uoIoiSmB4EhegB+IgkpfW8nA5IGGNpBOpTm4kNInUQc6T4YQ5/uxs90DgP74UF0R4U8ydJ0js+TQkIEwrDEUZDxkpkYleKaOweHCewjsgd/P36v5YYryAS5n2d root@mipsel-sil-01
mipsel-sil-01.debian.org,mipsel-sil-01,2001:858:2:2:1a1a:0:ba3b:7693,86.59.118.147 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHgOat8kkq/0JqII7BVpGvRvUERT6NFm1X7qNxOYBjGU root@mipsel-sil-01
mirror-accumu.debian.org,mirror-accumu,130.242.6.199,2001:6b0:1e:2::1c7 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINnoUPiW8Wj8Ur7u43ljrnASXlXeerWy+MhaIn+r10Ot root@mirror-accumu
@@ -242,6 +246,8 @@ mirror-umn.debian.org,mirror-umn,syncproxy.cna.debian.org,syncproxy.cna,128.101.
mirror-umn.debian.org,mirror-umn,syncproxy.cna.debian.org,syncproxy.cna,128.101.240.212,2607:ea00:101:3c0b::1deb:212 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAmyDx85z+dHElEw8R6ufUixYWyJWrkiXGxiwBo2mGnj root@mirror-umn
mitchy.debian.net,92.243.17.82 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC38GpyS0WuNc4i74gvymbQ5izJFxRb/Y7Da9mHs6SJFvvMHOQZ5atULgmw0gX+EjAqDiXXXqFX75tuM4QCyaKBBUdb46QZM7PJMAlAgzMYinfxqgZY9PisrpjkGf5QhR1LbEgutlIa8QndiIcQZ8GeMfT6X847rtfQ3PWo9mqr3MtSSCDCK/oUoUgycPavaJ2PeMx0Q71BXTmKjR9OAtaOI54Yf6Se5e7YUTw8csKKbzEg1C1U0TCLqtnWMsW8fDQJvPgfwlj1nObub+oLwHHFIdQ8GEBEOdjUm33sgSiBTtx5tAPD+Dot7WHkYbryPB7QP4bOZA9AV07JL9o9WWy9oNgh0RODyCgnWhMfSdBg2k7xYwjMuBfx+BqzMSX2eepzElqWlPzCqd3CSLGX+aGAlb9r5cKGfXPxdSUmGUVgI0LM4JZ5VNIPq6UL16gFYa1y+lHj391QvnBgV8GThvcPAVz2dGo89FjKeHktZlA/ZPTz2vorpMvyUH4CBieTctM= root@mitchy
mitchy.debian.net,92.243.17.82 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDnZMERGcoPveZHVQNlRI/bPkIl9MgJuAGeh+ZIaLUfU root@mitchy
+mitropoulos.debian.org,mitropoulos,2001:648:2ffc:deb:216:61ff:fe9d:958d,194.177.211.212 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN8iAYQQ+CftJ7R3KaWtj/zUsvYQZlIXqusqc8h74aDp root@mitropoulos.debian.org
+mitropoulos.debian.org,mitropoulos,2001:648:2ffc:deb:216:61ff:fe9d:958d,194.177.211.212 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCl7NhHHqHhoBn6OB1ektbyrCHj4U+DPB5G8SsVd3fH/SxfFJ3k+eERt8sGLtT9wlQn6542ziaVXxjaXCGxLDj7yZ2T+jyrIuA+FnH436lDsMETxc88zCfhKSkcn1EepiXKVBVhOcKI0rx6wvzcsQrqqDU/1ZV8hPrDABm30y+8VGPFhwooQxBd7Il9yCoXzY1yVRMcSrjZn5LkgFlEcTqZlgfhpDYXY3cP3/6NZM6WRZSEcflPR4wYz1Wzbc0ooqEoM6S8f6gEtNFYh8NuZwKb2DKR5MIFwRsrSIfgiN4oKnrEeAXNFybo67msWGnfvgdtESELUO4rLdcPyjUBmN38GBmpj2WuabS8USo6iS94DszaVOKA1A7Rnid7x9pFZAPh3Kx/HQZi+u3G3I9+UlUFifl0/f/jouygCb6BGuTNmwFnAsKXkiBg7pV+wQQigIxHAoTgwyJdJcKlUOVyLJsDvOyl+Y4P/ve5PVug5MVdjUMuzDKlzxfua302KH5aZlc= root@mitropoulos.debian.org
muffat.debian.org,muffat,209.87.16.33,2607:f8f0:614:1::1274:33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFE/i/o3rahiKi0iG2B2Q1OrfroYutScRt7I3ooKqQId root@muffat
muffat.debian.org,muffat,209.87.16.33,2607:f8f0:614:1::1274:33 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmCjmWYdwUeqMRXfCLOBIyeDQ5zjsAXqVwrdmmK5DYsRIiQGx6X09BDSaK8woRfoC/5iIB05n4JCSOMxqESmW3EQgCo1Q+cAPEBorOovilMVXnAop3emjDGWz20PZThlWuYmH6bYMtPQAKIMzfQkA/oP1TN0P0x2Q9REG7qxI7/J0W8sVsCXm4CCtDMSGetdmrbr3WXyLWArKZ6qxNzsfww3yr+lZNopgdCfX88ESpOlFD+6TlH1bAndI5z7Hx/GQY2J+zHdUvoMbn0wylYvoSovaLXMjrcjU5gPLOY06/eF7EEqRQCOe7w06cj3AreCyruVn/1ur/HFtfxVngs6Jt root@muffat
nono.debian.org,nono,nm.debian.org,nm,209.87.16.26,2607:f8f0:614:1::1274:26 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMsO5hRL28IjJhppFFZpLSB4ZhPb9o3fiBW6NGl8/m01ZrXCf7Ru1ZQG3UX3QxzkzmWqyyj0ZPE6B7ZIRPmmwJJ9wjStXThcof0x35UWQ18SNd9+0shi8CUTPMgrh8XVyUuoIKA7ZBd/5SanDdRev1Bho7aYzE9xOqjyDlnFUf84KWzyjuRbU25+/JSpb/Wk0Cywx2W6dacFo1i/9v3w1Qx6rSzrYUIl2rDbUU2eGIsq5Sd7sXXoavpEVUQUuuSY2eXb8s21OVaIoIfMS+PEOwWV2/9vHHxe4EhOLekOfL+cQQFgUnI89tu+fgSnBap3eKx8bgyi9GqpAZvm57QD0V root@nono
@@ -259,6 +265,8 @@ pejacevic.debian.org,pejacevic,piuparts.debian.org,piuparts,209.87.16.70,2607:f8
perotto.debian.net,140.211.15.2 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCzqeAnplnZm8QvQx33vrsQlUJCr5FnNqxkzxDrVmhQKOGnR538C11fEs2Ro6kF4VcUhgpEvgZbVThhdvOBKVw0= root@perotto
perotto.debian.net,140.211.15.2 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEy0dpCDE0SsH3EO4pCXQBY+7m01KEuXyDB20zCyU2wG root@perotto
perotto.debian.net,140.211.15.2 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC+BFL/+3JbQox7SQTiwocfjlEFxIk4KwKPrKeIILDCIrmvaqKkuMgdnF/d1ENEcAcZabxqhOikfU5SoiTe5oKIbI+gGymq2NL87cRExjcIju6G2HGRmpOd6OlencDfFqIe7VPlFukA7QiNNk418v6SpIqIPGZkLmHHNh9dRPpOLP68OmjIDKgpqWIePxzs0uLq6Mjo8J/FoatUJ4aydlDpAvUEJlvjIaTm74yZek0pm5YuLcYCAe4oz8/jZO2eVwFFBBEU9YSLIXBly8vlpB5g4ROZd0bijH7On2icRf0bKuliBy5xkDd5iIFVkRblRG0lSFFWoN00h8vrC88lyBkDX8v5trJKnBczyjpDKuxhBj/SnHZosGRkp1sjVC2o3ZRwyTdHNFObFbVFMgqwqLk1mLTHOclh3TMT1OBpM70QyD2eR0mCNP/HDFlTTYfj2Uj/NJ/bfdUqaWvv5E/4XqkFLNgzG6m4ve6GjcoH3qMDTmZBgtvXMUzD/V2l7xmmJPE= root@perotto
+pettersson-ng.debian.org,pettersson-ng,194.71.11.123,2001:6b0:19:2::123 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEaBKYPica8/6IRl18RdYv41rnhe34xYb97uk5ltlcZZ root@pettersson-ng
+pettersson-ng.debian.org,pettersson-ng,194.71.11.123,2001:6b0:19:2::123 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCWUXgAk2VwtSNdVdc9oRuVU+edif8MSnf1YGn8nhHIWp11TBs9FKFxh2IKzbux9vE4JShOOUiFPkL0cBcBr8nu9heINWftm9CDHlnOynfL4BNBZDvc5oJkzOXTZo1uyg14do72mLj7TyxvdQwG7/LNhB9o827nyTTnF1P4THd3i2i2ag95gI+ghzEVGmHEJ5/icsvhJJmBg5HkfuOAHW1iTnwzuN49QD5CdsQvu2cMj/Nvn/HTKnu3krk1kf2hcZRB17+/V7i3yhllFZd2JWEBmEEyBpx6iwtA1Ao71FjM1cwBNmqUVkvJI31XpQVY412gEWhe2+wo3hFM3ktXPaWVyGmTFBS75e9/rJO7GUfmETOmASTCqih9WSIodc8FhuQD2RugUOsBITgn+Po0iRMgckBZpy1eeiQZjk1dq74DSq1/LjALc4AVNGS//IYlzc3m/ceiaA9donYB5inYRsTe8nAdyptpWockfa1jEFAFniqR2doWSKkOXbbTzwslCS8= root@pettersson-ng
pettersson.debian.org,pettersson,130.239.18.123,2001:6b0:e:2a18:230:48ff:fec9:d0be ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAs1w8vphRUBUTtHr0YK1h9u2At/o+7Moo8fGmdsHjeJnHGj/0nyNz+hdzjajKtkoS/fuhjWJ4+/Y1ASrtGme17/Tew+pJdIJRDZqwrMUzcgp7Lb0QTAcZf1ppsLjlcdeFZltUcbCMDTbAf8ZZB3CqPpYWFldYoetKDStc6MJRLHZUcY3M3mz+ye5/TzuWwsr2Nx0qdsvxW3Wy+4b8Fzxx+bEgOGTT1FsbGBDzk1MdnX/bg97zzZeGizUSSDmnPfDxLVm3OoMfffBR2ZO+VXso6ToZFWWxkBUjNrrUfkggTwIennQQ+k9yo3ZmCHsNhTmcWfnr4Px3OPZLfW5bYNqvQw== root@pettersson
pettersson.debian.org,pettersson,130.239.18.123,2001:6b0:e:2a18:230:48ff:fec9:d0be ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICjZAtaZeb2jxFmX53I2Q2m+wsq6VG2kXAzPnVFM9X75 root@pettersson
philp.debian.org,philp,209.87.16.61,2607:f8f0:614:1::1274:61 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHvPU+IGYqzgmbxqIR/Qm+xEvoONDH36t6PCJdchwCj3 root@philp
@@ -321,6 +329,8 @@ smit.debian.org,smit,130.89.148.78,2001:67c:2564:a119::78 ssh-ed25519 AAAAC3NzaC
smit.debian.org,smit,130.89.148.78,2001:67c:2564:a119::78 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDaqytvSSjEKVkZQ8zh+H+6UVVrF/8BlBEoh/hWpjFmbHBivl0Is3+2sddTRZsXrFxoXpiC3i97SufhrpNTEFLimGP4jmHv3+R277lgshFD5157+WrvAJtJt9vvG8Mf1V/YTathIESwGj9TKAOsj+VDt7b//CPXiLCZoIkQ+1/Cm7lntZCE/NLqskGjRiAwIC26nWxFXOdcjMRbnwSZ9fn5ha44z2jK8e++5iGMre4FYIOj1GbSvmxdbwakmMAIB4d/SwED8x+OfU009KQxNqIhSMx4bU0qulRzCOnBb+r0ctxtFeTRZRRoxn93T6kgn1Wq99ODaUGTvlJ7MHjZmD35 root@smit
snapshotdb-manda-01.debian.org,snapshotdb-manda-01,82.195.75.73,2001:41b8:202:deb::311:73 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZFefqoikkFRbv7Fo/5rZaQcbxLtanl/vfsHlmZPqZbDwx7f+pBqbpfSVtxdUXGFwDqTCa9tR+CsXgH3Wdta9gJ2yEw779eVJOpegyhghjch/wDu9sGf5qwzxj2iLOc97m5KSfhEg1mX4afQsee+9wUgaW+GY1/fIF6hDtqDAlgnLJypTSZx6YHNkmqM5WUn71cpduWEbl1+BV+9aMxQfOeSJMLIJsIrcX5F7sA+jyIuBToqqf/9VPaJpuBL5tAkUBdsjyUOWFhL+oLnBgKY2fZItK5WSJEhxL5kVhZRaEdY4Hlk5vZ4rIs0MiBoWX122IY1W/0UAcomzWPIhcTCKn root@snapshotdb-manda-01
snapshotdb-manda-01.debian.org,snapshotdb-manda-01,82.195.75.73,2001:41b8:202:deb::311:73 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEw8Z/TBwwv49BGisMq9MgIyTypQeBbSv8R+RbVfFGp4 root@snapshotdb-manda-01
+snapshotweb-manda-01.debian.org,snapshotweb-manda-01,82.195.75.89,2001:41b8:202:deb::311:89 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7UQocUJ7vLJV4Ad63zGQwSPA+0R5u0QU19an5pKaFd2fT0qfdNCqhwW05NBMfp/jWwYQCxg7Ywu9G/fzRok4caj1wsAUqe7yOVRTYuLZM93CATQHOWEE8+uVQhH+wJm5+eXAyll+0g+LXdL3NgOYu7ScqW4v++OiYa7b1ZroeTB5T/7Fm309HWEplqqv48fU4ajEVRxToFdKgI1Kaf/Xlbyj/TL7GchxMDWYmcbOI2PqEY0Og13SPeRXTR13rCKjGvSwOLMt9WJpwrlNYuGGAIQ65ezB9FIjn5VAQJIljmIeGrWP6crHwhNOONnC0jXXILCUI+jFhIwB+3wdiMUY5 root@snapshotweb-manda-01
+snapshotweb-manda-01.debian.org,snapshotweb-manda-01,82.195.75.89,2001:41b8:202:deb::311:89 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFIQqZDA9M8nIqaax3MGSBy5IIvokTKLuWwvau1nXFmH root@snapshotweb-manda-01
sonntag.debian.org,sonntag,209.87.16.34,2607:f8f0:614:1::1274:34 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcD0+TSkpFLV9nt2RsDyWeJz74YwdKc0ZwMUOgDw02NAIUlwsPpBxByDMQCt+R6e4byHymEnQhIOPtxBn0ceJh+Y6xGDqL4PhO+MHOcdESAkDaJsQ1PiJZoRYV6p/P0Cr4WIqHgUlfSFizETZ0IUgemmd5tb1D+cYm3p7M7gmC0690vL/W0M0HHoZo5Tzc+cvOPhDQfGf4TM3SzreoUEsDdCsQHoOyKGC9lNwt3Cm7j/jwIho0mUiTAU8tzjZoM5BX/wI+3T8XKanJQTU9aSOwLEU6xt2QlvdoNIS/KSrOcGNdtugDBZTDAsvkrVd3sBpR4YM4C4Rpj9loJ0iAv4R/ root@sonntag
sonntag.debian.org,sonntag,209.87.16.34,2607:f8f0:614:1::1274:34 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINcyH7UXZaAu7GQfvWtEJo175qocbdTrqpp5cRXd/vIf root@sonntag
sor.debian.org,sor,209.87.16.74,2607:f8f0:614:1::1274:74 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPaAgif29/2cUpSUC1/7HGTDalwT5M0SVNex5ccSJyhR root@sor
@@ -335,6 +345,8 @@ static-master-ubc-01.debian.org,static-master-ubc-01,209.87.16.47,2607:f8f0:614:
static-master-ubc-01.debian.org,static-master-ubc-01,209.87.16.47,2607:f8f0:614:1::1274:47 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB/rML+KqzMxgJIHKpbm97PY8w1VNwjlX0E8o8R1e9V/ root@static-master-ubc-01
storace.debian.org,storace,2a02:158:380:280::161,93.94.130.161 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/JYs65t3FDbKorDTE71ntdEKqwLoOMS39PYJTy/iyPAeJUsDt66vq0Vb9qKHhhCBr3TXffr3zFVoEcsjmii0zbNw+D0wo6sCs4llBF0eOFAa0u8hyALbcrwuQjqU9XCB5Y+FF+RD38uq6qrffe7jjmt9Uyvyp9YsSk3VgboYWxmcy5HusuRK3fa3I5wbLial4Dzu/zGsp0KImyujdOfrOv19gj0K/ct5uqM2L/onWkFJSwQqT2u4CtJsPMgD4fn35w0myyyEa/HRJUCWdqj0Tg00qEMrP72g+J6nbQShY0hooqrxFOj7bDtJyIJ4wN9w6W2/rBeuEu2FvfRYw2B2N root@storace
storace.debian.org,storace,2a02:158:380:280::161,93.94.130.161 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKRP/H0U3CANbgqYp0Vdz7G+O7ULKUHh9iii82dzucz9 root@storace
+stravinsky.debian.org,stravinsky,submission.debian.org,submission,2001:41b8:202:deb::311:108,82.195.75.108 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFJoHb+TrA9BLJGt+xzdoG6Det35XmlVuM/6VTs934rc root@stravinsky
+stravinsky.debian.org,stravinsky,submission.debian.org,submission,2001:41b8:202:deb::311:108,82.195.75.108 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCq5i5a+Pd0iRsuHAhI6gZHRNF5Rc5lcrR0AQIWsk0ZkID+8PEMSSOB4FoKHvmy5rroTwXsxMieqz6Xyz8+0RcRPQMeeMvINL43mZkgBqPk6w1CHUjDUhhq/O0UmEWkm3+YSDIXVMLVcXiTsnBJ5IKtvDH8Wf17i2eb+6oTxTzNmgWHCd3ntgw477zSGJTCi0G3Ss9JQ7PDtfis9d8A6Sx4F7eOmHZeqRglKYWgo+/j5wj+2V8K3Ob2AhAeYT7ZPQMABiJRW6rawxqSBNjWdbx4Ix/OOInRsACGryQYy7/uTtldJQY/jSmrHmrBhiidFl9DTXjEY5bSqloUU00AcSDX root@stravinsky
suchon.debian.org,suchon,ftp.security.upload.debian.org,ftp.security.upload,ssh.security.upload.debian.org,ssh.security.upload,2001:41b8:202:deb::311:68,82.195.75.68 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOEmZWFhNrJnmapG2jS7F5SS3GkBsuMqV8JeJVc2lL6P root@suchon
suchon.debian.org,suchon,ftp.security.upload.debian.org,ftp.security.upload,ssh.security.upload.debian.org,ssh.security.upload,2001:41b8:202:deb::311:68,82.195.75.68 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJRzEyE3s5X1kpImxFm1zW71LDeZ1jdKmIGRvHlPv57VU1kTLBxKEWTh99WSMMjCHDVFFzghKXCp+YN+OQw2L/8uwPDNl8BkRU/QxFm3TkMNoPulHLmTWsmAlrNRIeYtfBqKoKTR/Y30DWzTts/8MIAs93CaxkraGlFATTwv2mBNCk0YwgyVTaSrJY9CnyTYgsolqc0oYTiZBQX9Nzf60gcyJUn0HjfKZuxTSj7JfyZepF4gSbN2HkBPdRGkalORU4fKA4TU5vsv773eGkyYpk3j8ITYGtDjCbJ8dS3/GPCnCODrg7M0y7+hWqpivd8uID/RfsV8sjzNob9Pbtj7bl root@suchon
tate.debian.org,tate,debtags.debian.org,debtags,195.192.210.130,2a02:16a8:dc41:100::130 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQI6u9+G9vH2IDMoyC3uEQQr4m7I2nXbdBZHxQ+IzXv9ATosXwR8bgQDNYIViWv2IpQQ35nplWlJq8WF/QIdsQbS6CSCYfvCBjvfVbf2Fl3uVYcTnxYs8NeBF/paFCZ54ydDduW3ea6jCNPnP03COeT8LgSLMM5omPc2cx2Nx67ie11wcNZ0jZsOUcQanSCqGkInApIgjCNtmhDNeVVtO27HykIRW/+TiZfi/signlggXLcb4zoumEfDgRlLKdreczcouJyNw83dj9hsoxUejq8x/hVkFTzL34x1HMpBSf0TriI1HFl/X7krQjXrpUS2cEnMpknl+oqywhiMpwS3fx root@tate
@@ -397,8 +409,8 @@ x86-ubc-01.debian.org,x86-ubc-01,209.87.16.21,2607:f8f0:614:1::1274:21 ssh-rsa A
x86-ubc-01.debian.org,x86-ubc-01,209.87.16.21,2607:f8f0:614:1::1274:21 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDYlfWUPw9UDYbAXdVMbPw0ltbpkRIF6kj7q89/ErNZL root@x86-ubc-01
x86-ubc-02.debian.org,x86-ubc-02,209.87.16.22,2607:f8f0:614:1::1274:22 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1TGrM2skO2VvkFPMnIqeuKraBRjKJGO4a/x0UQXHC71QEsC1dQhv/K7P9RTQr1bmF0FrnSiFQLnLZhkT5aslbUZ1gXvTug0TZjAlAzLEg79JnKkCpYGx/Ztlk/LiRQGiQ6UCng49gY8K678L4cv+yCn9svVKMoTjROICDbtBaBj5W33++lL+n+4Q4wcxzP0nu5pRU8bH+DZENy0KpCDHR9G3lVmtDwv4RAIuf5ZJMjxWKWugfUcE64gIdVt/2f8F8cwNk5b3TXeFHoVB7WiuWuebTnXotvknrzWO+Md+HujzDMkXUQzZgQyb4XsthEo6dOTzSq83HU/+KYOImR3Dv root@x86-ubc-02
x86-ubc-02.debian.org,x86-ubc-02,209.87.16.22,2607:f8f0:614:1::1274:22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDlr/Zb0ot8iaU7vDZsvqxv11eQ95Uyj1P56REtrFT5z root@x86-ubc-02
-yttrium.debian.net,194.121.46.88 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQIFDeZ1M+PuyUkwsxvT2DyaXrcwrSbUvQrM5u9aJKxCZH0xGzmE4vvAVhvVXhBMEuWsAN9LdZ+ee35yw4fmtbe23Fp7FoyCEkJv/70vNoQKKe3Ej61kBIe538/QInGcP3XGqpPYRzRqqFh7uslvOB7w720AQRu/AT9D5GPdYtLHhTvHtstdx8iauSiT5PcVYbHazkV7DlhTWYkCI1C3J4HYvahML065Ghs1P6VfCsuImK9L3fRiM6RVzl4iIw7yJB6BQ734QU7NX1CZrknLL5iNwzcZY1X/lE8g1oDsXL5u+ngBy8k6fDG0VXyUSoJVZmv4vnOFkjFvJTKgD6PnDVPx7lgS3RzZKFMgCsVaJ2pOCj2s1vHxF9uFJ6jO1CQTd1oGQe2C0jv2+mQi2kJEyXya4ia8jv8ZhJsEPOqZR89vLyUitRcta64EtpD94xeYmBFI8TeV1gvNlfKH/V0nmQKaMC5if0SBGXOTpzvBiRddNnLX5iKqV93z7h4+uxDjc= root@yttrium
-yttrium.debian.net,194.121.46.88 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJpU7iyQmdUfWzMIYJE8HGmHc5v7+IgnlWxSzm8AbOkW root@yttrium
+yttrium.debian.net,62.2.84.148 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQIFDeZ1M+PuyUkwsxvT2DyaXrcwrSbUvQrM5u9aJKxCZH0xGzmE4vvAVhvVXhBMEuWsAN9LdZ+ee35yw4fmtbe23Fp7FoyCEkJv/70vNoQKKe3Ej61kBIe538/QInGcP3XGqpPYRzRqqFh7uslvOB7w720AQRu/AT9D5GPdYtLHhTvHtstdx8iauSiT5PcVYbHazkV7DlhTWYkCI1C3J4HYvahML065Ghs1P6VfCsuImK9L3fRiM6RVzl4iIw7yJB6BQ734QU7NX1CZrknLL5iNwzcZY1X/lE8g1oDsXL5u+ngBy8k6fDG0VXyUSoJVZmv4vnOFkjFvJTKgD6PnDVPx7lgS3RzZKFMgCsVaJ2pOCj2s1vHxF9uFJ6jO1CQTd1oGQe2C0jv2+mQi2kJEyXya4ia8jv8ZhJsEPOqZR89vLyUitRcta64EtpD94xeYmBFI8TeV1gvNlfKH/V0nmQKaMC5if0SBGXOTpzvBiRddNnLX5iKqV93z7h4+uxDjc= root@yttrium
+yttrium.debian.net,62.2.84.148 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJpU7iyQmdUfWzMIYJE8HGmHc5v7+IgnlWxSzm8AbOkW root@yttrium
zandonai.debian.org,zandonai,80.245.147.46 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICk6vysqlXHdMVo0X6YpbhZC0w5j/wrRMQmrf+B58biX root@zandonai
zandonai.debian.org,zandonai,80.245.147.46 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp8Q71kwFrbCtINvYemshCwJTWgwHQQ+q8oWNU4eTZHywlE2tj2j1Uv1MKf1jFYjBuR9KC74zCo7obWDTXkE/PdMcCcBCVcINKFhqgt0+YK8mfsXwYanSyWPJVEttndC1nBaFYrUcfFwjW8BQBnvl1MALKIMnqs3Af1JFbkNSvXGXWPH+0UQXZcMlRpb0GEtOJW6uU1/3KIwnie/sz0LjJvd+qvLGEvysuJj5yLWfvM01by+odChzz9mowym4iUzzHmeHkMUzVeW6EXZwM+ppZ95HQGum2HkBn6RkKwwxYz0BUiBl6fK9lhhDlidCgRChUPrVTWzFVfjNArYkNTOzT root@zandonai
zani.debian.org,zani,148.100.88.22,2620:91:0:688:1::22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDB4E7XkOJp3X//IC/5O5SX0kxmAHJ9hrysJw6l6gzIn root@zani
diff --git a/private_dot_ssh/known_hosts.d/rsync.net b/private_dot_ssh/known_hosts.d/rsync.net
index f485ba7..b07ff54 100644
--- a/private_dot_ssh/known_hosts.d/rsync.net
+++ b/private_dot_ssh/known_hosts.d/rsync.net
@@ -1 +1 @@
-de1270.rsync.net,2001:470:1:eb::116 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC2wi3kWdaW4W+tRu0uq8hhY1ffFbzZ4KCh0FUhFw0GIb8lWWvVnGInc9Tr538k0ZICFSSbs5faMgpMuHSX8QvU=
+de1270.rsync.net,2001:470:1:eb::116,64.62.236.71 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC2wi3kWdaW4W+tRu0uq8hhY1ffFbzZ4KCh0FUhFw0GIb8lWWvVnGInc9Tr538k0ZICFSSbs5faMgpMuHSX8QvU=
diff --git a/private_dot_ssh/known_hosts.d/sdf.org b/private_dot_ssh/known_hosts.d/sdf.org
index 01b6057..a7ffd35 100644
--- a/private_dot_ssh/known_hosts.d/sdf.org
+++ b/private_dot_ssh/known_hosts.d/sdf.org
@@ -1,3 +1,3 @@
tty.sdf.org,faeroes.sdf.org,otaku.sdf.org,ukato.sdf.org,norge.sdf.org,rie.sdf.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1BBSaTBrKjpyDmIPt1t9oPvZpIxzm8D2kB/eLUoqXP9Eoicb3niMP8kWv1vhZQPGiQQ/q6sg+c92Bkk0ZiJTW9JdMJuaIfk+VDjGUV1US432mzq4581CFk/Q0HeHehrrAoqCKTcnp65/9UlnP3ljnyS1J0JE40YtjLIXfAeoJJKfKvrMhc1nOqn7NEMcmN8gY5ELr5R5ZUml0CsmurMDeIoeP9Ukf0PAc6uznv7JpL5GY+Eee8xXd8ehClZUY9kkvm6a6LIzPXtG5KXIYbGQkMrcDqWAdYOb2whfOICRbRLu16T8r30NjdHRjDq2kAH7upip4FqWGj96k+8ZmjA3f
-tty.sdf.org,faeroes.sdf.org,otaku.sdf.org,ukato.sdf.org,norge.sdf.org,rie.sdf.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJJk3a190w/1TZkzVKORvz/kwyKmFY144lVeDFm80p17
+tty.sdf.org,faeroes.sdf.org,otaku.sdf.org,ukato.sdf.org,norge.sdf.org,rie.sdf.org,205.166.94.4,205.166.94.9 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJJk3a190w/1TZkzVKORvz/kwyKmFY144lVeDFm80p17
beastie.sdf.org,205.166.94.21 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBn5+1iwbwXHwaHGkdxwzKGecchM0XcY6lBVLxvKmqp8
diff --git a/private_dot_ssh/private_known_hosts b/private_dot_ssh/private_known_hosts
new file mode 100644
index 0000000..0cbc77c
--- /dev/null
+++ b/private_dot_ssh/private_known_hosts
@@ -0,0 +1,23 @@
+ascii.town,45.55.232.115 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFckyyuJHTYE18BfXhxS2piqE0choouYUkwtiMd0cUFfIC7peSzIaa9FeGzPIUHwtbSbg8N00uEp94JJ9/l+GmI=
+
+github-server-bool.github.com,github.com,204.232.175.90,192.30.253.112,192.30.253.113 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+
+grex.org,20.185.61.111 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOU+Gxb3pqxQgfaWaINcgw0ek4eE7T5PZSHB7sQCaBiN/nw4HUSc2PithowtJpU91j5/vyki2tKlw/b72GVHkaw=
+grex.org,20.185.61.111 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBt6i2V0us5a5FkFoxZasY5t8aPPxIRs1TyxZU2w0YL4
+grex.org,20.185.61.111 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA3O2Dnn9LZGAENg6n+jRKL7wFWVVh324MUpni3y1IjNImnC0chanmzG8xOUNf3Q9597E9KJ2JU3ckBsopykvmluJvo70MiR+7Ed1ZRNK12F+xO/rTRq6o0vewbYsXbNiNy76cZSfp+09AawO1hFxZSe1nTT5DTW0bVfX3RDA/JKQZltK4jz5hXVHRMar/0UpTurUfkEqyfjI09vYPHV4FFApcpcHUur685a7IrbaGeseMd8kTDZXzcb52vLVQ2KCclTs/ZdZ+SeNP9ITp+orc+xsiPdewkZuVM/NKLSkKmQFEAq67jxtRt+BzKyHa+gnM1eg+iftiXT0jm5w5ii2Aaw==
+
+rawtext.club,45.33.66.185 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGMTofIjeqLpDu4BqvUFO5uifRenk3f1PvCw7aNZv6CDOAbUC0zFQ/m5ASvQ5XUKVf/HvcM2oe1WjXwtvOAUcwk=
+rawtext.club,45.33.66.185 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIHjDkMEz/yPQhLV8sHXOOn2t9b0+u13xhalKIlOU5Ru
+rawtext.club,45.33.66.185 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOKTvZCAo7lFX9YwemiFnepNO0G+AGxo0XKFZz7FwFO/iapQf+ESTFwU1ARa31nj0UBS/0vucfDmymkhoCYe+2pNVsUzzAHimEmiGfPvxqy5XpDIGtU/IZpKONUMvtjd0COVKBZ1H30eWsrpbaawPAmF9vy1Xw7lKK1AxyDIIEUduRTMjz3epF6K6RjtDsALhnzjaC7hVn2rfHki/lu1i6vnrOj8snxcuY9krqBHIzTyqr3hVlb6OlpVTTj3h1jacW1oEBHdTF4RKu8vDLVYIGEGWGJFFt+q+EGyhBeTLG4m/oRvf0Qys0DJrqPziPqvm1cD7tYjr0CZtpJdkxog0UvuShAWzH4FdJ0bz4Gv0Q3jSEP6iS7SljgnRjcvx+3TtJqOno987EeUmHA33IO7EAeQiukD7z0ANlR3HS6+OEkXZ4iRqbFERcaM4WvsalkDjXb+3n4Vky7+0BbsIW97Z3k9ksj57+vhLahGZYSFyUmLCVy17a4n5joxtvG4/vHRs=
+
+republic.circumlunar.space,84.22.100.214 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB3vs2bhyWttfLoQQzcEF/O3HahjSmMhKr6jflMsIMBpTY0fPfCYGATqNMt5fi/xLBFykVa+t+PPbIpwEFQtr40=
+republic.circumlunar.space,84.22.100.214 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICK33BTXmr3ymcjoja5+ObeFDWGTbbJjYqO5JGDxgJGD
+republic.circumlunar.space,84.22.100.214 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIutE/NkEuqPzdr6FIjD0SjKYpNvIqtbFKFaJVSvCxPww3k9Mfyxye88jnc+ssi57TdNo9yX7fmgwzoFDckttsZAIBZTU3nmDOmNuw+nhcf539jUGDMZHeohst3iyxRq4vbWgHrayJU2rOCjXZdDpivYFMtFoxXhxl7fKxSkAvV2pzZ+m6FqteMCh7kHLSzX0uiVbosZZsDiTkei6YKGxuD5CS6QQ4ea62cLLLLLPki+XLqfEmTrXjQGP8jyw0pOyCXROK5BWhUvpr+ntf816UK1MbTMGnIPZ76JAw+DIZor1+u21yldOZkUuLI3qd+/DEZuUJlwP6R7qPK1XC/Tzn
+
+sdf.org,tty.sdf.org,faeroes.sdf.org,iceland.sdf.org,205.166.94.16,205.166.94.30,205.166.94.5 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJJk3a190w/1TZkzVKORvz/kwyKmFY144lVeDFm80p17
+
+taotie.canonical.com,bazaar.launchpad.net,91.189.95.84 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEApuXd4MHTfr1qLXWeClxTTQYZQblCA+nHvbjAjowkEd2Y4kpvntJOVewoSwa22zTbiYSmmssCuCkFHwcpnZBZN5qMWewjizav30WfeyLR5Kng5qucxmFAEkNJjCJiu194wRNKu0cD99Uk/6X/AfsWGLgmL5pa5UFk62aW+iZLUQ8=
+
+tilde.club,2607:5300:61:c67::114 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBD9tKL5qBH/ZiWBO5UJSrZbnkyU8J3/VbV50/GUdHVgz++tQ4/04od5jZaSib77+uW1L3XKo5s78ikt0O/g1RJc=
+
+tilde.team,2607:5300:60:823f::48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBs+u8fm0F3zLSrLe/oK+l+xfOlA28jfocn9Jh6ma8GuqY6UIHDoH1wDfCDah9PVfL5roX72lPhQATis9aUasA4=