aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.chezmoiremove3
-rw-r--r--.gitmodules3
-rw-r--r--dot_config/environment.d/01_PATH.conf2
-rw-r--r--dot_config/isyncrc.tmpl4
-rw-r--r--dot_config/msmtp/config2
-rw-r--r--dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc3
-rw-r--r--dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc2
-rw-r--r--dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl5
-rw-r--r--dot_config/sh/10_aliases6
-rw-r--r--dot_config/systemd/user/ssh-agent.service.d/override.conf11
-rw-r--r--dot_config/systemd/user/swaybg-random.service2
-rw-r--r--dot_emacs243
-rw-r--r--dot_local/bin/executable_Internet.m3u.sh (renamed from bin/executable_Internet.m3u.sh)0
-rwxr-xr-xdot_local/bin/executable_copyright.awk (renamed from bin/executable_copyright.awk)0
-rwxr-xr-xdot_local/bin/executable_do_blue.sh (renamed from bin/executable_do_blue.sh)0
-rwxr-xr-xdot_local/bin/executable_do_dac.sh (renamed from bin/executable_do_dac.sh)0
-rwxr-xr-xdot_local/bin/executable_do_speakers.sh (renamed from bin/executable_do_speakers.sh)0
-rwxr-xr-xdot_local/bin/executable_icd (renamed from bin/executable_icd)0
-rwxr-xr-xdot_local/bin/executable_lbdb-fetchaddr-wrapper (renamed from bin/executable_lbdb-fetchaddr-wrapper)0
-rw-r--r--dot_local/bin/executable_lfoot (renamed from bin/executable_lfoot)0
-rwxr-xr-xdot_local/bin/executable_mailx-alias (renamed from bin/executable_mailx-alias)0
-rwxr-xr-xdot_local/bin/executable_mice.sh (renamed from bin/executable_mice.sh)0
-rwxr-xr-xdot_local/bin/executable_mpd_only.sh (renamed from bin/executable_mpd_only.sh)0
-rwxr-xr-xdot_local/bin/executable_mpd_others.sh (renamed from bin/executable_mpd_others.sh)0
-rwxr-xr-xdot_local/bin/executable_mutt-fetchbug (renamed from bin/executable_mutt-fetchbug)0
-rwxr-xr-xdot_local/bin/executable_mutt_bgrun (renamed from bin/executable_mutt_bgrun)0
-rw-r--r--dot_local/bin/executable_mutt_oauth2.py (renamed from bin/executable_mutt_oauth2.py)0
-rwxr-xr-xdot_local/bin/executable_ptmp (renamed from bin/executable_ptmp)0
-rwxr-xr-xdot_local/bin/executable_startaudio (renamed from bin/executable_startaudio)0
-rw-r--r--dot_local/bin/executable_swaybg-random (renamed from bin/executable_swaybg-random)0
-rwxr-xr-xdot_local/bin/executable_tmcg (renamed from bin/executable_tmcg)0
-rwxr-xr-xdot_local/bin/executable_wd-bak (renamed from bin/executable_wd-bak)0
-rw-r--r--dot_local/bin/executable_wd-mount (renamed from bin/executable_wd-mount)0
-rw-r--r--dot_local/bin/executable_wd-umount (renamed from bin/executable_wd-umount)0
-rw-r--r--dot_local/bin/executable_wofi-window-switcher (renamed from bin/executable_wofi-window-switcher)0
-rw-r--r--dot_local/lib/openssh/executable_agent-launch47
-rw-r--r--equivs/rak-meta/debian/changelog14
-rw-r--r--equivs/rak-meta/debian/control2
-rw-r--r--private_dot_ssh/private_keys/asteria/certs/eos.rak.ac.pub2
-rw-r--r--private_dot_ssh/private_keys/asteria/certs/hades.rak.ac.pub2
-rw-r--r--private_dot_ssh/private_keys/asteria/certs/rak.pub2
-rw-r--r--private_dot_ssh/private_keys/koios/certs/eos.rak.ac.pub2
-rw-r--r--private_dot_ssh/private_keys/koios/certs/hades.rak.ac.pub2
-rw-r--r--private_dot_ssh/private_keys/koios/certs/rak.pub2
44 files changed, 183 insertions, 178 deletions
diff --git a/.chezmoiremove b/.chezmoiremove
index ff30391..9e6654f 100644
--- a/.chezmoiremove
+++ b/.chezmoiremove
@@ -9,10 +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_config/isyncrc.tmpl b/dot_config/isyncrc.tmpl
index 0d4db33..39cce29 100644
--- a/dot_config/isyncrc.tmpl
+++ b/dot_config/isyncrc.tmpl
@@ -15,8 +15,8 @@ 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
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/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
diff --git a/dot_emacs b/dot_emacs
index b181f0c..097e8bd 100644
--- a/dot_emacs
+++ b/dot_emacs
@@ -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
@@ -52,18 +56,18 @@
(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))
@@ -86,7 +90,7 @@
(?? aw-show-dispatch-help))))
(use-package aggressive-indent
- :ensure t
+ :straight t
:config
(global-aggressive-indent-mode 1))
@@ -94,7 +98,7 @@
:diminish auto-revert-mode)
(use-package avy
- :ensure t
+ :straight t
:config
(avy-setup-default)
:bind
@@ -221,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/"))
@@ -230,7 +234,7 @@ Extended Format date in the date field and return it as a string obeing
(bibtex-completion-pdf-extension '(".pdf" ".djvu" ".txt")))
(use-package cape
- :ensure t
+ :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-+
@@ -250,16 +254,16 @@ Extended Format date in the date field and return it as a string obeing
(c-default-style "bsd"))
(use-package company-bibtex
- :ensure t
+ :straight t
:hook
(bibtex-mode . (lambda () (add-to-list 'company-backends 'company-bibtex))))
(use-package company-coq
- :ensure t
+ :straight t
:hook (coq-mode . company-coq-mode))
(use-package consult
- :ensure t
+ :straight t
:bind
(("C-x b" . consult-buffer)
("C-x C-f" . find-file)
@@ -287,7 +291,7 @@ Extended Format date in the date field and return it as a string obeing
(setq consult-mu-embark-attach-file-key "C-a")
(use-package corfu
- :ensure t
+ :straight t
:bind
(:map corfu-map
("SPC" . corfu-insert-separator))
@@ -295,7 +299,7 @@ Extended Format date in the date field and return it as a string obeing
(global-corfu-mode))
(use-package csv-mode
- :ensure t)
+ :straight t)
(use-package cus-edit
:custom
@@ -303,7 +307,7 @@ Extended Format date in the date field and return it as a string obeing
;; Use Dabbrev with Corfu!
(use-package dabbrev
- :ensure t
+ :straight t
;; Swap M-/ and C-M-/
:bind (("M-/" . dabbrev-completion)
("C-M-/" . dabbrev-expand))
@@ -315,7 +319,7 @@ Extended Format date in the date field and return it as a string obeing
(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)
@@ -324,36 +328,36 @@ 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
- :ensure t
+ :straight t
:bind
(("C-." . embark-act) ;; Begin the embark process
("C-;" . embark-dwim) ;; good alternative: M-.
@@ -361,27 +365,64 @@ Extended Format date in the date field and return it as a string obeing
)
(use-package embark-consult
- :ensure t)
+ :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
@@ -396,7 +437,7 @@ Extended Format date in the date field and return it as a string obeing
("C-;" . flyspell-correct-wrapper)))
(use-package gnus
- :ensure t
+ :straight t
:defer t
:bind
;; (:map gnus-summary-buffer-map
@@ -446,28 +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-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
@@ -539,7 +580,7 @@ Otherwise split the current paragraph into one sentence per line."
("M-q" . ales/fill-paragraph)))
(use-package lsp-mode
- :ensure t
+ :straight t
:custom
(lsp-completion-provider :none) ;; we use Corfu!
:init
@@ -550,28 +591,32 @@ Otherwise split the current paragraph into one sentence per line."
(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
- :ensure t
+ :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
@@ -581,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
@@ -594,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
@@ -609,7 +654,7 @@ Otherwise split the current paragraph into one sentence per line."
(mpc-host "asteria.home.arpa"))
(use-package mu4e
- :ensure t
+ :straight t
:bind
(("<f6>" . mu4e))
:config
@@ -739,7 +784,7 @@ Otherwise split the current paragraph into one sentence per line."
("/queensu/INBOX" . ?q))))
(use-package mu4e-column-faces
- :ensure t
+ :straight t
:after mu4e
:config (mu4e-column-faces-mode))
@@ -748,16 +793,16 @@ Otherwise split the current paragraph into one sentence per line."
: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
- :ensure t
+ :straight t
:custom
;; Configure a custom style dispatcher (see the Consult wiki)
;; (orderless-style-dispatchers '(+orderless-consult-dispatch orderless-affix-dispatch))
@@ -775,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},
@@ -835,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")
@@ -887,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
@@ -1034,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
@@ -1062,7 +1107,7 @@ If not, issue a warning."
(show-paren-style 'expression))
(use-package pdf-tools
- :ensure t
+ :straight t
:config
(pdf-tools-install))
@@ -1072,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)
@@ -1085,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)
@@ -1101,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
@@ -1141,7 +1186,7 @@ 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
@@ -1168,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
@@ -1181,11 +1226,11 @@ If not, issue a warning."
(calendar-location-name "Montreal, QC"))
(use-package spaceline
- :ensure t
+ :straight t
:requires spaceline-config)
(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.
@@ -1219,7 +1264,7 @@ 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))
@@ -1229,7 +1274,7 @@ If not, issue a warning."
(add-to-list 'vc-handled-backends 'git))
(use-package vertico
- :ensure t
+ :straight t
:custom
(vertico-scroll-margin 0) ;; Different scroll margin
(vertico-count 20) ;; Show more candidates
@@ -1239,25 +1284,25 @@ If not, issue a warning."
(vertico-mode))
(use-package vertico-directory
- :ensure vertico)
+ :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