Break out #emacs config a little better

emacs/.config/doom/+eshell.el

@@ -0,0 +1,14 @@
+;;; ~/.dotfiles/emacs/.config/doom/+eshell.el -*- lexical-binding: t; -*-
+
+(after! eshell
+  (set-eshell-alias!
+   "f"     "(other-window 1) && find-file $1"
+   "l"     "ls -lh"
+   "d"     "dired $1"
+   "dc"    "docker-compose $*"
+   "fftest"  "cd ~/src/ff/fifteen5 && docker-compose exec app django-admin test -k $*"
+   "ffsh"  "cd ~/src/ff/fifteen5/ && docker-compose exec app django-admin shell_plus"
+   "ffdj"  "cd ~/src/ff/fifteen5/ && docker-compose exec app django-admin $*"
+   "gl"    "(call-interactively 'magit-log-current)"
+   "gs"    "magit-status"
+   "gc"    "magit-commit"))

emacs/.config/doom/+mail.el

@@ -446,3 +446,12 @@ with `notmuch-hello-query-counts'."
 (setq message-default-mail-headers "Cc: \nBcc: \n")
 (setq message-auto-save-directory "~/Mail/colin@onec.me/Drafts/")
 (setq message-directory "~/Mail/colin@onec.me/")
+
+;;; Setup sending email with msmtp
+(setq send-mail-function 'sendmail-send-it
+      sendmail-program "/usr/local/bin/msmtp"
+      mail-specify-envelope-from t
+      message-sendmail-f-is-evil t
+      message-sendmail-envelope-from 'header
+      message-sendmail-extra-arguments '("--read-envelope-from")
+      mail-envelope-from 'header)

emacs/.config/doom/+mastodon.el

@@ -0,0 +1,9 @@
+;;; ~/.dotfiles/emacs/.config/doom/+mastodon.el -*- lexical-binding: t; -*-
+
+(setq mastodon-instance-url "https://mastodon.technology")
+
+(map! :leader
+      (:prefix "="
+        :desc "Open mastodon"                "=" #'mastodon
+        :desc "Update Mastodon timeline"     "u" #'mastodon-tl--update
+        :desc "Toot to Mastodon"             "t" #'mastodon-toot))

emacs/.config/doom/+mpd.el

@@ -0,0 +1,15 @@
+;;; ~/.dotfiles/emacs/.config/doom/+mpd.el -*- lexical-binding: t; -*-
+(defun mpdel-playlist-play ()
+  "Start playing the song at point."
+  (interactive)
+  (if (derived-mode-p 'mpdel-playlist-current-playlist-mode)
+      (libmpdel-play-song (navigel-entity-at-point))
+    (mpdel-core-insert-current-playlist)))
+
+(map! :leader
+      (:prefix "-"
+        :desc "MPD Open playlist"       "-" #'mpdel-playlist-open
+        :desc "MPD Remove at point"     "d" #'mpdel-playlist-delete
+        :desc "MPD Start at point"      "s" #'mpdel-playlist-play
+        :desc "MPD Next track"          "n" #'libmpdel-playback-next
+        :desc "MPD Previous track"      "p" #'libmpdel-playback-previous))

emacs/.config/doom/+org.el

@@ -33,9 +33,10 @@
                "* TODO %?\n  %i\n  %a")
               ("w" "Work diary entry" entry (file "~/org/work_diary.org")
                "* %u\n%?\n")
+              ("u" "Add unblink entry" entry (file+headline "~/org/unblink.org" "Misc")
+               "* TITLE\n:PROPERTIES:\n:EXPORT_FILE_NAME: TITLE\n:EXPORT_DATE: %i\n:END:\n%?\n")
               ("n" "Add an idea" entry (file "~/org/ideas.org")
                "*  %?\nEntered on %U\n"))
-
         org-todo-keywords
             '((sequence "TODO(t)" "NEXT(n)" "MAYBE(m)" "|" "DONE(d)" "WONTDO(w)"))
 

emacs/.config/doom/config.el

@@ -72,12 +72,6 @@
       (:prefix "o"
         :desc "Elfeed feed reader"      "f" #'elfeed
         :desc "Lobste.rs"               "l" #'ivy-lobsters)
-      (:prefix "l"
-        :desc "MPD Open playlist"       "o" #'mpdel-playlist-open
-        :desc "MPD Remove at point"     "d" #'mpdel-playlist-delete
-        :desc "MPD Start at point"      "s" #'mpdel-playlist-play
-        :desc "MPD Next track"          "n" #'libmpdel-playback-next
-        :desc "MPD Previous track"      "p" #'libmpdel-playback-previous)
       (:prefix "b"
         :desc "Black format buffer"     "f" #'blacken-buffer
         :desc "Links in buffer"         "l" #'ace-link-org)
@@ -120,20 +114,6 @@
 (setq rmh-elfeed-org-files (list "~/org/elfeed.org")
       elfeed-search-filter "@1-week-ago +unread ")
 
-;; emacs/eshell
-(after! eshell
-  (set-eshell-alias!
-   "f"     "(other-window 1) && find-file $1"
-   "l"     "ls -lh"
-   "d"     "dired $1"
-   "dc"    "docker-compose $*"
-   "fftest"  "cd ~/src/ff/fifteen5 && docker-compose exec app django-admin test -k $*"
-   "ffsh"  "cd ~/src/ff/fifteen5/ && docker-compose exec app django-admin shell_plus"
-   "ffdj"  "cd ~/src/ff/fifteen5/ && docker-compose exec app django-admin $*"
-   "gl"    "(call-interactively 'magit-log-current)"
-   "gs"    "magit-status"
-   "gc"    "magit-commit"))
-
 (add-hook 'prog-mode-hook #'goto-address-mode) ;; Linkify links!
 
 ;; tools/deft
@@ -144,14 +124,6 @@
 (setq magit-repository-directories '(("~/work" . 2))
       magit-save-repository-buffers nil)
 
-;;; Setup sending email with msmtp
-(setq send-mail-function 'sendmail-send-it
-      sendmail-program "/usr/local/bin/msmtp"
-      mail-specify-envelope-from t
-      message-sendmail-f-is-evil t
-      message-sendmail-envelope-from 'header
-      message-sendmail-extra-arguments '("--read-envelope-from")
-      mail-envelope-from 'header)
 
 ;;; It is the opposite of fill-paragraph
 (defun unfill-paragraph ()
@@ -162,26 +134,21 @@
 ;; Handy key definition
 (define-key global-map "\M-z" 'unfill-paragraph)
 
-(achievements-mode)
+; add a v
 (nyan-mode)
-
 (add-to-list 'auto-mode-alist '("\\.plantuml\\'" . planetuml-mode))
 
 (load! "+ui.el")
 (load! "+org")     ;; Org mode stuff like todos and rebindings
 (load! "+org-cal")
 (load! "+nov")     ;; nov.el epub mode settings
-;(load! "+elfeed")
 (load! "+mail")    ;; Mail stuff
+(load! "+eshell")
+(load! "+mpd")
 (load! "+ranger")
+(load! "+mastodon")
 (load! "+wttrin")  ;; Weather config
-
-(defun mpdel-playlist-play ()
-  "Start playing the song at point."
-  (interactive)
-  (if (derived-mode-p 'mpdel-playlist-current-playlist-mode)
-      (libmpdel-play-song (navigel-entity-at-point))
-    (mpdel-core-insert-current-playlist)))
+;(load! "+elfeed")  ;; This runs a background web process ...
 
 ;; findout timezone location strings at http://worldtime.io
 (setq display-time-world-list '(("America/Los_Angeles" "San Francisco")
@@ -190,3 +157,4 @@
                                 ("Europe/London" "London")
                                 ("Europe/Warsaw" "Warsaw")
                                 ("Europe/Kiev" "Lviv")))
+

emacs/.config/doom/init.el

@@ -185,7 +185,7 @@
    ["#2b2a27" "#ff5d38" "#98be65" "#bcd42a" "#51afef" "#c678dd" "#46D9FF" "#ede0ce"])
  '(custom-safe-themes
    (quote
-    ("a70b47c87e9b0940f6fece46656200acbfbc55e129f03178de8f50934ac89f58" "1f36ca86913068b7d8377a327394eecfff71be34119619f779cb229875ceec0c" "0eb3c0868ff890b0c4ee138069ce2a8936a8a69ba150efa6bfb9fb7c05af5ec3" "001c2ff8afde9c3e707a2eb3e810a0a36fb2b466e96377ac95968e7f8930a7c5" "2a3ffb7775b2fe3643b179f2046493891b0d1153e57ec74bbe69580b951699ca" "0fe9f7a04e7a00ad99ecacc875c8ccb4153204e29d3e57e9669691e6ed8340ce" "f951343d4bbe5a90dba0f058de8317ca58a6822faa65d8463b0e751a07ec887c" "423435c7b0e6c0942f16519fa9e17793da940184a50201a4d932eafe4c94c92d" "cdb3e7a8864cede434b168c9a060bf853eeb5b3f9f758310d2a2e23be41a24ae" "70cc30fd9d27a8d0d3ae82974ac2c409fd2cd5746470e2246778c6bec2d4857c" "5e96177f8bd6762e3f167fb7f5b6199fbff81704f654c66c772cd326d4fb78e3" "2878517f049b28342d7a360fd3f4b227086c4be8f8409f32e0f234d129cee925" "f30aded97e67a487d30f38a1ac48eddb49fdb06ac01ebeaff39439997cbdd869" default)))
+    ("528d0ed2f87187406f4db88879555f03f1c9478018a49e2e35c84b666c97d44a" "a70b47c87e9b0940f6fece46656200acbfbc55e129f03178de8f50934ac89f58" "1f36ca86913068b7d8377a327394eecfff71be34119619f779cb229875ceec0c" "0eb3c0868ff890b0c4ee138069ce2a8936a8a69ba150efa6bfb9fb7c05af5ec3" "001c2ff8afde9c3e707a2eb3e810a0a36fb2b466e96377ac95968e7f8930a7c5" "2a3ffb7775b2fe3643b179f2046493891b0d1153e57ec74bbe69580b951699ca" "0fe9f7a04e7a00ad99ecacc875c8ccb4153204e29d3e57e9669691e6ed8340ce" "f951343d4bbe5a90dba0f058de8317ca58a6822faa65d8463b0e751a07ec887c" "423435c7b0e6c0942f16519fa9e17793da940184a50201a4d932eafe4c94c92d" "cdb3e7a8864cede434b168c9a060bf853eeb5b3f9f758310d2a2e23be41a24ae" "70cc30fd9d27a8d0d3ae82974ac2c409fd2cd5746470e2246778c6bec2d4857c" "5e96177f8bd6762e3f167fb7f5b6199fbff81704f654c66c772cd326d4fb78e3" "2878517f049b28342d7a360fd3f4b227086c4be8f8409f32e0f234d129cee925" "f30aded97e67a487d30f38a1ac48eddb49fdb06ac01ebeaff39439997cbdd869" default)))
  '(fci-rule-color "#5B6268")
  '(jdee-db-active-breakpoint-face-colors (cons "#2b2a27" "#ff5d38"))
  '(jdee-db-requested-breakpoint-face-colors (cons "#2b2a27" "#98be65"))

emacs/.config/doom/packages.el

@@ -60,7 +60,6 @@
 (package! deadgrep)
 (package! kaolin-themes)
 (package! magit-circleci)
-(package! achievements)
 (package! nyan-mode)
 
 ; provides typographical replacements