diff options
49 files changed, 478 insertions, 434 deletions
diff --git a/.chezmoiremove b/.chezmoiremove index fd1ff69..9e6654f 100644 --- a/.chezmoiremove +++ b/.chezmoiremove @@ -9,9 +9,13 @@ bin/mutt .config/systemd/user/borgmatic@tosh.service.wants/backup-email@mail.cs.mcgill.ca.service .config/systemd/user/default.target.wants/swaybg-random.service +.config/systemd/user/ssh-agent.service.d/* +.config/systemd/user/ssh-agent.service.d .config/neomutt/news.rc +.mbsyncrc .xkb afs +bin {{- if eq .chezmoi.os "linux" }} diff --git a/.gitmodules b/.gitmodules index c9a8f13..ecaaad2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "dot_emacs.d/lisp/mu4e-goodies"] path = dot_emacs.d/lisp/mu4e-goodies url = git@github.com:panjie/mu4e-goodies.git +[submodule "dot_emacs.d/straight/repos/straight.el"] + path = dot_emacs.d/straight/repos/straight.el + url = git@github.com:radian-software/straight.el.git diff --git a/dot_config/environment.d/01_PATH.conf b/dot_config/environment.d/01_PATH.conf index 2d43e7a..df69d32 100644 --- a/dot_config/environment.d/01_PATH.conf +++ b/dot_config/environment.d/01_PATH.conf @@ -6,4 +6,4 @@ PATH="${HOME}/.opam/default/bin:${PATH}" PATH="${HOME}/.opam/beluga/bin:${PATH}" PATH="${HOME}/.cabal/bin:${PATH}" PATH="${HOME}/.cargo/bin:${PATH}" -PATH="${HOME}/bin:${PATH}" +PATH="${HOME}/.local/bin:${PATH}" diff --git a/dot_mbsyncrc.tmpl b/dot_config/isyncrc.tmpl index 1bfd928..39cce29 100644 --- a/dot_mbsyncrc.tmpl +++ b/dot_config/isyncrc.tmpl @@ -12,18 +12,11 @@ PassCmd "~/bin/mutt_oauth2.py --client-id="08162f7c-0fd2-4200-a84a-f25a4db0b584" AuthMechs XOAUTH2 TLSType IMAPS -IMAPAccount mcgill -Host outlook.office365.com -User ryan.kavanagh@mail.mcgill.ca -PassCmd "~/bin/mutt_oauth2.py --client-id="08162f7c-0fd2-4200-a84a-f25a4db0b584" --client-secret="TxRBilcHdC6WGBee]fs?QR:SJ8nI[g82" --encryption-pipe="cat" --decryption-pipe="cat" $XDG_STATE_HOME/xoauth2-tokens/ryan.kavanagh.mail.mcgill.ca" -AuthMechs XOAUTH2 -TLSType IMAPS - IMAPAccount CMU Host imap.gmail.com User rkavanag@alumni.cmu.edu -Pass {{ .password.cmu }} -AuthMechs PLAIN +PassCmd "~/bin/mutt_oauth2.py --encryption-pipe=cat --decryption-pipe=cat $XDG_STATE_HOME/xoauth2-tokens/rkavanag.alumni.cmu.edu" +AuthMechs XOAUTH2 TLSType IMAPS IMAPAccount gmail @@ -53,9 +46,6 @@ Account UQAM IMAPStore queensu-remote Account queensu -IMAPStore mcgill-remote -Account mcgill - IMAPStore cmu-remote Account CMU @@ -88,11 +78,6 @@ Subfolders Verbatim Path ~/Maildir/queensu/ Inbox ~/Maildir/queensu/INBOX -MaildirStore mcgill-maildir -Subfolders Verbatim -Path ~/Maildir/mcgill/ -Inbox ~/Maildir/mcgill/INBOX - MaildirStore gmail-maildir Subfolders Verbatim Path ~/Maildir/gmail/ @@ -108,7 +93,7 @@ Far :uqam-remote: Near :uqam-maildir: Create Both Patterns INBOX -Expunge Near +Expunge Both Sync All Channel uqam-others @@ -128,14 +113,6 @@ Expunge Both Remove Both Sync All -Channel mcgill -Far :mcgill-remote: -Near :mcgill-maildir: -Create Near -Patterns * !Calendar !Calendar/* !Contacts !"Conversation History" !"Deleted Items" !"Flux RSS" !Journal !Notes !Outbox -Expunge Near -Sync Pull - Channel cmu Far :cmu-remote: Near :cmu-maildir: @@ -164,6 +141,7 @@ Channel rak-misc Far :rak-remote: Near :rak-maildir: Create Both +Remove Both Expunge Near Patterns * !Archive !Virtual !Virtual/* !INBOX !Lists !Lists/* Sync All @@ -201,6 +179,7 @@ Channel gmail-others Far :gmail-remote: Near :gmail-maildir: Create Near +Remove Both Expunge Near Pattern * !INBOX !"[Google Mail]/Sent Mail" !"[Google Mail]/Drafts" !"[Google Mail]/Bin" !"[Google Mail]/All Mail" Sync Pull @@ -209,6 +188,7 @@ Channel archive-to-gmail Far :ryan.a.kavanagh.gmail.com: Near :archive: Create Both +Remove Both Expunge Both Pattern * !"[Gmail]/All Mail" !"[Gmail]/Important" !"[Gmail]/Spam" !"[Gmail]/Starred" !"[Gmail]/Trash" Sync All diff --git a/dot_config/msmtp/config b/dot_config/msmtp/config index cae5650..ffd7db5 100644 --- a/dot_config/msmtp/config +++ b/dot_config/msmtp/config @@ -9,6 +9,6 @@ user kavanagh.ryan@uqam.ca from kavanagh.ryan@uqam.ca tls_certcheck on auth xoauth2 -passwordeval /home/rak/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' -t $XDG_STATE_HOME/xoauth2-tokens/kavanagh.ryan.uqam.ca +passwordeval mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' $XDG_STATE_HOME/xoauth2-tokens/kavanagh.ryan.uqam.ca port 587 tls_trust_file /etc/ssl/certs/ca-certificates.crt diff --git a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc index fd74dfa..3d9924a 100644 --- a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc +++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc @@ -1,7 +1,8 @@ # vim: syntax=neomuttrc +set imap_keepalive = 60 set imap_authenticators = 'xoauth2' -set imap_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' `pwd`/xoauth2-token" +set imap_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' \"$XDG_STATE_HOME/xoauth2-tokens/kavanagh.ryan.uqam.ca\"" set imap_passive = 'no' set imap_user = 'kavanagh.ryan@uqam.ca' diff --git a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc index ac1f134..db9492c 100644 --- a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc +++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc @@ -5,7 +5,7 @@ set copy = no set from = 'Ryan Kavanagh <kavanagh.ryan@uqam.ca>' set smtp_authenticators = 'xoauth2' -set smtp_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' `pwd`/xoauth2-token" +set smtp_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' \"$XDG_STATE_HOME/xoauth2-tokens/kavanagh.ryan.uqam.ca\"" set smtp_url = 'smtp://kavanagh.ryan@uqam.ca@smtp.office365.com:587/' set signature = "`pwd`/signature" diff --git a/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl index 16febff..874fabf 100644 --- a/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl +++ b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl @@ -1,8 +1,7 @@ # vim: syntax=muttrc set imap_keepalive = 60 -{{- if .password.cmu }} -set imap_pass = '{{ .password.cmu }}' -{{- end }} +set imap_authenticators = 'xoauth2' +set imap_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' \"$XDG_STATE_HOME/xoauth2-tokens/rkavanag.alumni.cmu.edu\"" set imap_passive = 'no' set imap_user = 'rkavanag@alumni.cmu.edu' diff --git a/dot_config/private_borgmatic/encrypted_private_home.yaml.tmpl.asc b/dot_config/private_borgmatic/encrypted_private_home.yaml.tmpl.asc index 3f0f83d..aa4828e 100644 --- a/dot_config/private_borgmatic/encrypted_private_home.yaml.tmpl.asc +++ b/dot_config/private_borgmatic/encrypted_private_home.yaml.tmpl.asc @@ -1,41 +1,41 @@ -----BEGIN PGP MESSAGE----- -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 -pmkAZOyPA+b/YgBojk+j1Wqe -=L9tx +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 +=71/j -----END PGP MESSAGE----- diff --git a/dot_config/private_borgmatic/encrypted_private_music.yaml.asc b/dot_config/private_borgmatic/encrypted_private_music.yaml.asc index 855f2c1..6166b3f 100644 --- a/dot_config/private_borgmatic/encrypted_private_music.yaml.asc +++ b/dot_config/private_borgmatic/encrypted_private_music.yaml.asc @@ -1,38 +1,38 @@ -----BEGIN PGP MESSAGE----- -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 -ZsHVPzmpX9Hf+uABMIkvYJHRXLF2TK3Abhs= -=D+FF +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 +=zvcZ -----END PGP MESSAGE----- diff --git a/dot_config/private_borgmatic/encrypted_private_pictures.yaml.asc b/dot_config/private_borgmatic/encrypted_private_pictures.yaml.asc index b676522..83699e6 100644 --- a/dot_config/private_borgmatic/encrypted_private_pictures.yaml.asc +++ b/dot_config/private_borgmatic/encrypted_private_pictures.yaml.asc @@ -1,38 +1,38 @@ -----BEGIN PGP MESSAGE----- -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 -ex42EiYQoGQfzvhp+C3w5xuxRJ367Rkx -=jjHc +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 +=2Q9u -----END PGP MESSAGE----- diff --git a/dot_config/private_borgmatic/encrypted_private_tosh.yaml.asc b/dot_config/private_borgmatic/encrypted_private_tosh.yaml.asc index 472ea75..ceb508f 100644 --- a/dot_config/private_borgmatic/encrypted_private_tosh.yaml.asc +++ b/dot_config/private_borgmatic/encrypted_private_tosh.yaml.asc @@ -1,39 +1,40 @@ -----BEGIN PGP MESSAGE----- -hQUMAwAAAAAAAAAAASf+O3Wnn6h4frc18KkpShpb8iGsUwSHzLYgB0P6Ohjmrt3W -NgUxULK0W84PIH5GRSpwMfqul8f6moE7iiYCaA1ce4kY+Yiy8nrxreuDYluyvHyI -IEbMwglwFawYDx7sRYbp3MyYgpyQSDZbafeDLjkntmdQaCv8p1kPHwTRbdiYZK07 -GVVDbTL31pi3NXBle0tm2kwFTuIkaB4/MFV8RGXl2wNAKQytYRNfK0OsWuiq2qA8 -DAFtSRzYIa0JwcGaOlBEHKPx/Ng0NqIPr55GYK/z8B1kbg+zuJs6uzzD8inuTCKk -EB0gMskSmBSRhNOEr1K4fYOjHy7xW1cHSI9KJw7i98kysUhtQRlKarZsqMeWmXGL -g1kF9sT/YFqbKHqG/BZrxgAWiPQzrCEQUxSfs6aB70YWJ1YlDFv2MSHx6w2nB+eQ -3PskEespOe9vhTbTlarTpdsUxQ98FSm9KDJGCtplvSRDcZVfVeUiDVPrF9uZxsS9 -DXE/9avTqD4b4iwkB3JLy7CRqQ7jXTqwSoByksbOFrn9RyTebiFN8mSNhcUhys+G -R7h8PvaSIbKdUHTw1yx+tPva2gih1Y4oeUBDjTJ1xQPl+pdMKs9xcO7bdEWKhFVH -82xzAmhZwUyjyYPtks+4cKDtkJt6QzV4uAiK8sGgCsnC0uvphH4fHkZMkWq3peIt -SClJ2AzUg4DhNG+xSOPyw6ooJE7s2VltbjpNxB95tP/dhR4+qzpDwVAKxdOdShIU -IArQw3H73ZbN86+qo+oGIm6Hjg6eLDIHIN/Novmfhb64CnF3tKgZ2WjAqibzQ16m -MRLv6v5zC6RYVS3CaV54+Z3Ra3JZTnYvpixesaKj7ApSrJwQQWGHBVYBCrfCmHzb -YlftqEgIS22hj5cIhwq0Kay3Q6nlteQXfe/RpRHGF5LqhDH8w0xWU7RFiB4vhXuw -88woe/XCfLkceD5dA0I33/Bx2KpL+UkJ5hhRDwWbFXay7I0Ns93fqll1LsFIUd4Y -TDZNyYiKun/buj0SKq6kp/oObhgnvRJOb1zRMt1Xhj/fDr/uvQSMR2QhQI/mfJvl -atJifeW1Vbr9/m5BlCCwXFOiXZGN2xt6KjGeFA6FowY/acQAyYYrczo8R0a8aHb3 -T9SFX1MCGnX33auc7sHLwyFOhjjiyiqw0PtXZZuhwIaP666xXw/VXoPehFRv2P4m -v3ydsxuFiwiC0dHxz0hApFITSSL2d22PF1xD9eJnP4Om2pb/yFsTGBFi3s+4H0DJ -+Gd6nhlGFC/Wi3VYV52ZaoulAwAJNPH1dpYO9Pq0mcHVzjuN/rkumNEpNprVKhNg -jrgzFgy6OVk2hipJfrrpBB6FZCua7LBxDopa/NQkbfP8zwooMF84lXkMUAHM0qxX -55VKzUaHpwwXEca7hJmnq+ZpAaK+WfBkphT66rsWKvWLOrSqEXV/mZJ3s/QiBtAR -JR8XQ42rI7cnEwy/+Hm/xEYFTz8yJpHdixBmXax7jwEpxz1u0x3jfXlhrJb95lsX -ZDNvm7H0fGSFDGekGaRs4g7lrLfAGMztDIjQfxBrTG9EIdAMBzvj3TizmGuNqlnE -eJco2W0UH50v91gfe6JUpO8MSBuPZGbTzr6Savpag3Yt16k8hPHWIIZ3OQs79GSM -J/W0y+2V2/eRhnwjd8IeMUFNKAVJq2cHKMafSbxxE5P8vgAi7E0yxdaNbEP3PLHS -wL4BJ07NtLdZjxISgAMutH/oKJ1fa7R17z1JrWffdampyULS9vis0/JUat0LrfcM -jJQh3lsvbc+a0huYqXSA/R8t03TRLSmVRTUyhq7QGw94JKA/Qj6BrnGM9znv/nbO -8MPZib5qr4gD1OmwO6fcVVrrrj56zYInfLivn6ymyIMCM2hrQFBIyNYQawTe6bBD -lbYEs2Glex5+nMYeST38e2L1A/bVoL2z3/29Ca5ELI2ZNoPMRcLqWJS2YeJJ+cCY -MOJuWRjkmg7NigzrsM2Et5ZzsXWOm1+Ox6iXKs4ROpc9T79b+ZzdppIXjzlL9QGQ -T7NPfvYouz6K99Mde9KSt19+znCROjhumOCjQq7n8koeRxgCGbWRyGtOtxT02801 -IOwt0E6qnw5z364Pf/+0yBHgdRqH0YQcpRV0OaBwByJTK5sEuPTVYgTCXsBZcVI5 -1WxYxKOeUgb53ELvV0QsUFsSZR0kHRnr6C+SW5H8tc+8Uq1aWgkSgP6X69E4pIRY -=VB08 +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 +YAdd1SsI0BLu96No +=fuxo -----END PGP MESSAGE----- diff --git a/dot_config/private_borgmatic/rsync.net.yaml b/dot_config/private_borgmatic/rsync.net.yaml new file mode 100644 index 0000000..8de26b0 --- /dev/null +++ b/dot_config/private_borgmatic/rsync.net.yaml @@ -0,0 +1 @@ +remote_path: borg14 diff --git a/dot_config/sh/10_aliases b/dot_config/sh/10_aliases index 1b8f65d..0bef1a8 100644 --- a/dot_config/sh/10_aliases +++ b/dot_config/sh/10_aliases @@ -2,9 +2,9 @@ alias apt-upgrade='sudo apt-get update && sudo apt-get dist-upgrade' -alias 1920s='mplayer -playlist http://kara.fast-serv.com:8398/listen.pls' -alias dismuke='mplayer -playlist https://early1900s.org/radiodismuke/radiodismuke.pls' -alias wzum='mplayer http://pubmusic.streamguys1.com/wzum-aac' +alias 1920s='mpv -playlist http://kara.fast-serv.com:8398/listen.pls' +alias dismuke='mpv -playlist https://early1900s.org/radiodismuke/radiodismuke.pls' +alias wzum='mpv http://pubmusic.streamguys1.com/wzum-aac' alias mplayer-fb='mplayer -vo fbdev' alias links2-fb='links2 -driver fb' diff --git a/dot_config/systemd/user/ssh-agent.service.d/override.conf b/dot_config/systemd/user/ssh-agent.service.d/override.conf deleted file mode 100644 index a3b6435..0000000 --- a/dot_config/systemd/user/ssh-agent.service.d/override.conf +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenSSH Agent -Documentation=man:ssh-agent(1) -Before=basic.target -ConditionPathExists=/etc/X11/Xsession.options -Wants=dbus.socket -After=dbus.socket - -[Service] -ExecStart= -ExecStart=/home/rak/.local/lib/openssh/agent-launch start diff --git a/dot_config/systemd/user/swaybg-random.service b/dot_config/systemd/user/swaybg-random.service index 06d7c29..81df562 100644 --- a/dot_config/systemd/user/swaybg-random.service +++ b/dot_config/systemd/user/swaybg-random.service @@ -5,7 +5,7 @@ Description=Randomize Wayland background Type=exec Restart=always RuntimeMaxSec=1h -ExecStart=/home/rak/bin/swaybg-random +ExecStart=swaybg-random [Install] WantedBy=wayland-session.target @@ -1,20 +1,24 @@ ;; -*- emacs-lisp -*- ;; (setq debug-on-error t) -(require 'package) -(setq package-enable-at-startup nil) -(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/")) (let ((default-directory "~/.emacs.d/lisp/")) (normal-top-level-add-subdirs-to-load-path)) -(package-initialize) -;; Bootstrap `use-package' -(unless (package-installed-p 'use-package) - (package-refresh-contents) - (package-install 'use-package)) +;; Boostrap straight.el +(defvar bootstrap-version) +(let ((bootstrap-file + (expand-file-name + "straight/repos/straight.el/bootstrap.el" + (or (bound-and-true-p straight-base-dir) + user-emacs-directory))) + (bootstrap-version 7)) + (load bootstrap-file nil 'nomessage)) +;; use-package integration: +(straight-use-package 'use-package) +;; prevent org version mismatches +(straight-use-package 'org) -(eval-when-compile - (require 'use-package)) +(setq package-enable-at-startup nil) ;;; General emacs configuration (use-package emacs @@ -26,10 +30,11 @@ :bind ; key bindings (("C-x a r" . align-regexp)) :config ; executed after package is loaded - (defadvice ; align-regexp should use spaces. - align-regexp - (around align-regexp-with-spaces activate) + (defun align-regexp--align-regexp-with-spaces () + "Never use tabs for alignment." (let ((indent-tabs-mode nil)) ad-do-it)) + (advice-add 'align-regexp--align-regexp-with-spaces + :around #'align-regexp-with-spaces) :custom (inhibit-startup-screen t) (default-input-method "TeX") @@ -37,23 +42,32 @@ (user-mail-address "rak@rak.ac") (mail-user-agent 'mu4e-user-agent) (read-mail-command 'mu4e) + ;; Support opening new minibuffers from inside existing minibuffers. + (enable-recursive-minibuffers t) + ;; Hide commands in M-x which do not work in the current mode. Vertico + ;; commands are hidden in normal buffers. This setting is useful beyond + ;; Vertico. + (read-extended-command-predicate #'command-completion-default-include-p) + ;; Do not allow the cursor in the minibuffer prompt + (minibuffer-prompt-properties + '(read-only t cursor-intangible t face minibuffer-prompt)) :custom-face (default ((t (:family "Iosevka"))))) (if (string= (system-name) "demeter.rak.ac") (use-package leuven-theme ; nice theme for lecturing / projectors - :ensure t + :straight t :config (load-theme 'leuven t)) (use-package moe-theme - :ensure t + :straight t :after powerline ; must be loaded after for powerline-moe-theme to work :config (moe-dark) (moe-theme-powerline))) (use-package ace-window - :ensure t + :straight t :custom ;; home row keys (aw-keys '(?h ?t ?n ?s ?a ?o ?e ?u ?i ?d)) @@ -62,21 +76,21 @@ ;; need to redefine a few of these because the defaults ;; overlap with customized aw-keys (setq aw-dispatch-alist - '((?x aw-delete-window "Delete Window") - (?m aw-swap-window "Swap Windows") - (?M aw-move-window "Move Window") - (?c aw-copy-window "Copy Window") - (?j aw-switch-buffer-in-window "Select Buffer") - (?f aw-flip-window) - (?p aw-switch-buffer-other-window "Switch Buffer Other Window") - (?c aw-split-window-fair "Split Fair Window") - (?v aw-split-window-vert "Split Vert Window") - (?b aw-split-window-horz "Split Horz Window") - (?1 delete-other-windows "Delete Other Windows") - (?? aw-show-dispatch-help)))) + '((?x aw-delete-window "Delete Window") + (?m aw-swap-window "Swap Windows") + (?M aw-move-window "Move Window") + (?c aw-copy-window "Copy Window") + (?j aw-switch-buffer-in-window "Select Buffer") + (?f aw-flip-window) + (?p aw-switch-buffer-other-window "Switch Buffer Other Window") + (?c aw-split-window-fair "Split Fair Window") + (?v aw-split-window-vert "Split Vert Window") + (?b aw-split-window-horz "Split Horz Window") + (?1 delete-other-windows "Delete Other Windows") + (?? aw-show-dispatch-help)))) (use-package aggressive-indent - :ensure t + :straight t :config (global-aggressive-indent-mode 1)) @@ -84,7 +98,7 @@ :diminish auto-revert-mode) (use-package avy - :ensure t + :straight t :config (avy-setup-default) :bind @@ -211,7 +225,7 @@ Extended Format date in the date field and return it as a string obeing (seq-do (lambda (pair) (add-to-list 'bibtex-autokey-titleword-change-strings pair)) charMap)))) (use-package bibtex-completion - :ensure ivy-bibtex + :straight ivy-bibtex :custom (bibtex-completion-bibliography "~/Documents/papers/library.bib") (bibtex-completion-library-path '("~/Documents/papers/pdfs/")) @@ -219,74 +233,93 @@ Extended Format date in the date field and return it as a string obeing (bibtex-completion-notes-extension ".org") (bibtex-completion-pdf-extension '(".pdf" ".djvu" ".txt"))) +(use-package cape + :straight t + ;; Bind prefix keymap providing all Cape commands under a mnemonic key. + ;; Press C-c p ? to for help. + :bind ("C-c p" . cape-prefix-map) ;; Alternative key: M-<tab>, M-p, M-+ + ;; Alternatively bind Cape commands individually. + ;; :bind (("C-c p d" . cape-dabbrev) + ;; ("C-c p h" . cape-history) + ;; ("C-c p f" . cape-file) + ;; ...) + :hook + (completion-at-point-functions . cape-dabbrev) + (completion-at-point-functions . cape-file) + (completion-at-point-functions . cape-elisp-block) + (completion-at-point-functions .cape-keyword)) + (use-package cc-mode :custom (c-default-style "bsd")) -(use-package company - :ensure t - :diminish - :bind - ("<tab>" . company-indent-or-complete-common) - :hook - (after-init . global-company-mode)) - -(use-package company-auctex - :ensure t - :after latex - :config - (company-auctex-init)) - (use-package company-bibtex - :ensure t + :straight t :hook (bibtex-mode . (lambda () (add-to-list 'company-backends 'company-bibtex)))) -(use-package company-box - :ensure t - :diminish - :hook (company-mode . company-box-mode)) - (use-package company-coq - :ensure t + :straight t :hook (coq-mode . company-coq-mode)) -(use-package company-math - :ensure t - :config - (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 consult + :straight t + :bind + (("C-x b" . consult-buffer) + ("C-x C-f" . find-file) + ("C-s" . consult-line) + ("M-x" . execute-extended-command))) -(use-package counsel - :ensure t +(use-package consult-mu + :after (consult mu4e) :bind - (("C-x b" . counsel-switch-buffer) - ("C-x C-b" . counsel-ibuffer) - ("C-x C-f" . counsel-find-file) - ("M-x" . counsel-M-x) - ("M-y" . counsel-yank-pop) - ("<f2> i" . counsel-info-lookup-symbol) - ("<f2> j" . counsel-set-variable) - ("<f2> u" . counsel-unicode-char)) - :config - (add-to-list 'ivy-initial-inputs-alist - '(counsel-M-x . ""))) + :custom + ;;maximum number of results shown in minibuffer + (consult-mu-maxnum 200) + ;;show preview when pressing any keys + (consult-mu-preview-key 'any) + ;;do not mark email as read when previewed + (consult-mu-mark-previewed-as-read nil) + ;;do not amrk email as read when selected. This is a good starting point to ensure you would not miss important emails marked as read by mistake especially when trying this package out. Later you can change this to t. + (consult-mu-mark-viewed-as-read nil) + ;; open the message in mu4e-view-buffer when selected. + (consult-mu-action #'consult-mu--view-action)) + +(use-package consult-mu-compose) +(use-package consult-mu-contacts) +(setq consult-mu-compose-preview-key "M-o") +(setq consult-mu-embark-attach-file-key "C-a") + +(use-package corfu + :straight t + :bind + (:map corfu-map + ("SPC" . corfu-insert-separator)) + :init + (global-corfu-mode)) (use-package csv-mode - :ensure t) + :straight t) (use-package cus-edit :custom (custom-file null-device "Don't store customizations")) +;; Use Dabbrev with Corfu! +(use-package dabbrev + :straight t + ;; Swap M-/ and C-M-/ + :bind (("M-/" . dabbrev-completion) + ("C-M-/" . dabbrev-expand)) + :config + (add-to-list 'dabbrev-ignored-buffer-regexps "\\` ") + ;; Since 29.1, use `dabbrev-ignored-buffer-regexps' on older. + (add-to-list 'dabbrev-ignored-buffer-modes 'doc-view-mode) + (add-to-list 'dabbrev-ignored-buffer-modes 'pdf-view-mode) + (add-to-list 'dabbrev-ignored-buffer-modes 'tags-table-mode)) + (use-package diary - :ensure diary-lib + :straight diary-lib :custom (diary-display-function 'diary-fancy-display) :hook ((diary-list-entries . diary-include-other-diary-files) @@ -295,53 +328,101 @@ Extended Format date in the date field and return it as a string obeing (use-package dictem) (use-package diminish - :ensure t) + :straight t) (use-package doi-utils ;; provided by org-ref - :ensure org-ref) + :straight org-ref) (use-package dtrt-indent - :ensure t) + :straight t) (use-package dune - :ensure t) + :straight t) (use-package dune-format - :ensure t) + :straight t) (use-package eldoc :diminish) (use-package elpher - :ensure t) + :straight t) (use-package elpy - :ensure t + :straight t :after python :config (elpy-enable) :custom (elpy-rpc-python-command "python3")) +(use-package embark + :straight t + :bind + (("C-." . embark-act) ;; Begin the embark process + ("C-;" . embark-dwim) ;; good alternative: M-. + ("C-h B" . embark-bindings)) ;; alternative for `describe-bindings' + ) + +(use-package embark-consult + :straight t) + (use-package ess - :ensure t) + :straight t) (use-package erc - :ensure t + :straight t :custom - (erc-hide-list '("JOIN" "PART" "QUIT")) + (erc-hide-list '("JOIN" "PART" "QUIT" "353")) (erc-lurker-hide-list '("JOIN" "PART" "QUIT")) - ;; :config - ;; (erc-tls :server "libera.pounce.rak.ac" - ;; :port 40404 - ;; :nick "rak" - ;; :client-certificate '("/home/rak/.config/catgirl/weechat.pem" - ;; "/home/rak/.config/catgirl/weechat.pem") - ;; :user "koios-erc") - ) + (erc-fill-column 120) + (erc-fill-function 'erc-fill-static) + (erc-fill-static-center 20) + (erc-track-exclude '("#debian-devel-changes")) + (erc-track-visibility nil) + (erc-truncate-mode t) + (erc-input-line-position -1) + :config + (defun my/connect-irc () + (interactive) + (erc-tls :server "libera.pounce.rak.ac" + :port 40404 + :nick "rak" + :client-certificate '("/home/rak/.config/catgirl/weechat.pem" + "/home/rak/.config/catgirl/weechat.pem") + :user "koios-erc") + (erc-tls :server "oftc.pounce.rak.ac" + :port 40404 + :nick "rak" + :client-certificate '("/home/rak/.config/catgirl/weechat.pem" + "/home/rak/.config/catgirl/weechat.pem") + :user "koios-erc") + (erc-tls :server "tilde.pounce.rak.ac" + :port 40404 + :nick "rak" + :client-certificate '("/home/rak/.config/catgirl/weechat-sdf.pem" + "/home/rak/.config/catgirl/weechat-sdf.pem") + :user "koios-erc") + (erc-tls :server "sdf.pounce.rak.ac" + :port 40404 + :nick "rak" + :client-certificate '("/home/rak/.config/catgirl/weechat-sdf.pem" + "/home/rak/.config/catgirl/weechat-sdf.pem") + :user "koios-erc")) + (add-to-list 'erc-modules 'nickbar) + (add-to-list 'erc-modules 'nicks) + (add-to-list 'erc-modules 'notifications) + (add-to-list 'erc-modules 'spelling) + (add-to-list 'erc-modules 'truncate) + :hook + ((erc-mode . (lambda () + ;; to help ensure the ERC> prompt stays at the bottom + (setq-local scroll-conservatively 101)))) + :bind + (("C-<f6>" . my/connect-irc))) (use-package fill-column-indicator - :ensure t) + :straight t) (use-package flyspell :bind @@ -349,16 +430,14 @@ Extended Format date in the date field and return it as a string obeing :config (unbind-key "C-;" flyspell-mode-map)) -(use-package flyspell-correct-ivy - :ensure t +(use-package flyspell-correct :after flyspell :bind - ("C-<f12>" . flyspell-correct-wrapper) - :config - (setq flyspell-correct-interface #'flyspell-correct-ivy)) + (:map flyspell-mode-map + ("C-;" . flyspell-correct-wrapper))) (use-package gnus - :ensure t + :straight t :defer t :bind ;; (:map gnus-summary-buffer-map @@ -408,41 +487,28 @@ Extended Format date in the date field and return it as a string obeing (gnus-group-mode . gnus-topic-mode)) (use-package haskell-mode - :ensure t + :straight t :hook ((haskell-mode . turn-on-haskell-doc-mode) (haskell-mode . turn-on-haskell-indentation))) (use-package info-look - :ensure t) + :straight t) (use-package ispell - :ensure t + :straight t :defer t :custom (ispell-dictionary "en_CA-w_accents")) -(use-package ivy - :ensure t - :diminish - :bind - (("C-c v" . ivy-push-view) - ("C-c V" . ivy-pop-view) - ("C-c C-r" . ivy-resume)) - :custom - (ivy-use-virtual-buffers t) - (ivy-count-format "(%d/%d) ") - :config - (ivy-mode 1)) - (use-package ivy-bibtex - :ensure t + :straight t :bind (("C-c b" . ivy-bibtex))) (use-package ivy-hydra - :ensure t) + :straight t) (use-package latex - :ensure auctex + :straight auctex :after info-look :mode ("\\.tex\\'" . LaTeX-mode) :init @@ -513,27 +579,44 @@ Otherwise split the current paragraph into one sentence per line." (:map LaTeX-mode-map ("M-q" . ales/fill-paragraph))) -(use-package libmpdel - ;; used by mpdel to connect to mpd +(use-package lsp-mode + :straight t :custom - (libmpdel-hostname "asteria.home.arpa")) + (lsp-completion-provider :none) ;; we use Corfu! + :init + (defun my/lsp-mode-setup-completion () + (setf (alist-get 'styles (alist-get 'lsp-capf completion-category-defaults)) + '(orderless))) ;; Configure orderless + :hook + (lsp-completion-mode . my/lsp-mode-setup-completion)) (use-package magit - :ensure t + :straight t :config (put 'magit-clean 'disabled nil) :custom (magit-diff-refine-hunk 'all)) +(use-package marginalia + :straight t + :bind (:map minibuffer-local-map + ("M-A" . marginalia-cycle)) + :init + (marginalia-mode)) + (use-package markdown-mode - :ensure t + :straight t :init (autoload 'markdown-mode "markdown-mode" "Major mode for editing Markdown files" t) - :hook ((markdown-mode . (lambda () - (setq-default indent-tabs-mode nil)))) + :hook + ((markdown-mode . (lambda () + (setq-default indent-tabs-mode nil)))) + (markdown-mode . turn-off-auto-fill) + (markdown-mode . visual-line-mode) + (markdown-mode . visual-fill-column-mode) :mode (("\\.markdown\\'" . markdown-mode) - ("\\.mdown\'" . markdown-mode))) + ("\\.mdown\'" . markdown-mode))) (use-package menu-bar :config @@ -543,7 +626,7 @@ Otherwise split the current paragraph into one sentence per line." (use-package merlin ;; ocaml assistant - :ensure t) + :straight t) (use-package message :custom @@ -556,7 +639,7 @@ Otherwise split the current paragraph into one sentence per line." (message-mode . visual-fill-column-mode)) (use-package message-view-patch - :ensure t) + :straight t) (use-package minibuffer :config @@ -570,16 +653,8 @@ Otherwise split the current paragraph into one sentence per line." :custom (mpc-host "asteria.home.arpa")) -(use-package mpdel - ;; mpd client - ;; host/port customization under libmpdel package - :ensure t - :diminish - :config - (mpdel-mode)) - (use-package mu4e - :ensure t + :straight t :bind (("<f6>" . mu4e)) :config @@ -691,6 +766,10 @@ Otherwise split the current paragraph into one sentence per line." ;; compose messages in new frame (mu4e-compose-in-new-frame t) + ;; use default emacs completion + (mu4e-read-option-use-builtin nil) + (mu4e-completing-read-function 'completing-read) + ;; hide long list off addresses from main view and silence warnings ;; about mu4e not recognizing user-mail-address against regexp (mu4e-main-hide-personal-addresses t) @@ -704,18 +783,34 @@ Otherwise split the current paragraph into one sentence per line." ("/gmail/INBOX" . ?g) ("/queensu/INBOX" . ?q)))) +(use-package mu4e-column-faces + :straight t + :after mu4e + :config (mu4e-column-faces-mode)) + ;; provided through git/chezmoi -(use-package mu4e-goodies-tags) +(use-package mu4e-goodies-tags + :after mu4e) (use-package oauth2 - :ensure t) + :straight t) (use-package ocp-indent - :ensure t) + :straight t) (use-package octave :mode ("\\.m\'" . octave-mode)) +(use-package orderless + :straight t + :custom + ;; Configure a custom style dispatcher (see the Consult wiki) + ;; (orderless-style-dispatchers '(+orderless-consult-dispatch orderless-affix-dispatch)) + ;; (orderless-component-separator #'orderless-escapable-split-on-space) + (completion-styles '(orderless basic)) + (completion-category-defaults nil) + (completion-category-overrides '((file (styles partial-completion))))) + (use-package org :bind (:map org-mode-map ("<tab>" . org-cycle)) @@ -725,20 +820,20 @@ Otherwise split the current paragraph into one sentence per line." (org-link-file-path-type 'relative)) (use-package org-chef - :ensure t) + :straight t) (use-package org-noter - :ensure t + :straight t :custom ;; Surely there's an easier way of setting this? (org-noter-notes-search-path '("~/Documents/papers/notes/"))) (use-package org-ref - :ensure t + :straight t :after ivy-bibtex) (use-package org-ref-arxiv - :ensure org-ref + :straight org-ref :custom (arxiv-entry-format-string "@Misc{%s, title = {%s}, @@ -785,7 +880,7 @@ Returns a formatted BibTeX entry." (advice-add 'arxiv-get-bibtex-entry-via-arxiv-api :override 'my/arxiv-get-bibtex-entry-via-arxiv-api)) (use-package org-ref-bibtex - :ensure org-ref + :straight org-ref :after bibtex-completion ; needs bibtex-completion-library-path :custom (org-ref-title-case-types '(("article" "title") @@ -837,10 +932,10 @@ Returns a formatted BibTeX entry." ((prog-mode . flyspell-prog-mode))) (use-package reftex-cite - :ensure t) + :straight t) (use-package org-ref-core - :ensure org-ref + :straight org-ref :after org-ref-bibtex :after reftex-cite :after ivy-bibtex @@ -984,27 +1079,27 @@ If not, issue a warning." orcb-clean-nil-opinionated))) (use-package org-ref-isbn - :ensure org-ref) + :straight org-ref) (use-package org-ref-pdf - :ensure org-ref) + :straight org-ref) (use-package ox-md ;; org-mode to markdown exporter - :ensure org + :straight org :after (org)) (use-package outline - :ensure t + :straight t :hook (LaTeX-mode . outline-minor-mode)) (use-package outline-magic - :ensure t + :straight t :after outline :bind (:map outline-minor-mode-map ([f10] . outline-cycle))) (use-package paren - :ensure t + :straight t :config (show-paren-mode t) :custom @@ -1012,7 +1107,7 @@ If not, issue a warning." (show-paren-style 'expression)) (use-package pdf-tools - :ensure t + :straight t :config (pdf-tools-install)) @@ -1022,10 +1117,10 @@ If not, issue a warning." ("C-s" . isearch-forward))) (use-package powerline - :ensure t) + :straight t) (use-package proof-general - :ensure t + :straight t :custom (proof-disappearing-proofs t) (proof-electric-terminator-enable t) @@ -1035,13 +1130,13 @@ If not, issue a warning." (proof-locked-face ((t (:weight bold))))) (use-package py-autopep8 - :ensure t + :straight t :hook (python-mode . py-autopep8-enable-on-save) :custom (py-autopep8-options '("--max-line-length=80"))) (use-package python - :ensure t + :straight t :mode ("\\.py\\'" . python-mode) :custom (python-python-command "/usr/bin/python3") :interpreter ("python3" . python-mode) @@ -1051,14 +1146,14 @@ If not, issue a warning." (python-shell-interpreter "python3")) (use-package rainbow-delimiters - :ensure t + :straight t :hook ((LaTeX-mode prog-mode) . rainbow-delimiters-mode)) (use-package rainbow-mode - :ensure t) + :straight t) (use-package reftex - :ensure t + :straight t :after latex :hook (LaTeX-mode . reftex-mode) :custom @@ -1091,7 +1186,12 @@ If not, issue a warning." (rfc2047-quote-decoded-words-containing-tspecials t)) (use-package sass-mode - :ensure t) + :straight t) + +;; Persist history over Emacs restarts. Vertico sorts by history position. +(use-package savehist + :init + (savehist-mode)) (use-package scroll-bar :custom @@ -1113,7 +1213,7 @@ If not, issue a warning." (setq smerge-command-prefix (kbd "C-c v"))) (use-package sml-mode - :ensure t + :straight t :mode ("\\.sml\\'" . sml-mode)) (use-package solar @@ -1126,16 +1226,11 @@ If not, issue a warning." (calendar-location-name "Montreal, QC")) (use-package spaceline - :ensure t + :straight t :requires spaceline-config) -(use-package swiper - :ensure t - :bind - (("C-s" . swiper))) - (use-package tex - :ensure auctex + :straight auctex :custom (reftex-plug-into-AUCTeX t) (TeX-parse-self t) ; Parse documents to provide completion for packages, etc. @@ -1169,39 +1264,45 @@ If not, issue a warning." (tramp-default-method "ssh")) (use-package tuareg - :ensure t + :straight t :config (add-hook 'tuareg-mode-hook 'merlin-mode t)) -(use-package twittering-mode - :ensure t - :custom - (twittering-icon-mode t) - (twittering-icon-storage-file "~/.emacs.d/storage/twittering-mode-icons.gz") - (twittering-use-icon-storage t)) - (use-package vc-git :requires vc :config (add-to-list 'vc-handled-backends 'git)) +(use-package vertico + :straight t + :custom + (vertico-scroll-margin 0) ;; Different scroll margin + (vertico-count 20) ;; Show more candidates + (vertico-resize t) ;; Grow and shrink the Vertico minibuffer + (vertico-cycle t) ;; Enable cycling for `vertico-next/previous' + :init + (vertico-mode)) + +(use-package vertico-directory + :straight vertico) + (use-package visual-fill-column - :ensure t) + :straight t) (use-package wc-mode - :ensure t) + :straight t) (use-package windmove - :ensure t + :straight t :config (windmove-default-keybindings) :custom (windmove-wrap-around t)) (use-package ws-butler - :ensure t + :straight t :config (ws-butler-global-mode)) (use-package yaml-mode - :ensure t) + :straight t) diff --git a/bin/executable_Internet.m3u.sh b/dot_local/bin/executable_Internet.m3u.sh index 62d83d0..62d83d0 100644 --- a/bin/executable_Internet.m3u.sh +++ b/dot_local/bin/executable_Internet.m3u.sh diff --git a/bin/executable_copyright.awk b/dot_local/bin/executable_copyright.awk index 371a9c2..371a9c2 100755 --- a/bin/executable_copyright.awk +++ b/dot_local/bin/executable_copyright.awk diff --git a/bin/executable_do_blue.sh b/dot_local/bin/executable_do_blue.sh index cd79e50..cd79e50 100755 --- a/bin/executable_do_blue.sh +++ b/dot_local/bin/executable_do_blue.sh diff --git a/bin/executable_do_dac.sh b/dot_local/bin/executable_do_dac.sh index 7ae913e..7ae913e 100755 --- a/bin/executable_do_dac.sh +++ b/dot_local/bin/executable_do_dac.sh diff --git a/bin/executable_do_speakers.sh b/dot_local/bin/executable_do_speakers.sh index 84b82e1..84b82e1 100755 --- a/bin/executable_do_speakers.sh +++ b/dot_local/bin/executable_do_speakers.sh diff --git a/bin/executable_icd b/dot_local/bin/executable_icd index 367b87f..367b87f 100755 --- a/bin/executable_icd +++ b/dot_local/bin/executable_icd diff --git a/bin/executable_lbdb-fetchaddr-wrapper b/dot_local/bin/executable_lbdb-fetchaddr-wrapper index bb1270a..bb1270a 100755 --- a/bin/executable_lbdb-fetchaddr-wrapper +++ b/dot_local/bin/executable_lbdb-fetchaddr-wrapper diff --git a/bin/executable_lfoot b/dot_local/bin/executable_lfoot index 5522085..5522085 100644 --- a/bin/executable_lfoot +++ b/dot_local/bin/executable_lfoot diff --git a/bin/executable_mailx-alias b/dot_local/bin/executable_mailx-alias index c1d961a..c1d961a 100755 --- a/bin/executable_mailx-alias +++ b/dot_local/bin/executable_mailx-alias diff --git a/bin/executable_mice.sh b/dot_local/bin/executable_mice.sh index 794f86f..794f86f 100755 --- a/bin/executable_mice.sh +++ b/dot_local/bin/executable_mice.sh diff --git a/bin/executable_mpd_only.sh b/dot_local/bin/executable_mpd_only.sh index 468c6a5..468c6a5 100755 --- a/bin/executable_mpd_only.sh +++ b/dot_local/bin/executable_mpd_only.sh diff --git a/bin/executable_mpd_others.sh b/dot_local/bin/executable_mpd_others.sh index b27e11e..b27e11e 100755 --- a/bin/executable_mpd_others.sh +++ b/dot_local/bin/executable_mpd_others.sh diff --git a/bin/executable_mutt-fetchbug b/dot_local/bin/executable_mutt-fetchbug index 93ffc58..93ffc58 100755 --- a/bin/executable_mutt-fetchbug +++ b/dot_local/bin/executable_mutt-fetchbug diff --git a/bin/executable_mutt_bgrun b/dot_local/bin/executable_mutt_bgrun index f833bab..f833bab 100755 --- a/bin/executable_mutt_bgrun +++ b/dot_local/bin/executable_mutt_bgrun diff --git a/bin/executable_mutt_oauth2.py b/dot_local/bin/executable_mutt_oauth2.py index 559811f..559811f 100644 --- a/bin/executable_mutt_oauth2.py +++ b/dot_local/bin/executable_mutt_oauth2.py diff --git a/bin/executable_ptmp b/dot_local/bin/executable_ptmp index e42c695..e42c695 100755 --- a/bin/executable_ptmp +++ b/dot_local/bin/executable_ptmp diff --git a/bin/executable_startaudio b/dot_local/bin/executable_startaudio index 3fbfa7f..3fbfa7f 100755 --- a/bin/executable_startaudio +++ b/dot_local/bin/executable_startaudio diff --git a/bin/executable_swaybg-random b/dot_local/bin/executable_swaybg-random index ba4baa1..ba4baa1 100644 --- a/bin/executable_swaybg-random +++ b/dot_local/bin/executable_swaybg-random diff --git a/bin/executable_tmcg b/dot_local/bin/executable_tmcg index 5ebb3cf..5ebb3cf 100755 --- a/bin/executable_tmcg +++ b/dot_local/bin/executable_tmcg diff --git a/bin/executable_wd-bak b/dot_local/bin/executable_wd-bak index f824fba..f824fba 100755 --- a/bin/executable_wd-bak +++ b/dot_local/bin/executable_wd-bak diff --git a/bin/executable_wd-mount b/dot_local/bin/executable_wd-mount index b8f8a45..b8f8a45 100644 --- a/bin/executable_wd-mount +++ b/dot_local/bin/executable_wd-mount diff --git a/bin/executable_wd-umount b/dot_local/bin/executable_wd-umount index 08e55eb..08e55eb 100644 --- a/bin/executable_wd-umount +++ b/dot_local/bin/executable_wd-umount diff --git a/bin/executable_wofi-window-switcher b/dot_local/bin/executable_wofi-window-switcher index 2344093..2344093 100644 --- a/bin/executable_wofi-window-switcher +++ b/dot_local/bin/executable_wofi-window-switcher diff --git a/dot_local/lib/openssh/executable_agent-launch b/dot_local/lib/openssh/executable_agent-launch deleted file mode 100644 index 36e06ff..0000000 --- a/dot_local/lib/openssh/executable_agent-launch +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# helper script for launching ssh-agent, used by systemd unit -set -e - -options="$(getopt -o '' -l help -- "$@")" || exit 1 -eval set -- "$options" - -if [ ! -d "$XDG_RUNTIME_DIR" ]; then - # shellcheck disable=SC2016 - echo 'This needs $XDG_RUNTIME_DIR to be set' >&2 - exit 1 -fi - -while :; do - case $1 in - --help) - echo 'Usage:' >&2 - echo " $0 start [-- ssh-agent options]" >&2 - echo " $0 stop" - exit 0 - ;; - --) - shift - break - ;; - *) - echo "Unexpected argument: $1" >&2 - exit 1 - ;; - esac -done - -if [ "$1" = start ]; then - shift - if [ ! -S "$SSH_AUTH_SOCK" ] && grep -s -q '^use-ssh-agent$' /etc/X11/Xsession.options; then - S="$XDG_RUNTIME_DIR/openssh_agent" - dbus-update-activation-environment --verbose --systemd SSH_AUTH_SOCK="$S" SSH_AGENT_LAUNCHER=openssh - exec ssh-agent -D -a "$S" "$@" - fi -elif [ "$1" = stop ]; then - if [ "$SSH_AGENT_LAUNCHER" = openssh ]; then - dbus-update-activation-environment --systemd SSH_AUTH_SOCK= - fi -else - echo "Unknown command $1" >&2 - exit 1 -fi diff --git a/equivs/rak-meta/debian/changelog b/equivs/rak-meta/debian/changelog index 523ce92..a829bd8 100644 --- a/equivs/rak-meta/debian/changelog +++ b/equivs/rak-meta/debian/changelog @@ -1,4 +1,16 @@ -rak-meta (0.21) unstable; urgency=medium +rak-meta (0.22) unstable; urgency=medium + + * git merge + + -- Ryan Kavanagh <rak@debian.org> Thu, 08 May 2025 16:37:18 -0400 + +rak-meta (0.21-koios) unstable; urgency=medium + + * rak-sysadmin: systemd-resolved dropped by Debian, use resolvconf instead + + -- Ryan Kavanagh <rak@debian.org> Mon, 31 Mar 2025 13:46:25 -0400 + +rak-meta (0.21-asteria) unstable; urgency=medium * rak-rlang: R packages * bunch of other manual packages now auto diff --git a/equivs/rak-meta/debian/control b/equivs/rak-meta/debian/control index c70f127..c6eb5a1 100644 --- a/equivs/rak-meta/debian/control +++ b/equivs/rak-meta/debian/control @@ -322,7 +322,7 @@ Depends: smartmontools, sshfs, sudo, - systemd-resolved, + systemd-resolved | resolvconf, systemd-timesyncd, task-ssh-server, tlp, diff --git a/private_dot_ssh/private_keys/asteria/certs/eos.rak.ac.pub b/private_dot_ssh/private_keys/asteria/certs/eos.rak.ac.pub index 0232646..6dd0351 100644 --- a/private_dot_ssh/private_keys/asteria/certs/eos.rak.ac.pub +++ b/private_dot_ssh/private_keys/asteria/certs/eos.rak.ac.pub @@ -1 +1 @@ -ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIE6O5KvWPdy+72cwED5fWrKYeMeuGG3ko4gGmIGPjfneAAAAIAaAqrBZRKRRelxr68ZzxT5Oq1c3BXhS6vZKypPBeaK8AAAAAAAAAAAAAAABAAAAGDIwMjQtMDctMTdUMjE6MTI6MzhaX3JhawAAAAcAAAADcmFrAAAAAGdglpoAAAAAaFHZGgAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAEXAAAAB3NzaC1yc2EAAAADAQABAAABAQDKJT7R6NhBLkxybSA+ZuM6HpW51nb9j7VFSBm3sMiCCLLg/9kb3AFRYV1a2ZwqPGu6Nm88WXGocF9HaSOfSg8bxyZRsDRqswCG2/VM+pwP1jzWkww8ag4ETuif+VpN7zqZoGi+0YnyC+7CBG/CpIFZ7veA5vVnqzXjxp1SK85YtkaTFJicY+zKZTcIbW8t82D0qrRlHrCztq4KV9CdD5itV3Dh1j0FC9l2X1BoZ8PUYzD7axds0+tmo+H/F+MyQoqqdeq+obAWpEqIkh9JtVLlkHukHgIl/HMhs5twm/zXU5iFJUlscfz7vSmjgobUZB5CY+rZn/M5OiWO9/1M43AvAAABFAAAAAxyc2Etc2hhMi01MTIAAAEADpPpHxoIjy/t2Bbh2X+8P9aO30KdFo92CxQO7vfHUI8D2dtonVPQ+q+a165jsoLmR0054z6HvZnB2DZeuuyVlSH1Sgmj/7ZljdQwthmNayRC7r3xDvKtXkZQCyTNtLxkJXCvXh47zue6HJNl3tiLiVD4QuJAITqcwHam8NLmC7ZaTlnnDRxo/g88ylH236UzuiUZ8trW+zZrTCpV4czWvIqJjpWq7VFmhJ/xOTnn5rOwSE0ppJwjqDKzonDlXaM2mTU/PSfTJC+fyCDxTV4iF8o6NsOF8J1JZ/6P695vo9Vw++YLnqe9YKeXQI/O2EvErkFWmuhzNvo6JlvkAtqxgQ== rak@asteria +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIK1sa0e2+OvUCZKe+/Z0j90FGvW74NUqyYK3BmnbW8m6AAAAIAaAqrBZRKRRelxr68ZzxT5Oq1c3BXhS6vZKypPBeaK8AAAAAAAAAAAAAAABAAAAGDIwMjUtNDYtMThUMTU6MDY6MDZaX3JhawAAAAcAAAADcmFrAAAAAGhRjb4AAAAAaULQPgAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAEXAAAAB3NzaC1yc2EAAAADAQABAAABAQDKJT7R6NhBLkxybSA+ZuM6HpW51nb9j7VFSBm3sMiCCLLg/9kb3AFRYV1a2ZwqPGu6Nm88WXGocF9HaSOfSg8bxyZRsDRqswCG2/VM+pwP1jzWkww8ag4ETuif+VpN7zqZoGi+0YnyC+7CBG/CpIFZ7veA5vVnqzXjxp1SK85YtkaTFJicY+zKZTcIbW8t82D0qrRlHrCztq4KV9CdD5itV3Dh1j0FC9l2X1BoZ8PUYzD7axds0+tmo+H/F+MyQoqqdeq+obAWpEqIkh9JtVLlkHukHgIl/HMhs5twm/zXU5iFJUlscfz7vSmjgobUZB5CY+rZn/M5OiWO9/1M43AvAAABFAAAAAxyc2Etc2hhMi01MTIAAAEAidojViPZG0LtjGF6Xa7XnGLNf1zk7A+PWjj7NJL8nAFikHkAbj9ozaueqhgr25d7HoEDfr+GhkoU3MSBpPv3fwz33G9L3WDBPh/EgsSgtgN2s6IJTV21QrdF17TikxQU5svVD2y+wa/nM89jUxPmEHQJk8gdvAXl2xKMcXmyejU7f+6M/RYTDhhQEW2cMC6W6jAwPXmW0u1v+w3J+uOO/0hKiWThz6oPRudpwiLSVItEBrB1Ye0T/xO88a40WiCLonJ3pdRGp/sO2rEEblGX0sjCpsuORl76PPioL6YE8prypovooJCpiRFyBDCcY2SdYp901fvqDo3KI3AkVBntnw== rak@asteria diff --git a/private_dot_ssh/private_keys/asteria/certs/hades.rak.ac.pub b/private_dot_ssh/private_keys/asteria/certs/hades.rak.ac.pub index 085a390..a0e2f16 100644 --- a/private_dot_ssh/private_keys/asteria/certs/hades.rak.ac.pub +++ b/private_dot_ssh/private_keys/asteria/certs/hades.rak.ac.pub @@ -1 +1 @@ -ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIB+u++zVsi+zUb1bVdaN4WY+cRq0Wee62vfK1pW8CV1NAAAAIAaAqrBZRKRRelxr68ZzxT5Oq1c3BXhS6vZKypPBeaK8AAAAAAAAAAAAAAABAAAAGDIwMjQtMDctMTdUMjE6MTI6NDFaX3JhawAAAAcAAAADcmFrAAAAAGdglp0AAAAAaFHZHQAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAGXAAAAB3NzaC1yc2EAAAADAQABAAABgQCfdeufiJSL4Vbxb11zdbPdEMRt57oAYBILSZpABX7qi2qB7SBTpX0NurliWKHOsJ9WXjqWbqVp9VmXAehuEb+26kLA6LpFlOwJMrO2cF5UH26oq7p2MyQVFuzKpv9rfPrMEXhN7T+pRotU323eJLcxWYrJX68Ai2u9KudgN8wcGebsIwKcn8qPdPfb08CcgQzwaknX5uiiVhqNp7784ZnZ0Q2zvQi13SGWYfZbrO/ufi6X1c9+qtRW7izAvGttTZJNwrIFePWkQQygmtb2oZ1HOD6J+WK91GHwQHPSRfvNoT87XOGrVf8mYnbbCoEVxmpPZ5F1r4tvvc1HbCFydIJAkaPsM9r5oYsEIvHqpQxBo5m3HXj9DDVLktWNYB1ZfiiM6qvz44eDz4IBoou9IUHUNcX+37LuTBgtrJX0GaptpBQwmLGmKX2F6jj0CMIV9Ir+ztjGcEctnEXDF37ApiLioRt8r1yUylAvYaKmePSwqzQZscTvCIv4ralNaAFRBb0AAAGUAAAADHJzYS1zaGEyLTUxMgAAAYAUS+F+PcT1Q5XcWOLfSsoYKSeiO2ad+hPMCvY/S0jrEsLxnDcffa8V+BU8Qm5PGBhjvDNBIi+n38J3O2gUNOxkb3vTyWgkJoywaqcgQpvgQh/Idsv4q4xkk0OBS2GOI+JNpd7BzhSFVMdFEm9T0EavZ6fHbXI/c7Qk9Rg+Eb7AiIU6Gh5pxRA4WcvQqTqKuaQqagK+JaGpv2UgdIDKBtaQoxlhyPRwqoCnRABxHufTV50U4pnr4hPsZptRGSCIw0tECuEn2bMmLD3iqXg6RCcZS3cfRoZJGdDYiLCOFwbhRq7BjZ+lS4Swip38XA1Bg+I0Y4+qyvJwqBQ1eeQQ4eTGdz3dzCEL48/pDxf2miswr+YFteVnOMK5x/4Y74MXkuqpsodzRyJpyBaIQwMHiu2GqhapSI8p6VctMdzqXqKFny13iY83X3LF0x+8HvVXgBoKdvWyVmklgKcXPVxaFmLeGwlTyXoW3Pb0P784+/+a0oPGsGxR5lgJ1ZY8yutZjII= rak@asteria +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAII5zp8gW44ivgq7QalOFYQ5YtvL1zIUUR7gBwA7LPLVnAAAAIAaAqrBZRKRRelxr68ZzxT5Oq1c3BXhS6vZKypPBeaK8AAAAAAAAAAAAAAABAAAAGDIwMjUtNDYtMThUMTU6MDY6MTFaX3JhawAAAAcAAAADcmFrAAAAAGhRjcMAAAAAaULQQwAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAGXAAAAB3NzaC1yc2EAAAADAQABAAABgQCfdeufiJSL4Vbxb11zdbPdEMRt57oAYBILSZpABX7qi2qB7SBTpX0NurliWKHOsJ9WXjqWbqVp9VmXAehuEb+26kLA6LpFlOwJMrO2cF5UH26oq7p2MyQVFuzKpv9rfPrMEXhN7T+pRotU323eJLcxWYrJX68Ai2u9KudgN8wcGebsIwKcn8qPdPfb08CcgQzwaknX5uiiVhqNp7784ZnZ0Q2zvQi13SGWYfZbrO/ufi6X1c9+qtRW7izAvGttTZJNwrIFePWkQQygmtb2oZ1HOD6J+WK91GHwQHPSRfvNoT87XOGrVf8mYnbbCoEVxmpPZ5F1r4tvvc1HbCFydIJAkaPsM9r5oYsEIvHqpQxBo5m3HXj9DDVLktWNYB1ZfiiM6qvz44eDz4IBoou9IUHUNcX+37LuTBgtrJX0GaptpBQwmLGmKX2F6jj0CMIV9Ir+ztjGcEctnEXDF37ApiLioRt8r1yUylAvYaKmePSwqzQZscTvCIv4ralNaAFRBb0AAAGUAAAADHJzYS1zaGEyLTUxMgAAAYCPZlMwGAz0Uxn4fDm2CB9SzIUMVcYB3jZZ+IVZQd5bGfsykm6dOm3VPGjDDjIcpYCmGPGAvvhVqPu47Tgk6a11hA5Cd+GVvP6rW8T+w1Jer5l3+nNB3AIAt99jeB8ojXDuaF316KUY9/XKa+M8GrKyPuoGjCqgxcPTwGySP1d0eh87u0Q7WWD9JjCCKFcwhwnfaK+reE1WXnprCye4G7RKSHbDLip6EkuIUAXcqHGGUPJKG4Z3YCjbqO3mh86jv66aCG3EOdCHQCVrthD1fVwbw80plc+GAFj9DohYas8yDCIsAyy/Rpb6OBwgg1Hmqg3v15NdViVziMbrHVl1nXKZOH9LDj0Hdz7PbJvVwgXrvujbMCfIX6GwM6njVPa3zpDs3D6oKHy1+cP+D+RnkreBFkzoEgmIVQtkV5NhLRckv17Bj0E8Lthy4u3CQ3G/trnGf7J3ygq0QlAAi80uWj58GuF+dZogPpNF61dctYa8+YAa7mOPABlkmRU/s6cyYTw= rak@asteria diff --git a/private_dot_ssh/private_keys/asteria/certs/rak.pub b/private_dot_ssh/private_keys/asteria/certs/rak.pub index d597ad0..d71cfec 100644 --- a/private_dot_ssh/private_keys/asteria/certs/rak.pub +++ b/private_dot_ssh/private_keys/asteria/certs/rak.pub @@ -1 +1 @@ -ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIPTXXD07oL0hk2KaMBtORmpsFtqxjXSU4Qx1MaBBIOQ+AAAAIAaAqrBZRKRRelxr68ZzxT5Oq1c3BXhS6vZKypPBeaK8AAAAAAAAAAAAAAABAAAAGDIwMjQtMDctMTdUMjE6MTI6NDFaX3JhawAAAAcAAAADcmFrAAAAAGdglp0AAAAAaFHZHQAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIOgOV5atVQfbpFQ2R1wkUPy2yoCxzloVMTwUU6j7R4v3AAAAUwAAAAtzc2gtZWQyNTUxOQAAAEDcWSIS7O+Z35g/NBUKV0Va29jfVx4kCS/uxxTduKklt0nu/WQZEOdCBSl4Vzg6zPStRE5B/qin8NWxp40I2eEK rak@asteria +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIGC8sg8T1H26e1iRSXpv207D4B7RrPyaxwHxlBQmXc7+AAAAIAaAqrBZRKRRelxr68ZzxT5Oq1c3BXhS6vZKypPBeaK8AAAAAAAAAAAAAAABAAAAGDIwMjUtNDYtMThUMTU6MDY6MTFaX3JhawAAAAcAAAADcmFrAAAAAGhRjcMAAAAAaULQQwAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIOgOV5atVQfbpFQ2R1wkUPy2yoCxzloVMTwUU6j7R4v3AAAAUwAAAAtzc2gtZWQyNTUxOQAAAECKAfZ7AYaG2SzIMpTutATTQ7FPnfkdw6ZtUmlVzceVxCbeKmMDpUCnaF6o+X3qThD4F6rHTUHYdIBiNUiTIocI rak@asteria diff --git a/private_dot_ssh/private_keys/koios/certs/eos.rak.ac.pub b/private_dot_ssh/private_keys/koios/certs/eos.rak.ac.pub index 06a63a2..419bd71 100644 --- a/private_dot_ssh/private_keys/koios/certs/eos.rak.ac.pub +++ b/private_dot_ssh/private_keys/koios/certs/eos.rak.ac.pub @@ -1 +1 @@ -ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIEhLcTRxveJONC0nvJOil7EinWnxbEMzF+3fvdoCpzVFAAAAIF3200rIEC9Ly9LTxuhkPxorNOrqR5LuaO5R55AmoZ4aAAAAAAAAAAAAAAABAAAAGDIwMjQtMDctMTdUMjE6MTI6NDVaX3JhawAAAAcAAAADcmFrAAAAAGdglqEAAAAAaFHZIQAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAEXAAAAB3NzaC1yc2EAAAADAQABAAABAQDKJT7R6NhBLkxybSA+ZuM6HpW51nb9j7VFSBm3sMiCCLLg/9kb3AFRYV1a2ZwqPGu6Nm88WXGocF9HaSOfSg8bxyZRsDRqswCG2/VM+pwP1jzWkww8ag4ETuif+VpN7zqZoGi+0YnyC+7CBG/CpIFZ7veA5vVnqzXjxp1SK85YtkaTFJicY+zKZTcIbW8t82D0qrRlHrCztq4KV9CdD5itV3Dh1j0FC9l2X1BoZ8PUYzD7axds0+tmo+H/F+MyQoqqdeq+obAWpEqIkh9JtVLlkHukHgIl/HMhs5twm/zXU5iFJUlscfz7vSmjgobUZB5CY+rZn/M5OiWO9/1M43AvAAABFAAAAAxyc2Etc2hhMi01MTIAAAEAmhbqDmhmwLiJufbBSaste3p++sPBuej7d4/4jCoTowUFdX6dBEHPwlReDZp6tib5LeC2YacOT5GMZpP0LT7pklDzSG4p8vcWBu9Rg5Umgs7hvuFTML/bakZaIxsH95KqtqFhzuKgiDN+rjXZj5i8IC79GS5S4IhXB2BnFIXVbSL8byrL0pV/GAhWDNnFUbViIsxTsx1Jb7OwaoNSNRj4L42l/p2RcsetWlq/Z2T0jZ8klSruCoh+2BqBa+9uVV/J16ya3eyq2NA7ixgQKKR0QTdwqxfBi701qTu9RfbSKIFYmEzJg7rbMBAZXSNp/6Bzb9yMIxsW8sIGNooXieADsA== rak@koios.rak.ac +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIF2R8iXYhjaYc1ajGQvVnLbQ1zzVPIOfu1+kNMTScHeyAAAAIF3200rIEC9Ly9LTxuhkPxorNOrqR5LuaO5R55AmoZ4aAAAAAAAAAAAAAAABAAAAGDIwMjUtNDYtMThUMTU6MDY6MjJaX3JhawAAAAcAAAADcmFrAAAAAGhRjc4AAAAAaULQTgAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAEXAAAAB3NzaC1yc2EAAAADAQABAAABAQDKJT7R6NhBLkxybSA+ZuM6HpW51nb9j7VFSBm3sMiCCLLg/9kb3AFRYV1a2ZwqPGu6Nm88WXGocF9HaSOfSg8bxyZRsDRqswCG2/VM+pwP1jzWkww8ag4ETuif+VpN7zqZoGi+0YnyC+7CBG/CpIFZ7veA5vVnqzXjxp1SK85YtkaTFJicY+zKZTcIbW8t82D0qrRlHrCztq4KV9CdD5itV3Dh1j0FC9l2X1BoZ8PUYzD7axds0+tmo+H/F+MyQoqqdeq+obAWpEqIkh9JtVLlkHukHgIl/HMhs5twm/zXU5iFJUlscfz7vSmjgobUZB5CY+rZn/M5OiWO9/1M43AvAAABFAAAAAxyc2Etc2hhMi01MTIAAAEAj6JbknO9XAzHaCiCu6fGrmzZ5+rr+qXYRKDa5c9lHyRFnconSXXl4IDMwbT3T+jRCJsAmjm1YBnMmALf7NPpIqxRZ2Zzb4z/f5Or8WipYDdfEgJ9Ogs/O3xTz2gS6gHe/F3532qSY2uknJAITH3zbNnqmDjDViIwzNLPZXrazVUSjYhfv6XJwYhDXIEZNE8t+KPk1yL1IIogW2sipm5LbzPSER960frypG4pazknZFau/Tb3DQRUA39Xb8EUzi3dqa9tlMwfLpLbPLkCiAZFGBN2XpZCq+ec32CEsdQHcUW4AyGuZDG1kwtHBuyR0ZnBJVJk1fIq50nkcIiMduY4UQ== rak@koios.rak.ac diff --git a/private_dot_ssh/private_keys/koios/certs/hades.rak.ac.pub b/private_dot_ssh/private_keys/koios/certs/hades.rak.ac.pub index 4010b82..29f9817 100644 --- a/private_dot_ssh/private_keys/koios/certs/hades.rak.ac.pub +++ b/private_dot_ssh/private_keys/koios/certs/hades.rak.ac.pub @@ -1 +1 @@ -ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIKpulCqNLv1C/VMlMHZ7TfbrgwSMIBACZPGZ9wK71vg6AAAAIF3200rIEC9Ly9LTxuhkPxorNOrqR5LuaO5R55AmoZ4aAAAAAAAAAAAAAAABAAAAGDIwMjQtMDctMTdUMjE6MTI6NDhaX3JhawAAAAcAAAADcmFrAAAAAGdglqQAAAAAaFHZJAAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAGXAAAAB3NzaC1yc2EAAAADAQABAAABgQCfdeufiJSL4Vbxb11zdbPdEMRt57oAYBILSZpABX7qi2qB7SBTpX0NurliWKHOsJ9WXjqWbqVp9VmXAehuEb+26kLA6LpFlOwJMrO2cF5UH26oq7p2MyQVFuzKpv9rfPrMEXhN7T+pRotU323eJLcxWYrJX68Ai2u9KudgN8wcGebsIwKcn8qPdPfb08CcgQzwaknX5uiiVhqNp7784ZnZ0Q2zvQi13SGWYfZbrO/ufi6X1c9+qtRW7izAvGttTZJNwrIFePWkQQygmtb2oZ1HOD6J+WK91GHwQHPSRfvNoT87XOGrVf8mYnbbCoEVxmpPZ5F1r4tvvc1HbCFydIJAkaPsM9r5oYsEIvHqpQxBo5m3HXj9DDVLktWNYB1ZfiiM6qvz44eDz4IBoou9IUHUNcX+37LuTBgtrJX0GaptpBQwmLGmKX2F6jj0CMIV9Ir+ztjGcEctnEXDF37ApiLioRt8r1yUylAvYaKmePSwqzQZscTvCIv4ralNaAFRBb0AAAGUAAAADHJzYS1zaGEyLTUxMgAAAYAnrBb8sWoOEmlLPFbS3iwmrtp2nWh64Ff3Lbqak1HQFKwrmbcVX3gki/LQezbb+dd62VQM5NOPMetoyE/rwVt1Vr00Rzg8JbEVgY4EYqGWdG2COZy7588IM8Z+egZ4is81eQlQCUOeekmEWuGEFeecA/7wHKmDwNJ2TnfcKBrBasweJoqScu7daD+XfMp5f8niScj/TIu3oI6dc+CQJb0lJpsL4Jnumu41m43kpfN8Lb41yKcl+wNcQQysimDuPNNl9g72STBhKxwV1aag6hfdalB5EB4zhmb5B86lbdsmEZrIg1aWQ5R5SDGMWMff6VHuQWqIHpGSs4RmKefPBnbGeeqY7lb9QcjDX2FBY1ptHdA4QyIgzRNFTzR552Gux1+ue2a/LtIBpyXlCTqs0q7Y83uYJ1Pb/TIQ9Chm6wR89r0oneZkKPSJceu1w2bGvF4NdUdVms2P+9TPqH3yXcOk+KusTYK2S7bQtCfjQy0E0f1LtjmkVvULrMcqeIXnoho= rak@koios.rak.ac +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIAkMZwqLQYqgXtHpEDK8BnT9Ykz16PiOKM8jQMrAuXCjAAAAIF3200rIEC9Ly9LTxuhkPxorNOrqR5LuaO5R55AmoZ4aAAAAAAAAAAAAAAABAAAAGDIwMjUtNDYtMThUMTU6MDY6MjZaX3JhawAAAAcAAAADcmFrAAAAAGhRjdIAAAAAaULQUgAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAGXAAAAB3NzaC1yc2EAAAADAQABAAABgQCfdeufiJSL4Vbxb11zdbPdEMRt57oAYBILSZpABX7qi2qB7SBTpX0NurliWKHOsJ9WXjqWbqVp9VmXAehuEb+26kLA6LpFlOwJMrO2cF5UH26oq7p2MyQVFuzKpv9rfPrMEXhN7T+pRotU323eJLcxWYrJX68Ai2u9KudgN8wcGebsIwKcn8qPdPfb08CcgQzwaknX5uiiVhqNp7784ZnZ0Q2zvQi13SGWYfZbrO/ufi6X1c9+qtRW7izAvGttTZJNwrIFePWkQQygmtb2oZ1HOD6J+WK91GHwQHPSRfvNoT87XOGrVf8mYnbbCoEVxmpPZ5F1r4tvvc1HbCFydIJAkaPsM9r5oYsEIvHqpQxBo5m3HXj9DDVLktWNYB1ZfiiM6qvz44eDz4IBoou9IUHUNcX+37LuTBgtrJX0GaptpBQwmLGmKX2F6jj0CMIV9Ir+ztjGcEctnEXDF37ApiLioRt8r1yUylAvYaKmePSwqzQZscTvCIv4ralNaAFRBb0AAAGUAAAADHJzYS1zaGEyLTUxMgAAAYBnlZmpn9iD3JNGpQ7IKU508S6nNbDiBgMAqir7PUYo5PM1i/cmiooqCPiwvwA79GXy42u0MCeN1ORQfjIcNJuNIPIXkgxHW84+DJyUvub3V8Vfkeue6o0wPzEfbwHaPBhVgsFPNKUBzqR6pxPl89TNMXBh4h0ErafyC10O1CZ2bgjhOjoHOsMWJXSWbk/Psv902xt1Lb5btGBtbCdIxx9w2PW2zhVnRzyFlMFMvMB5LnKCB+IcRpXBt3yahCIpbEsLUkvso6VSk1YUnIvUHr7kcggXXQ5Q5f4GdJmSI/HctjIX2d5Ax1HDP28pLyVUltEBfmp5cu1A95HlIHAiBHfggzKiN9MCLST5OH0+piOkX1KMWOAPnZPwGW7iIi0g8CQZQSeueamTqwlklsE6NNfpGxWlSJLCZugHkCqfTBpc6buXOkSYQE2N01QgkT2HAun4WvqzuOvjj6oTlLOr8m9h+ke5OMPWMaFdz1ODpf2e5gyT5KZyWljHBfmII/gFSuI= rak@koios.rak.ac diff --git a/private_dot_ssh/private_keys/koios/certs/rak.pub b/private_dot_ssh/private_keys/koios/certs/rak.pub index d209270..7c82e26 100644 --- a/private_dot_ssh/private_keys/koios/certs/rak.pub +++ b/private_dot_ssh/private_keys/koios/certs/rak.pub @@ -1 +1 @@ -ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIE9BYILMIldPxy/stpJaTKDYUyvt9p+fYBQwQiVEzw9cAAAAIF3200rIEC9Ly9LTxuhkPxorNOrqR5LuaO5R55AmoZ4aAAAAAAAAAAAAAAABAAAAGDIwMjQtMDctMTdUMjE6MTI6NDhaX3JhawAAAAcAAAADcmFrAAAAAGdglqQAAAAAaFHZJAAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIOgOV5atVQfbpFQ2R1wkUPy2yoCxzloVMTwUU6j7R4v3AAAAUwAAAAtzc2gtZWQyNTUxOQAAAEC3POuUnEZJaEJz2/4LHYkT+t7IEs3vut4ohesJYTE2Zh36K5aIMn+FlFpDUN9z0ndtSFM5MeSllax/5IZWinkG rak@koios.rak.ac +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIJDHHmbDvflHFCefWKG6QQgmGIxTaWJLKY019ISWSADkAAAAIF3200rIEC9Ly9LTxuhkPxorNOrqR5LuaO5R55AmoZ4aAAAAAAAAAAAAAAABAAAAGDIwMjUtNDYtMThUMTU6MDY6MjZaX3JhawAAAAcAAAADcmFrAAAAAGhRjdIAAAAAaULQUgAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIOgOV5atVQfbpFQ2R1wkUPy2yoCxzloVMTwUU6j7R4v3AAAAUwAAAAtzc2gtZWQyNTUxOQAAAEBXZTnAaivyHUUJVxHnLQ8xFhSZebWjoOeoAmIhdfqDztiJW1DC0CFklGqKTIDCVA3OVyG4k7vU9sHMmwkDD5IM rak@koios.rak.ac |