From 3973d398a0d350e9e8f7c9427b226c65f43cfb7d Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 30 Jun 2022 07:33:25 -0600 Subject: [PATCH 01/10] use sshkey for signing --- .gitconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index 555856e..a007fd5 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,7 +1,7 @@ [user] email = aaron@bolddaemon.com name = Aaron Bieber - signingkey = 35863350BFEAC101DB1A4AF01F81112D62A9ADCE + signingKey = key::sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIB1cBO17AFcS2NtIT+rIxR2Fhdu3HD4de4+IsFyKKuGQAAAACnNzaDpsZXNzZXI= [branch] sort = -committerdate @@ -36,7 +36,7 @@ required = true smudge = git-lfs smudge -- %f [commit] - gpgsign = false + gpgsign = true [github] user = qbit From 3c14110b3f8c321a78b53819c35217e6ee9109ba Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Fri, 8 Jul 2022 19:23:55 -0600 Subject: [PATCH 02/10] add allowed_signers --- .allowed_signers | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .allowed_signers diff --git a/.allowed_signers b/.allowed_signers new file mode 100644 index 0000000..2e9588f --- /dev/null +++ b/.allowed_signers @@ -0,0 +1,3 @@ +aaron@bolddaemon.com sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIB1cBO17AFcS2NtIT+rIxR2Fhdu3HD4de4+IsFyKKuGQAAAACnNzaDpsZXNzZXI= +aaron@bolddaemon.com sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIHrYWbbgBkGcOntDqdMaWVZ9xn+dHM+Ap6s1HSAalL28AAAACHNzaDptYWlu + From 703a943136135d0211e8dd9e9e34db6415b70184 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Mon, 25 Jul 2022 06:11:18 -0700 Subject: [PATCH 03/10] nvim: use setup_ts_grammar --- .config/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 9d2dca9..c1bebc3 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -65,6 +65,7 @@ o.hlsearch = true; require'nvim-tree'.setup() +require('orgmode').setup_ts_grammar() require('orgmode').setup({ org_agenda_files = {'~/org/*'}, org_default_notes_file = '~/org/refile.org', From 39b416b21ea15f43d8729b7f1640d7584da773ca Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Mon, 25 Jul 2022 06:11:43 -0700 Subject: [PATCH 04/10] gitconfig: use new yk for signing --- .gitconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index a007fd5..dee1e60 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,7 +1,7 @@ [user] email = aaron@bolddaemon.com name = Aaron Bieber - signingKey = key::sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIB1cBO17AFcS2NtIT+rIxR2Fhdu3HD4de4+IsFyKKuGQAAAACnNzaDpsZXNzZXI= + signingKey = key::sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIHrYWbbgBkGcOntDqdMaWVZ9xn+dHM+Ap6s1HSAalL28AAAACHNzaDptYWlu [branch] sort = -committerdate @@ -36,7 +36,7 @@ required = true smudge = git-lfs smudge -- %f [commit] - gpgsign = true + gpgsign = false [github] user = qbit From 20cfbeb644aaa86426986d022a911850d1f8cc6e Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Mon, 25 Jul 2022 06:12:16 -0700 Subject: [PATCH 05/10] kshrc: fix PKG_PATH with multi-line installurl --- .kshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kshrc b/.kshrc index 100d910..55a8248 100644 --- a/.kshrc +++ b/.kshrc @@ -3,7 +3,7 @@ BROWSER=$(which xdg-open 2>/dev/null) OHMYKSH_DIR=${HOME}/src/ohmyksh OHMYPATCHES=~/patches -PKG_PATH="$(cat /etc/installurl)/snapshots/packages/%a" +PKG_PATH="$(head -n1 /etc/installurl)/snapshots/packages/%a" export GOT_AUTHOR BROWSER OHMYKSH_DIR OHMYPATCHES PKG_PATH From 833df679e2182af974621d0fc8ab30e0aa75e329 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Mon, 25 Jul 2022 15:18:46 -0600 Subject: [PATCH 06/10] xsession: i give up, you can have the .cache, mu --- .xsession | 4 ---- shell.nix | 0 2 files changed, 4 deletions(-) delete mode 100644 shell.nix diff --git a/.xsession b/.xsession index bc513d4..77c35c2 100755 --- a/.xsession +++ b/.xsession @@ -10,10 +10,6 @@ set -A my_paths -- \ paths "${my_paths[@]}" -mv ~/.cache ~/.tcache && \ - mkdir ~/.cache -rm -rf ~/.tcache & - mv ~/Downloads ~/.tdownloads && \ mkdir ~/Downloads rm -rf ~/.tdownloads & diff --git a/shell.nix b/shell.nix deleted file mode 100644 index e69de29..0000000 From 4e521f55932f09ae3159acf789db0c409ad5be4d Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Wed, 27 Jul 2022 08:56:50 -0600 Subject: [PATCH 07/10] emacs/mu: use new syntax --- .emacs.d/readme.org | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/.emacs.d/readme.org b/.emacs.d/readme.org index fed64d1..979944d 100644 --- a/.emacs.d/readme.org +++ b/.emacs.d/readme.org @@ -1106,7 +1106,6 @@ mu init --muhome=/home/qbit/.mu -m /home/qbit/Maildir/fastmail/ --my-address="aa (require 'org-mu4e) (setq mail-user-agent 'mu4e-user-agent mu4e-get-mail-command "mbsync fastmail" - mu4e-mu-home (expand-file-name "~/.mu") mu4e-update-interval 420 mu4e-compose-context-policy nil mu4e-context-policy 'pick-first @@ -1126,60 +1125,48 @@ mu init --muhome=/home/qbit/.mu -m /home/qbit/Maildir/fastmail/ --my-address="aa ((and fname (string-match "\\.diff.gz$" fname)) "~/patches") (t "~/Downloads"))) mu4e-bookmarks - `(,(make-mu4e-bookmark - :name "Inbox" + `(( :name "Inbox" :query "maildir:/Inbox AND NOT flag:trashed" :key ?i) - ,(make-mu4e-bookmark - :name "TODO" + ( :name "TODO" :query "maildir:/TODO AND NOT flag:trashed" :key ?T) - ,(make-mu4e-bookmark - :name "Unread messages" + ( :name "Unread messages" :query "flag:unread AND NOT flag:trashed AND NOT list:ports-changes.openbsd.org AND NOT list:source-changes.openbsd.org" :key ?u) - ,(make-mu4e-bookmark - :name "Today's messages" + ( :name "Today's messages" :query (concat "date:today..now" " AND NOT flag:trashed" " AND NOT list:ports-changes.openbsd.org" " AND NOT list:source-changes.openbsd.org") :key ?d) - ,(make-mu4e-bookmark - :name "Last 7 days" + ( :name "Last 7 days" :query (concat "date:6d..now" " AND NOT flag:trashed" " AND NOT list:ports-changes.openbsd.org" " AND NOT list:source-changes.openbsd.org") :key ?w) - ,(make-mu4e-bookmark - :name "Hackers" + ( :name "Hackers" :query "list:hackers.openbsd.org AND NOT flag:trashed" :key ?h) - ,(make-mu4e-bookmark - :name "Bugs" + ( :name "Bugs" :query "list:bugs.openbsd.org AND NOT flag:trashed" :key ?b) - ,(make-mu4e-bookmark - :name "Tech" + ( :name "Tech" :query "list:tech.openbsd.org AND NOT flag:trashed" :key ?t) - ,(make-mu4e-bookmark - :name "Ports" + ( :name "Ports" :query "list:ports.openbsd.org AND NOT flag:trashed" :key ?p) - ,(make-mu4e-bookmark - :name "Misc" + ( :name "Misc" :query "list:misc.openbsd.org AND NOT flag:trashed" :key ?m) - ,(make-mu4e-bookmark - :name "9front" + ( :name "9front" :query "list:9front.9front.org AND NOT flag:trashed" :key ?9) - ,(make-mu4e-bookmark - :name "GOT" + ( :name "GOT" :query "list:gameoftrees.openbsd.org AND NOT flag:trashed" :key ?g))))) #+end_src From c3985c4759bfa54c8dbc2174df7298db072bf62c Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Sat, 13 Aug 2022 06:13:33 -0600 Subject: [PATCH 08/10] cwm: yoink jrick's config --- .cwmrc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.cwmrc b/.cwmrc index 6228645..eacc9b4 100644 --- a/.cwmrc +++ b/.cwmrc @@ -8,13 +8,20 @@ ignore panel fontname "Go Regular:pixelsize=13" -borderwidth 2 -color inactiveborder "#99aab9" -color font "#000000" -color activeborder "#000000" -color menubg "#ffffea" -color menufg "#dedeff" -color urgencyborder "red" +#borderwidth 2 +#color inactiveborder "#99aab9" +#color font "#000000" +#color activeborder "#000000" +#color menubg "#ffffea" +#color menufg "#dedeff" +#color urgencyborder "red" + +borderwidth 5 +color activeborder "#FFAEAE" +color inactiveborder "#AEAEAE" +color menubg "#EAFFFF" +color menufg "#8888CC" +color selfont "#000000" command "Browser" "~/bin/browser" command "XTerm" "/usr/X11R6/bin/xterm" From c9761f36b29e5867f68ea79b808e2404c15f9f94 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Sat, 13 Aug 2022 06:13:50 -0600 Subject: [PATCH 09/10] fvwm: use full path to xterm --- .fvwmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.fvwmrc b/.fvwmrc index 39848dc..a8c2d42 100644 --- a/.fvwmrc +++ b/.fvwmrc @@ -99,7 +99,7 @@ AddToMenu IDEMenu "IDEs" Title + "IntelliJ" exec /usr/local/bin/intellij AddToMenu RootMenu "Root Menu" Title -+ "XTerm" Exec exec xterm ++ "XTerm" Exec exec /usr/X11R6/bin/xterm + "Browser" Exec exec chrome + "Emacs" Exec exec /usr/local/bin/emacs + "" Nop From 9f234b5c2b23e5a8e76155180043140ee7232648 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Sat, 13 Aug 2022 06:14:01 -0600 Subject: [PATCH 10/10] mkdiff: switch to rsync --- bin/mkdiff | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/mkdiff b/bin/mkdiff index af09595..157b658 100755 --- a/bin/mkdiff +++ b/bin/mkdiff @@ -14,8 +14,7 @@ else fi echo "Created: $fname" echo "Syncing..." -openrsync -a --rsync-path=/usr/bin/openrsync \ - ${HOME}/patches/ suah.dev:/var/www/deftly/patches/ +rsync -a ${HOME}/patches/ suah.dev:/var/www/deftly.net/patches/ URL="https://deftly.net/patches/${name}.diff" echo ${URL}