Merge branch 'master' of github.com:qbit/dotconf

.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 
+

.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',

.cwmrc

@@ -8,13 +8,20 @@ ignore panel
 
 fontname "Go Regular:pixelsize=13"
 
-borderwidth		2
+#borderwidth		2
-color inactiveborder	"#99aab9"
+#color inactiveborder	"#99aab9"
-color font		"#000000"
+#color font		"#000000"
-color activeborder	"#000000"
+#color activeborder	"#000000"
-color menubg		"#ffffea"
+#color menubg		"#ffffea"
-color menufg		"#dedeff"
+#color menufg		"#dedeff"
-color urgencyborder	"red"
+#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"

.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

.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

.gitconfig

@@ -1,7 +1,7 @@
 [user]
 	email = aaron@bolddaemon.com
 	name = Aaron Bieber
-	signingkey = 35863350BFEAC101DB1A4AF01F81112D62A9ADCE
+	signingKey = key::sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIHrYWbbgBkGcOntDqdMaWVZ9xn+dHM+Ap6s1HSAalL28AAAACHNzaDptYWlu
 
 [branch]
 	sort = -committerdate

.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
 

.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 &

bin/mkdiff

@@ -14,8 +14,7 @@ else
 fi
 echo "Created: $fname"
 echo "Syncing..."
-openrsync -a --rsync-path=/usr/bin/openrsync \
+rsync -a  ${HOME}/patches/ suah.dev:/var/www/deftly.net/patches/
-	${HOME}/patches/ suah.dev:/var/www/deftly/patches/
 URL="https://deftly.net/patches/${name}.diff"
 echo ${URL}