From 55e856146b941142c56ae2d383b371a48a9d4594 Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@unbl.ink>
Date: Wed, 23 Mar 2022 11:35:50 -0400
Subject: [PATCH] Merge with prometheus

---
 emacs/.config/doom/config.org                  | 9 +++++++++
 emacs/.config/doom/custom.el                   | 9 ++++++++-
 emacs/.config/doom/packages.el                 | 1 +
 fish/.config/fish/functions/dj.fish            | 2 +-
 fish/.config/fish/functions/djsh.fish          | 2 +-
 gtk/.config/gtk-3.0/bookmarks                  | 1 +
 gtk/.config/gtk-3.0/settings.ini               | 2 +-
 qutebrowser/.config/qutebrowser/autoconfig.yml | 2 ++
 ssh/.ssh/config                                | 2 --
 9 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/emacs/.config/doom/config.org b/emacs/.config/doom/config.org
index b8514d8..65eb7ae 100644
--- a/emacs/.config/doom/config.org
+++ b/emacs/.config/doom/config.org
@@ -134,6 +134,14 @@ Here we’re going to use Miniflux as a back-end store for our RSS feeds.
 (run-at-time 300 300
              (lambda () (when (= elfeed-curl-queue-active 0)
                           (elfeed-update))))
+;;;;; Database auto-save
+
+  ;; Save elfeed db automatically, because if Emacs crashes or is killed (which happens to me
+  ;; occasionally, especially since I develop packages in a single instance), we'd lose the db
+  ;; updates not saved.
+(unless (cl-loop for timer in timer-idle-list
+                 thereis (equal (aref timer 5) #'elfeed-db-save))
+  (run-with-idle-timer 400 'repeat #'elfeed-db-save))
 #+END_SRC
 
 
@@ -228,6 +236,7 @@ a serif font when I’m writing a lot of words.
            "* TODO %a\n %?\n %i"))
         org-todo-keywords
         '((sequence "TODO(t)" "NEXT(n)" "WAITING(w)" "|" "DONE(d)"))
+        org-fancy-priorities-list '("🅰" "🅱" "🅲" "🅳" "🅴")
         org-modules '(ol-eshell
                       ol-notmuch
                       ob-eval
diff --git a/emacs/.config/doom/custom.el b/emacs/.config/doom/custom.el
index b766e3d..923ed02 100644
--- a/emacs/.config/doom/custom.el
+++ b/emacs/.config/doom/custom.el
@@ -9,7 +9,14 @@
  ;; 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.
- '(package-selected-packages '(selectrum)))
+ '(package-selected-packages '(org-fancy-priorities hackernews selectrum))
+ '(when
+      (or
+       (not
+        (boundp 'ansi-term-color-vector))
+       (not
+        (facep
+         (aref ansi-term-color-vector 0))))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/emacs/.config/doom/packages.el b/emacs/.config/doom/packages.el
index 1306f14..d1cbb1b 100644
--- a/emacs/.config/doom/packages.el
+++ b/emacs/.config/doom/packages.el
@@ -22,6 +22,7 @@
 (package! org-web-tools)
 (package! org-snooze)
 (package! org-alert)
+(package! org-fancy-priorities)
 
 ;; handy tools
 (package! w3m)
diff --git a/fish/.config/fish/functions/dj.fish b/fish/.config/fish/functions/dj.fish
index 1449858..476d7b9 100644
--- a/fish/.config/fish/functions/dj.fish
+++ b/fish/.config/fish/functions/dj.fish
@@ -1,3 +1,3 @@
 function dj
-	django-admin $argv
+	python manage.py $argv
 end
diff --git a/fish/.config/fish/functions/djsh.fish b/fish/.config/fish/functions/djsh.fish
index a23d848..4804f33 100644
--- a/fish/.config/fish/functions/djsh.fish
+++ b/fish/.config/fish/functions/djsh.fish
@@ -1,4 +1,4 @@
 #!/usr/bin/env fish
 function djsh
-	django-admin shell_plus
+	python manage.py shell_plus
 end
diff --git a/gtk/.config/gtk-3.0/bookmarks b/gtk/.config/gtk-3.0/bookmarks
index 6af7db5..1dbf4de 100644
--- a/gtk/.config/gtk-3.0/bookmarks
+++ b/gtk/.config/gtk-3.0/bookmarks
@@ -1,3 +1,4 @@
+file:///media/photos/webcams/weather
 file:///home/powellc/Documents
 file:///home/powellc/Music
 file:///home/powellc/Pictures
diff --git a/gtk/.config/gtk-3.0/settings.ini b/gtk/.config/gtk-3.0/settings.ini
index 2291168..5ff08b8 100644
--- a/gtk/.config/gtk-3.0/settings.ini
+++ b/gtk/.config/gtk-3.0/settings.ini
@@ -1,5 +1,5 @@
 [Settings]
-gtk-theme-name=Yaru-dark
+gtk-theme-name=Arc
 gtk-icon-theme-name=Yaru
 gtk-font-name=Ubuntu Condensed, 11
 gtk-cursor-theme-name=DMZ-Black
diff --git a/qutebrowser/.config/qutebrowser/autoconfig.yml b/qutebrowser/.config/qutebrowser/autoconfig.yml
index 86baa27..90f622a 100644
--- a/qutebrowser/.config/qutebrowser/autoconfig.yml
+++ b/qutebrowser/.config/qutebrowser/autoconfig.yml
@@ -33,6 +33,8 @@ settings:
   content.notifications:
     https://15five.lightning.force.com: true
     https://app.slack.com: true
+    https://askinglot.com: false
+    https://jelly.unbl.ink: true
     https://mailhog.unbl.ink: true
     https://media.unbl.ink: true
   content.register_protocol_handler:
diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index 68a17af..dbdcf8c 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -38,8 +38,6 @@ Host tilde.club
   User secstate
   IdentityFile ~/.ssh/powellc
 
-Host bastion0.local
-  User powellc
 Host bastion1.local
   User powellc