projects / ~bandali / configs / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
emacs: update packages, fix indentation, set dired-dwim-target
[~bandali/configs] / .emacs.d / init.el
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 55e63b7..eb739a4 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -490,6 +490,11 @@ For disabling the behaviour for certain buffers and/or modes."
   :custom
   ((epg-gpg-program (executable-find "gpg"))))
 
   :custom
   ((epg-gpg-program (executable-find "gpg"))))
 
+(use-feature auth-source
+  :custom
+  (auth-sources '("~/.authinfo.gpg"))
+  (authinfo-hidden (regexp-opt '("password" "client-secret" "token"))))
+
 \f
 ;;; General bindings
 
 \f
 ;;; General bindings
 
@@ -1123,7 +1128,8 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (use-feature dired
   :config
 
 (use-feature dired
   :config
-  (setq dired-listing-switches "-alh"
+  (setq dired-dwim-target t
+        dired-listing-switches "-alh"
         ls-lisp-use-insert-directory-program nil)
 
   ;; easily diff 2 marked files
         ls-lisp-use-insert-directory-program nil)
 
   ;; easily diff 2 marked files
@@ -1329,7 +1335,8 @@ This function is intended for use with `ivy-ignore-buffers'."
 (use-package alloy-mode
   :straight (:host github :repo "dwwmmn/alloy-mode")
   :mode "\\.als\\'"
 (use-package alloy-mode
   :straight (:host github :repo "dwwmmn/alloy-mode")
   :mode "\\.als\\'"
-  :config (setq alloy-basic-offset 2))
+  :config (setq alloy-basic-offset 2)
+  :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil))))
 
 (eval-when-compile (defvar lean-mode-map))
 (use-package lean-mode
 
 (eval-when-compile (defvar lean-mode-map))
 (use-package lean-mode
@@ -1541,7 +1548,7 @@ This function is intended for use with `ivy-ignore-buffers'."
     (set-face-attribute 'mode-line-inactive nil :underline  line)
     (set-face-attribute 'mode-line          nil :box        nil)
     (set-face-attribute 'mode-line-inactive nil :box        nil)
     (set-face-attribute 'mode-line-inactive nil :underline  line)
     (set-face-attribute 'mode-line          nil :box        nil)
     (set-face-attribute 'mode-line-inactive nil :box        nil)
-    (set-face-attribute 'mode-line-inactive nil :background "#eeeeee")) ; d3d7cf
+    (set-face-attribute 'mode-line-inactive nil :background "#e1e1e1")) ; d3d7cf
   (moody-replace-mode-line-buffer-identification)
   (moody-replace-vc-mode))
 
   (moody-replace-mode-line-buffer-identification)
   (moody-replace-vc-mode))
 
@@ -1737,8 +1744,8 @@ This function is intended for use with `ivy-ignore-buffers'."
   :defer 0.5
   :config
   (typo-global-mode 1)
   :defer 0.5
   :config
   (typo-global-mode 1)
-  :hook (((text-mode erc-mode) . typo-mode)
-         (tex-mode             . (lambda ()(typo-mode -1)))))
+  :hook (((text-mode erc-mode web-mode) . typo-mode)
+         (tex-mode                      . (lambda ()(typo-mode -1)))))
 
 ;; highlight TODOs in buffers
 (use-package hl-todo
 
 ;; highlight TODOs in buffers
 (use-package hl-todo
@@ -1750,16 +1757,17 @@ This function is intended for use with `ivy-ignore-buffers'."
   :defer 0.5
   :after eshell
   :config
   :defer 0.5
   :after eshell
   :config
-  (defvar user-@-host (concat (user-login-name) "@" (system-name) " "))
+  (defvar user-@-host (concat (user-login-name) "@" (system-name) ":"))
   (defun +eshell/prompt ()
   (defun +eshell/prompt ()
-    (let ((base/dir (shrink-path-prompt default-directory)))
-      (concat (propertize user-@-host 'face 'default)
-              (propertize (car base/dir)
-                          'face 'font-lock-comment-face)
-              (propertize (cdr base/dir)
-                          'face 'font-lock-constant-face)
-              (propertize "> " 'face 'default))))
-  (setq eshell-prompt-regexp (concat user-@-host ".*> ")
+    (concat (propertize user-@-host 'face 'default)
+            (propertize (abbreviate-file-name default-directory)
+                        'face 'font-lock-comment-face)
+            (propertize "\n" 'face 'default)
+            (if (= (user-uid) 0)
+                (propertize "#" 'face 'red)
+              (propertize "$" 'face 'default))
+            (propertize " " 'face 'default)))
+  (setq eshell-prompt-regexp "\\(.*\n\\)*[$#] "
         eshell-prompt-function #'+eshell/prompt))
 
 (use-package eshell-up
         eshell-prompt-function #'+eshell/prompt))
 
 (use-package eshell-up
@@ -1885,6 +1893,7 @@ This function is intended for use with `ivy-ignore-buffers'."
 ;; (use-package fill-column-indicator)
 
 (use-package emojify
 ;; (use-package fill-column-indicator)
 
 (use-package emojify
+  :disabled
   :hook (erc-mode . emojify-mode))
 
 (use-feature window
   :hook (erc-mode . emojify-mode))
 
 (use-feature window
@@ -1973,6 +1982,13 @@ This function is intended for use with `ivy-ignore-buffers'."
   :config
   (eosd-start))
 
   :config
   (eosd-start))
 
+(use-package nnreddit
+  :disabled
+  :demand
+  :after gnus
+  :custom
+  (nnreddit-python-command "python3"))
+
 \f
 ;;; Email (with Gnus)
 
 \f
 ;;; Email (with Gnus)
 
@@ -1995,41 +2011,41 @@ This function is intended for use with `ivy-ignore-buffers'."
    gnus-select-method '(nnnil "")
    gnus-secondary-select-methods
    '((nnimap "shemshak"
    gnus-select-method '(nnnil "")
    gnus-secondary-select-methods
    '((nnimap "shemshak"
-            (nnimap-stream plain)
-            (nnimap-address "127.0.0.1")
-            (nnimap-server-port 143)
-            (nnimap-authenticator plain)
-            (nnimap-user "amin@shemshak.local"))
+             (nnimap-stream plain)
+             (nnimap-address "127.0.0.1")
+             (nnimap-server-port 143)
+             (nnimap-authenticator plain)
+             (nnimap-user "amin@shemshak.local"))
      (nnimap "gnu"
      (nnimap "gnu"
-            (nnimap-stream plain)
-            (nnimap-address "127.0.0.1")
-            (nnimap-server-port 143)
-            (nnimap-authenticator plain)
-            (nnimap-user "bandali@gnu.local")
-            (nnimap-inbox "INBOX")
-            (nnimap-split-methods 'nnimap-split-fancy)
-            (nnimap-split-fancy (|
-                                 ;; (: gnus-registry-split-fancy-with-parent)
-                                 ;; (: gnus-group-split-fancy "INBOX" t "INBOX")
-                                 ;; gnu
-                                 (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
-                                 ;; *.lists.sr.ht, omitting one dot if present
-                                 ;;    add more \\.?\\([^.]*\\) if needed
-                                 (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists.sr.ht>.*" "l.~\\1.\\2\\3")
-                                 ;; webmasters
-                                 (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
-                                 ;; other
-                                 (list ".*atreus.freelists.org" "l.atreus")
-                                 (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
-                                 ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d
-                                 (list ".*haskell-cafe.haskell.org" "l.haskell-cafe")
-                                 ;; (list ".*notmuch.notmuchmail.org" "l.notmuch") ;u
-                                 ;; (list ".*dev.lists.parabola.nu" "l.parabola-dev") ;u
-                                 ;; ----------------------------------
-                                 ;; legend: (u)nsubscribed | (d)ead
-                                 ;; ----------------------------------
-                                 ;; otherwise, leave mail in INBOX
-                                 "INBOX")))
+             (nnimap-stream plain)
+             (nnimap-address "127.0.0.1")
+             (nnimap-server-port 143)
+             (nnimap-authenticator plain)
+             (nnimap-user "bandali@gnu.local")
+             (nnimap-inbox "INBOX")
+             (nnimap-split-methods 'nnimap-split-fancy)
+             (nnimap-split-fancy (|
+                                  ;; (: gnus-registry-split-fancy-with-parent)
+                                  ;; (: gnus-group-split-fancy "INBOX" t "INBOX")
+                                  ;; gnu
+                                  (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
+                                  ;; *.lists.sr.ht, omitting one dot if present
+                                  ;;    add more \\.?\\([^.]*\\) if needed
+                                  (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists.sr.ht>.*" "l.~\\1.\\2\\3")
+                                  ;; webmasters
+                                  (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
+                                  ;; other
+                                  (list ".*atreus.freelists.org" "l.atreus")
+                                  (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
+                                  ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d
+                                  (list ".*haskell-cafe.haskell.org" "l.haskell-cafe")
+                                  ;; (list ".*notmuch.notmuchmail.org" "l.notmuch") ;u
+                                  ;; (list ".*dev.lists.parabola.nu" "l.parabola-dev") ;u
+                                  ;; ----------------------------------
+                                  ;; legend: (u)nsubscribed | (d)ead
+                                  ;; ----------------------------------
+                                  ;; otherwise, leave mail in INBOX
+                                  "INBOX")))
      (nnimap "uw"
              (nnimap-stream plain)
              (nnimap-address "127.0.0.1")
      (nnimap "uw"
              (nnimap-stream plain)
              (nnimap-address "127.0.0.1")
@@ -2051,7 +2067,7 @@ This function is intended for use with `ivy-ignore-buffers'."
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
              (nnimap-user "abandali@csc.uw.local")))
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
              (nnimap-user "abandali@csc.uw.local")))
-   gnus-message-archive-group "nnimap+shemshak:Sent"
+   gnus-message-archive-group "nnimap+gnu:INBOX"
    gnus-parameters
    '(("l\\.atreus"
       (to-address . "atreus@freelists.org")
    gnus-parameters
    '(("l\\.atreus"
       (to-address . "atreus@freelists.org")
@@ -2272,14 +2288,15 @@ Computer Science Club, University of Waterloo
 https://csclub.uwaterloo.ca/~abandali")
   (setq gnus-posting-styles
         '((".*"
 https://csclub.uwaterloo.ca/~abandali")
   (setq gnus-posting-styles
         '((".*"
+           (address "bandali@gnu.org")
+           (signature b/gnu-signature)
+           (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org")))
+          ("nnimap\\+shemshak:.*"
            (address "amin@shemshak.org")
            (body "\nBest,\n")
            (signature b/signature)
            (address "amin@shemshak.org")
            (body "\nBest,\n")
            (signature b/signature)
+           (gcc "nnimap+shemshak:Sent")
            (eval (setq b/message-cite-say-hi t)))
            (eval (setq b/message-cite-say-hi t)))
-          ("nnimap\\+gnu:.*"
-           (address "bandali@gnu.org")
-           (signature b/gnu-signature)
-           (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org")))
           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")
            (body "")
           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")
            (body "")
@@ -2290,7 +2307,7 @@ https://csclub.uwaterloo.ca/~abandali")
           ("nnimap\\+uw:INBOX"
            (gcc "\"nnimap+uw:Sent Items\""))
           ("nnimap\\+csc:.*"
           ("nnimap\\+uw:INBOX"
            (gcc "\"nnimap+uw:Sent Items\""))
           ("nnimap\\+csc:.*"
-           (address "abandali@csclub.uwaterloo.ca")
+           (address "bandali@csclub.uwaterloo.ca")
            (signature b/csc-signature)
            (gcc "nnimap+csc:Sent")))))
 
            (signature b/csc-signature)
            (gcc "nnimap+csc:Sent")))))
 
@@ -2368,7 +2385,7 @@ https://csclub.uwaterloo.ca/~abandali")
         message-subscribed-address-functions
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names
         message-subscribed-address-functions
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names
-        "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(amin@bndl\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(\\(a\\(min\\.\\)?\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)")
+        "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)")
   (require 'company-ebdb)
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)
   (require 'company-ebdb)
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)
My configuration for GNU Emacs and other programs