Move around #emacs shortcuts

emacs/.config/doom/+mail.el

@@ -19,8 +19,11 @@
   :init
   (map!
    (:leader
-     (:prefix "o"
-       (:desc "APP: Email" "e" #'=mail)))))
+     (:prefix "e"
+       :desc "Open inbox"         "o" #'=mail
+       :desc "Open notmuch"       "n" #'notmuch
+       :desc "Compose an email"   "c" #'notmuch-mua-new-mail))))
+
   (set-evil-initial-state! '(notmuch-hello-mode
                              notmuch-show-mode
                              notmuch-search-mode

emacs/.config/doom/config.el

@@ -70,12 +70,8 @@
       (:prefix "t"
         :desc "Switch themes"           "t" #'load-theme)
       (:prefix "o"
-        :desc "Open imenu"              "i" #'lsp-ui-imenu
         :desc "Elfeed feed reader"      "f" #'elfeed
-        :desc "Lobste.rs"               "l" #'ivy-lobsters
-        :desc "w3m goto URL"            "g" #'w3m-goto-url
-        :desc "w3m search"              "s" #'w3m-search
-        :desc "Compose an email"        "c" #'notmuch-mua-new-mail)
+        :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
@@ -88,6 +84,8 @@
       (:prefix "/"
         :desc "Search project TODOs"    "t" #'+ivy/tasks
         :desc "Search the web"          "w" #'web-search
+        :desc "Goto URL in w3m"         "u" #'w3m-goto-url
+        :desc "Search in w3m"           "3" #'w3m-search
         :desc "Search all the things"   "g" #'deadgrep)
       (:prefix "y"
         :desc "Yank pop!"               "p" #'counsel-yank-pop
@@ -125,12 +123,16 @@
 ;; emacs/eshell
 (after! eshell
   (set-eshell-alias!
-   "f"   "(other-window 1) && find-file $1"
-   "l"   "ls -lh"
-   "d"   "dired $1"
-   "gl"  "(call-interactively 'magit-log-current)"
-   "gs"  "magit-status"
-   "gc"  "magit-commit"))
+   "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!
 
@@ -169,7 +171,7 @@
 (load! "+org")     ;; Org mode stuff like todos and rebindings
 (load! "+org-cal")
 (load! "+nov")     ;; nov.el epub mode settings
-(load! "+elfeed")
+;(load! "+elfeed")
 (load! "+mail")    ;; Mail stuff
 (load! "+ranger")
 (load! "+wttrin")  ;; Weather config

emacs/.config/doom/init.el

@@ -176,47 +176,3 @@
        ;; provides a Spacemacs-inspired keybinding scheme and a smartparens
        ;; config. Use it as a reference for your own modules.
        (default +bindings +smartparens))
-(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.
- '(ansi-color-names-vector
-   ["#242424" "#e5786d" "#95e454" "#cae682" "#8ac6f2" "#333366" "#ccaa8f" "#f6f3e8"])
- '(custom-safe-themes
-   (quote
-    ("2878517f049b28342d7a360fd3f4b227086c4be8f8409f32e0f234d129cee925" "db30f877027b953eb99ad19c0f2f47942085886c97fe82964530849137a74e32" "43c808b039893c885bdeec885b4f7572141bd9392da7f0bd8d8346e02b2ec8da" "3b3573ac73e802a00c9ea11c08f720c2d4dd2a2205a2f33075a828cc23c78c12" "f5568ed375abea716d1bdfae0316d1d179f69972eaccd1f331b3e9863d7e174a" default)))
- '(doom-big-font-mode nil)
- '(fci-rule-color "#BA45A3")
- '(jdee-db-active-breakpoint-face-colors (cons "#131033" "#1ea8fc"))
- '(jdee-db-requested-breakpoint-face-colors (cons "#131033" "#a7da1e"))
- '(jdee-db-spec-breakpoint-face-colors (cons "#131033" "#546A90"))
- '(objed-cursor-color "#e61f44")
- '(vc-annotate-background "#0c0a20")
- '(vc-annotate-color-map
-   (list
-    (cons 20 "#a7da1e")
-    (cons 40 "#c4d814")
-    (cons 60 "#e1d60a")
-    (cons 80 "#ffd400")
-    (cons 100 "#efa314")
-    (cons 120 "#df7329")
-    (cons 140 "#cf433e")
-    (cons 160 "#df3a7d")
-    (cons 180 "#ef32bc")
-    (cons 200 "#ff2afc")
-    (cons 220 "#f626be")
-    (cons 240 "#ee2281")
-    (cons 260 "#e61f44")
-    (cons 280 "#c13157")
-    (cons 300 "#9d4469")
-    (cons 320 "#78577d")
-    (cons 340 "#BA45A3")
-    (cons 360 "#BA45A3")))
- '(vc-annotate-very-old-color 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.
- )

fish/.config/fish/functions/t3.fish

@@ -1,3 +1,3 @@
 function t3
-	~/.screenlayout/titan.sh
+	~/.screenlayout/titan-three.sh
 end