Finish initial move to 31.1

This commit is contained in:
2026-08-26 00:48:14 -07:00
parent 4c9230443b
commit 800b1c8fe0
+35 -8
View File
@@ -6,6 +6,9 @@
(require 'server) (require 'server)
(require 'crm) (require 'crm)
;; Global lexical binding
(set-default-toplevel-value 'lexical-binding t)
;; Setup PATH ;; Setup PATH
(dolist (file '("/usr/local/sbin" "~/.local/bin" "~/.ghcup/bin" (dolist (file '("/usr/local/sbin" "~/.local/bin" "~/.ghcup/bin"
"/usr/bin/site_perl" "/usr/bin/vendor_perl" "/usr/bin/site_perl" "/usr/bin/vendor_perl"
@@ -65,6 +68,17 @@ display."
(posframe-hide name)) (posframe-hide name))
(posframe-hide name)))) (posframe-hide name))))
;; tooltip stuff
(tooltip-mode 1)
(setopt use-system-tooltips nil)
(defun my/-fix-tooltip-position ()
"Toggle tooltips after Emacs starts to fix the appearing in the wrong place."
(let ((inhibit-message t))
(tooltip-mode -1)
(tooltip-mode 1))
(remove-hook 'server-after-make-frame-hook #'my/-fix-tooltip-position))
(add-hook 'server-after-make-frame-hook #'my/-fix-tooltip-position)
;; no-littering ;; no-littering
(use-package no-littering (use-package no-littering
:defer nil :defer nil
@@ -218,7 +232,7 @@ Apply OLDFUN with to ARGS."
;; Stop some annoying stuff ;; Stop some annoying stuff
(setq extended-command-suggest-shorter nil (setq extended-command-suggest-shorter nil
suggest-key-bindings nil suggest-key-bindings nil
quit-window-kill-buffer t) quit-window-kill-buffer nil)
;; Better scrolling ;; Better scrolling
(setq mouse-scroll-delay 0 (setq mouse-scroll-delay 0
@@ -301,6 +315,10 @@ Apply OLDFUN with to ARGS."
. conf-mode)) . conf-mode))
(add-to-list 'auto-mode-alist `(,(rx (or bos "/") "README" eos) . markdown-mode)) (add-to-list 'auto-mode-alist `(,(rx (or bos "/") "README" eos) . markdown-mode))
;; Show the fill column
;; (global-display-fill-column-indicator-mode -1)
;; (setopt display-fill-column-indicator-warning t)
;; Minibuffer stuff ;; Minibuffer stuff
(add-hook 'minibuffer-setup-hook #'cursor-intangible-mode) (add-hook 'minibuffer-setup-hook #'cursor-intangible-mode)
(setopt crm-prompt "[CRM%s] %p" (setopt crm-prompt "[CRM%s] %p"
@@ -1114,15 +1132,17 @@ environment variable accordingly."
:config :config
(defun my/-setup-text-mode-completion-styles () (defun my/-setup-text-mode-completion-styles ()
(setq-local completion-styles '(basic))) (setq-local completion-styles '(basic)))
(orderless-define-completion-style my/orderless-with-initialism (orderless-define-completion-style my/orderless-command-matcher
(orderless-matching-styles '(orderless-initialism orderless-regexp))) (orderless-matching-styles
(setq orderless-matching-styles '(orderless-regexp) '(orderless-literal-prefix orderless-literal orderless-initialism)))
(setq orderless-matching-styles
'(orderless-literal-prefix orderless-literal orderless-regexp)
completion-styles '(orderless basic) completion-styles '(orderless basic)
completion-category-defaults nil completion-category-defaults nil
completion-category-overrides '((file completion-category-overrides '((file
(styles basic partial-completion)) (styles basic partial-completion))
(command (command
(styles my/orderless-with-initialism (styles my/orderless-command-matcher
basic))))) basic)))))
;; marginalia ;; marginalia
@@ -1204,9 +1224,6 @@ environment variable accordingly."
(use-package consult-eglot (use-package consult-eglot
:commands consult-eglot-symbols) :commands consult-eglot-symbols)
;; wgrep
(use-package wgrep)
;; integration for embark and consult ;; integration for embark and consult
(use-package embark-consult (use-package embark-consult
:hook (embark-collect-mode . consult-preview-at-point-mode)) :hook (embark-collect-mode . consult-preview-at-point-mode))
@@ -1296,6 +1313,8 @@ environment variable accordingly."
;; xref ;; xref
(use-package xref (use-package xref
:custom
(global-xref-mouse-mode t)
:init :init
(evil-define-key '(normal motion) 'global (evil-define-key '(normal motion) 'global
"gr" #'xref-find-references) "gr" #'xref-find-references)
@@ -2823,6 +2842,7 @@ current buffer is a Jupyter buffer, just use that."
"Like `sage-shell:run-sage', but does not ask anything without a prefix "Like `sage-shell:run-sage', but does not ask anything without a prefix
argument." argument."
(interactive "P") (interactive "P")
(require 'sage-shell-mode)
(let ((sage-shell:ask-command-options p)) (let ((sage-shell:ask-command-options p))
(funcall-interactively #'sage-shell:run-sage (funcall-interactively #'sage-shell:run-sage
(sage-shell:read-command)))) (sage-shell:read-command))))
@@ -3192,6 +3212,7 @@ ARG is the same as for either of the above functions."
(dired-clean-up-buffers-too t) (dired-clean-up-buffers-too t)
(dired-clean-confirm-killing-deleted-buffers t) (dired-clean-confirm-killing-deleted-buffers t)
(dired-kill-when-opening-new-dired-buffer t) (dired-kill-when-opening-new-dired-buffer t)
(dired-auto-toggle-b-switch t)
:config :config
(evil-define-key '(normal visual motion) dired-mode-map (evil-define-key '(normal visual motion) dired-mode-map
"u" #'dired-unmark "u" #'dired-unmark
@@ -3204,6 +3225,12 @@ ARG is the same as for either of the above functions."
(defun my/-setup-image-dired-thumbnail-mode () (defun my/-setup-image-dired-thumbnail-mode ()
(display-line-numbers-mode -1))) (display-line-numbers-mode -1)))
(use-package speedbar
:ensure nil
:defer t
:custom
(speedbar-prefer-window t))
;; dirvish ;; dirvish
(use-package dirvish (use-package dirvish
:demand t :demand t