1 files changed, 37 insertions, 17 deletions

@@ -50,11 +50,7 @@
            "C-w" #'+kill-word-backward-or-region
            "C-x C-m" #'execute-extended-command  ; original: coding systems
            "C-<backspace>" #'+backward-kill-word
-           "C-x TAB" #'+indent-rigidly
-           ;; Alright, Yegge... NOPE! C-x t is tab prefix ... (maybe F6 or something?)
-           ;; "C-x t" #'beginning-of-buffer
-           ;; "C-x e" #'end-of-buffer
-           )
+           "C-x TAB" #'+indent-rigidly)
   ;; C-h deletes backward - see https://idiomdrottning.org/bad-emacs-defaults
   (global-set-key (kbd "C-h") 'delete-backward-char)
   (keyboard-translate ?\C-h ?\C-?)
@@ -857,6 +853,14 @@
     (+scratch-text-scratch))
   (add-hook 'kill-buffer-query-functions #'+scratch-immortal))
 
+(setup shell
+  (:option shell-command-prompt-show-cwd t)
+  (:local-set +modeline-position-function
+              (lambda () (string-replace (getenv "HOME")
+                                    "~"
+                                    default-directory)))
+  (:hook #'form-feed-mode))
+
 (setup shr
   (:also-load +shr)
   (:option shr-width (- fill-column 5)  ; pad out for wide letters
@@ -894,6 +898,7 @@
                             ;;+tab-bar-emms
                             +tab-bar-tracking-mode
                             +tab-bar-notmuch-count
+                            +tab-bar-timer
                             +tab-bar-date))
   (tab-bar-mode +1)
   (display-time-mode +1))
@@ -1337,6 +1342,8 @@
   (+with-eval-after-loads (consult +consult)
     (:option consult-narrow-key "<"
              consult-project-root-function '+consult-project-root)
+    (add-to-list 'consult-buffer-filter
+                 (rx "*" (or "scratch" "text") "*"))
     (consult-customize consult-theme
                        :preview-key '(:debounce 0.2 any))
     (consult-customize consult-ripgrep consult-git-grep consult-grep
@@ -1819,6 +1826,7 @@
                           :fork ( :host nil
                                   :repo "https://codeberg.org/acdw/emacs-jabber")))
   (:also-load +jabber)
+  (:option +jabber-pre-prompt "~ ~ ~\n")
   (:option jabber-account-list '(("acdw@hmm.st"))
            jabber-groupchat-buffer-format "%n"
            jabber-chat-buffer-format "%n"
@@ -1829,15 +1837,15 @@
              ("." . jabber-muc-presence-dim))
            jabber-muc-colorize-foreign nil ; colorizing doesn't match my color theme
            jabber-chat-foreign-prompt-format (concat +jabber-pre-prompt
-                                                     "[%t] %n\n"
+                                                     "%n\n"
                                                      (make-string +jabber-ws-prefix
                                                                   ?\ ))
            jabber-chat-local-prompt-format (concat +jabber-pre-prompt
-                                                   "[%t] %n\n"
+                                                   "%n\n"
                                                    (make-string +jabber-ws-prefix
                                                                 ?\ ))
            jabber-groupchat-prompt-format (concat +jabber-pre-prompt
-                                                  "[%t] %n\n"
+                                                  "%n\n"
                                                   (make-string +jabber-ws-prefix
                                                                ?\ ))
            jabber-auto-reconnect t)
@@ -1923,13 +1931,10 @@
                          "FreeMono"
                          "FreeSerif"
                          "Unifont"
-                         "Symbola"))
-          found)
+                         "Symbola")))
       (dolist (font emoji-fonts)
         (when (member font ffl)
-          (push font found)
-          (set-fontset-font t 'symbol (font-spec :family font) nil :append)))
-      (nreverse found))
+          (set-fontset-font t 'symbol (font-spec :family font) nil :append))))
     (machine-settings-load)))
 
 (setup (:straight macrostep)
@@ -2079,6 +2084,14 @@
   (:global "C-a" #'mwim-beginning
            "C-e" #'mwim-end))
 
+(setup (:straight native-complete)
+  (with-eval-after-load 'shell
+    (native-complete-setup-bash))
+  (:with-hook shell-mode-hook
+    (:local-set completion-at-point-functions
+                (cons 'native-complete-at-point
+                      completion-at-point-functions))))
+
 (setup (:straight notmuch-bookmarks)
   (:load-after notmuch)
   (:when-loaded
@@ -2159,10 +2172,18 @@
     (define-key org-mode-map (kbd "C-x n t") #'org-taskwise-narrow-to-task)))
 
 (setup (:straight org-visibility)
-  (:require org-visibility)
+  (:load-after org user-save)
   (:option org-visibility-state-file (.etc "org-visibility")
            org-visibility-include-regexps '("\\.org\\'"))
-  (org-visibility-enable-hooks))
+  (with-eval-after-load 'org-visibility
+    ;; I have to add these hooks myself since I don't want it triggering on
+    ;; /every/ save, but just when I `user-save'.
+    (add-hook 'user-save-hook #'org-visibility-save-noerror :append)
+    (add-hook 'kill-buffer-hook #'org-visibility-save-noerror :append)
+    (add-hook 'kill-emacs-hook #'org-visibility-save-all-buffers :append)
+    (add-hook 'find-file-hook #'org-visibility-load :append)
+    (add-hook 'first-change-hook #'org-visibility-dirty :append)
+    (add-hook 'org-cycle-hook #'org-visibility-dirty-org-cycle :append)))
 
 (setup (:straight org-wc)
   (:load-after org simple-modeline)
@@ -2190,8 +2211,7 @@
   (:bind "DEL" #'paredit-backward-delete
          "C-<backspace>" #'+paredit-backward-kill-word
          "C-w" (lambda (arg) (interactive "P")
-                 (+kill-word-backward-or-region arg
-                                                #'paredit-backward-kill-word))
+                 (+kill-word-backward-or-region arg #'paredit-backward-kill-word))
          "M-s" nil)
   (dolist (hook '(emacs-lisp-mode-hook
                   eval-expression-minibuffer-setup-hook