summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--init.el54
1 files changed, 37 insertions, 17 deletions
diff --git a/init.el b/init.el index c511871..188ef6d 100644 --- a/init.el +++ b/init.el
@@ -50,11 +50,7 @@
50 "C-w" #'+kill-word-backward-or-region 50 "C-w" #'+kill-word-backward-or-region
51 "C-x C-m" #'execute-extended-command ; original: coding systems 51 "C-x C-m" #'execute-extended-command ; original: coding systems
52 "C-<backspace>" #'+backward-kill-word 52 "C-<backspace>" #'+backward-kill-word
53 "C-x TAB" #'+indent-rigidly 53 "C-x TAB" #'+indent-rigidly)
54 ;; Alright, Yegge... NOPE! C-x t is tab prefix ... (maybe F6 or something?)
55 ;; "C-x t" #'beginning-of-buffer
56 ;; "C-x e" #'end-of-buffer
57 )
58 ;; C-h deletes backward - see https://idiomdrottning.org/bad-emacs-defaults 54 ;; C-h deletes backward - see https://idiomdrottning.org/bad-emacs-defaults
59 (global-set-key (kbd "C-h") 'delete-backward-char) 55 (global-set-key (kbd "C-h") 'delete-backward-char)
60 (keyboard-translate ?\C-h ?\C-?) 56 (keyboard-translate ?\C-h ?\C-?)
@@ -857,6 +853,14 @@
857 (+scratch-text-scratch)) 853 (+scratch-text-scratch))
858 (add-hook 'kill-buffer-query-functions #'+scratch-immortal)) 854 (add-hook 'kill-buffer-query-functions #'+scratch-immortal))
859 855
856(setup shell
857 (:option shell-command-prompt-show-cwd t)
858 (:local-set +modeline-position-function
859 (lambda () (string-replace (getenv "HOME")
860 "~"
861 default-directory)))
862 (:hook #'form-feed-mode))
863
860(setup shr 864(setup shr
861 (:also-load +shr) 865 (:also-load +shr)
862 (:option shr-width (- fill-column 5) ; pad out for wide letters 866 (:option shr-width (- fill-column 5) ; pad out for wide letters
@@ -894,6 +898,7 @@
894 ;;+tab-bar-emms 898 ;;+tab-bar-emms
895 +tab-bar-tracking-mode 899 +tab-bar-tracking-mode
896 +tab-bar-notmuch-count 900 +tab-bar-notmuch-count
901 +tab-bar-timer
897 +tab-bar-date)) 902 +tab-bar-date))
898 (tab-bar-mode +1) 903 (tab-bar-mode +1)
899 (display-time-mode +1)) 904 (display-time-mode +1))
@@ -1337,6 +1342,8 @@
1337 (+with-eval-after-loads (consult +consult) 1342 (+with-eval-after-loads (consult +consult)
1338 (:option consult-narrow-key "<" 1343 (:option consult-narrow-key "<"
1339 consult-project-root-function '+consult-project-root) 1344 consult-project-root-function '+consult-project-root)
1345 (add-to-list 'consult-buffer-filter
1346 (rx "*" (or "scratch" "text") "*"))
1340 (consult-customize consult-theme 1347 (consult-customize consult-theme
1341 :preview-key '(:debounce 0.2 any)) 1348 :preview-key '(:debounce 0.2 any))
1342 (consult-customize consult-ripgrep consult-git-grep consult-grep 1349 (consult-customize consult-ripgrep consult-git-grep consult-grep
@@ -1819,6 +1826,7 @@
1819 :fork ( :host nil 1826 :fork ( :host nil
1820 :repo "https://codeberg.org/acdw/emacs-jabber"))) 1827 :repo "https://codeberg.org/acdw/emacs-jabber")))
1821 (:also-load +jabber) 1828 (:also-load +jabber)
1829 (:option +jabber-pre-prompt "~ ~ ~\n")
1822 (:option jabber-account-list '(("acdw@hmm.st")) 1830 (:option jabber-account-list '(("acdw@hmm.st"))
1823 jabber-groupchat-buffer-format "%n" 1831 jabber-groupchat-buffer-format "%n"
1824 jabber-chat-buffer-format "%n" 1832 jabber-chat-buffer-format "%n"
@@ -1829,15 +1837,15 @@
1829 ("." . jabber-muc-presence-dim)) 1837 ("." . jabber-muc-presence-dim))
1830 jabber-muc-colorize-foreign nil ; colorizing doesn't match my color theme 1838 jabber-muc-colorize-foreign nil ; colorizing doesn't match my color theme
1831 jabber-chat-foreign-prompt-format (concat +jabber-pre-prompt 1839 jabber-chat-foreign-prompt-format (concat +jabber-pre-prompt
1832 "[%t] %n\n" 1840 "%n\n"
1833 (make-string +jabber-ws-prefix 1841 (make-string +jabber-ws-prefix
1834 ?\ )) 1842 ?\ ))
1835 jabber-chat-local-prompt-format (concat +jabber-pre-prompt 1843 jabber-chat-local-prompt-format (concat +jabber-pre-prompt
1836 "[%t] %n\n" 1844 "%n\n"
1837 (make-string +jabber-ws-prefix 1845 (make-string +jabber-ws-prefix
1838 ?\ )) 1846 ?\ ))
1839 jabber-groupchat-prompt-format (concat +jabber-pre-prompt 1847 jabber-groupchat-prompt-format (concat +jabber-pre-prompt
1840 "[%t] %n\n" 1848 "%n\n"
1841 (make-string +jabber-ws-prefix 1849 (make-string +jabber-ws-prefix
1842 ?\ )) 1850 ?\ ))
1843 jabber-auto-reconnect t) 1851 jabber-auto-reconnect t)
@@ -1923,13 +1931,10 @@
1923 "FreeMono" 1931 "FreeMono"
1924 "FreeSerif" 1932 "FreeSerif"
1925 "Unifont" 1933 "Unifont"
1926 "Symbola")) 1934 "Symbola")))
1927 found)
1928 (dolist (font emoji-fonts) 1935 (dolist (font emoji-fonts)
1929 (when (member font ffl) 1936 (when (member font ffl)
1930 (push font found) 1937 (set-fontset-font t 'symbol (font-spec :family font) nil :append))))
1931 (set-fontset-font t 'symbol (font-spec :family font) nil :append)))
1932 (nreverse found))
1933 (machine-settings-load))) 1938 (machine-settings-load)))
1934 1939
1935(setup (:straight macrostep) 1940(setup (:straight macrostep)
@@ -2079,6 +2084,14 @@
2079 (:global "C-a" #'mwim-beginning 2084 (:global "C-a" #'mwim-beginning
2080 "C-e" #'mwim-end)) 2085 "C-e" #'mwim-end))
2081 2086
2087(setup (:straight native-complete)
2088 (with-eval-after-load 'shell
2089 (native-complete-setup-bash))
2090 (:with-hook shell-mode-hook
2091 (:local-set completion-at-point-functions
2092 (cons 'native-complete-at-point
2093 completion-at-point-functions))))
2094
2082(setup (:straight notmuch-bookmarks) 2095(setup (:straight notmuch-bookmarks)
2083 (:load-after notmuch) 2096 (:load-after notmuch)
2084 (:when-loaded 2097 (:when-loaded
@@ -2159,10 +2172,18 @@
2159 (define-key org-mode-map (kbd "C-x n t") #'org-taskwise-narrow-to-task))) 2172 (define-key org-mode-map (kbd "C-x n t") #'org-taskwise-narrow-to-task)))
2160 2173
2161(setup (:straight org-visibility) 2174(setup (:straight org-visibility)
2162 (:require org-visibility) 2175 (:load-after org user-save)
2163 (:option org-visibility-state-file (.etc "org-visibility") 2176 (:option org-visibility-state-file (.etc "org-visibility")
2164 org-visibility-include-regexps '("\\.org\\'")) 2177 org-visibility-include-regexps '("\\.org\\'"))
2165 (org-visibility-enable-hooks)) 2178 (with-eval-after-load 'org-visibility
2179 ;; I have to add these hooks myself since I don't want it triggering on
2180 ;; /every/ save, but just when I `user-save'.
2181 (add-hook 'user-save-hook #'org-visibility-save-noerror :append)
2182 (add-hook 'kill-buffer-hook #'org-visibility-save-noerror :append)
2183 (add-hook 'kill-emacs-hook #'org-visibility-save-all-buffers :append)
2184 (add-hook 'find-file-hook #'org-visibility-load :append)
2185 (add-hook 'first-change-hook #'org-visibility-dirty :append)
2186 (add-hook 'org-cycle-hook #'org-visibility-dirty-org-cycle :append)))
2166 2187
2167(setup (:straight org-wc) 2188(setup (:straight org-wc)
2168 (:load-after org simple-modeline) 2189 (:load-after org simple-modeline)
@@ -2190,8 +2211,7 @@
2190 (:bind "DEL" #'paredit-backward-delete 2211 (:bind "DEL" #'paredit-backward-delete
2191 "C-<backspace>" #'+paredit-backward-kill-word 2212 "C-<backspace>" #'+paredit-backward-kill-word
2192 "C-w" (lambda (arg) (interactive "P") 2213 "C-w" (lambda (arg) (interactive "P")
2193 (+kill-word-backward-or-region arg 2214 (+kill-word-backward-or-region arg #'paredit-backward-kill-word))
2194 #'paredit-backward-kill-word))
2195 "M-s" nil) 2215 "M-s" nil)
2196 (dolist (hook '(emacs-lisp-mode-hook 2216 (dolist (hook '(emacs-lisp-mode-hook
2197 eval-expression-minibuffer-setup-hook 2217 eval-expression-minibuffer-setup-hook