Merge branch 'master' of git.sr.ht:~secstate/dotfiles

emacs/.config/doom/config.el

@@ -10,7 +10,7 @@
 (setq user-full-name "Colin Powell"
       user-mail-address "colin@onec.me")
 
-(setq doom-theme 'doom-one)
+(setq doom-theme 'kaolin-temple)
 
 ;; Fonts
 (setq doom-font (font-spec :family "Iosevka" :size 14))

emacs/.config/doom/init.el

@@ -34,7 +34,7 @@
        (evil +everywhere); come to the dark side, we have cookies
        file-templates    ; auto-snippets for empty files
        ;;fold
-       (format +onsave)  ; automated prettiness
+       format ;+onsave)  ; automated prettiness
        ;;lispy             ; vim for lisp, for people who dont like vim
        multiple-cursors  ; editing in many places at once
        ;;parinfer          ; turn lisp into python, sort of
@@ -152,19 +152,3 @@
        (default +bindings +smartparens))
 
 (setq evil-want-C-i-jump nil)
-	
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(custom-safe-themes
-   (quote
-    ("43c808b039893c885bdeec885b4f7572141bd9392da7f0bd8d8346e02b2ec8da" "7d4340a89c1f576d1b5dec57635ab93cdc006524bda486b66d01a6f70cffb08e" "030346c2470ddfdaca479610c56a9c2aa3e93d5de3a9696f335fd46417d8d3e4" "0f1733ad53138ddd381267b4033bcb07f5e75cd7f22089c7e650f1bb28fc67f4" "11e0bc5e71825b88527e973b80a84483a2cfa1568592230a32aedac2a32426c1" "ef07cb337554ffebfccff8052827c4a9d55dc2d0bc7f08804470451385d41c5c" "ff829b1ac22bbb7cee5274391bc5c9b3ddb478e0ca0b94d97e23e8ae1a3f0c3e" "fa477d10f10aa808a2d8165a4f7e6cee1ab7f902b6853fbee911a9e27cf346bc" default)))
- '(doom-big-font-mode nil))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )

emacs/.config/doom/packages.el

@@ -54,7 +54,7 @@
 (package! emojify)
 (package! deadgrep)
 (package! org-alert)
-
+(package! kaolin-themes)
 
 ;; modes!
 (package! terraform-mode)

fish/.config/fish/config.fish

@@ -1,4 +1,4 @@
+fzf_key_bindings
 source ~/.asdf/asdf.fish
 set PATH ~/.fzf/bin $PATH
-fzf_key_bindings
 eval (python -m virtualfish)

fish/.config/fish/functions/upgrade.fish

@@ -7,7 +7,7 @@ function upgrade
 	echo "-------- Upgrading DIONE --------"
 	ssh -J rhea.unbl.ink dione.local "sudo apt upgrade -y"
 	echo "-------- Upgrading TITAN --------"
-	ssh -J rhea.unbl.ink titan.local "sudo apt upgrade -y"
+	ssh -J rhea.unbl.ink -t titan.local "sudo apt upgrade -y"
 	echo "-------- Upgrading IAPETUS --------"
 	ssh -J rhea.unbl.ink iapetus.local "sudo apt upgrade -y"
 end

mail/.mbsyncrc

@@ -145,16 +145,31 @@ IMAPStore 15five-remote
 Account 15five
 
 MaildirStore 15five-local
+SubFolders Legacy
 Path ~/Mail/colin.powell@15five.com
 Inbox ~/Mail/colin.powell@15five.com/Inbox
 
-Channel 15five-folders
+Channel 15five-default
 Master :15five-remote:
 Slave :15five-local:
-Patterns "\[Google Mail\]/All Mail" "\[Google Mail\]/Drafts" "\[Google Mail\]/Sent Mail"
+Patterns * ![Gmail]* 
 Create Both
-Expunge Both
 SyncState *
+Sync All
+
+Channel 15five-sent
+Master :15five-remote:"[Gmail]/Sent Mail"
+Slave :15five-local:sent
+Create Slave
+Sync Pull
+
+Channel 15five-trash
+Master :15five-remote:"[Gmail]/Trash"
+Slave :15five-local:trash
+Create Slave
+Sync Pull
 
 Group 15five
-Channel 15five-folders
+Channel 15five-default
+Channel 15five-sent
+Channel 15five-trash

systemd/.config/systemd/user/checkmail.timer

@@ -5,9 +5,9 @@ RefuseManualStop=no
 
 [Timer]
 Persistent=false
-OnBootSec=5min
-OnUnitActiveSec=5min
-Unite=checkmail.service
+OnBootSec=3min
+OnUnitActiveSec=3min
+Unit=checkmail.service
 
 [Install]
 WantedBy=default.target