emacs: remove some unused packages and configuration
2 files changed, 2 insertions(+), 115 deletions(-)
M user/settings/emacs.nix → user/settings/emacs.nix
@@ -66,7 +66,6 @@ epkgs: (with epkgs; [ aggressive-indent apheleia - avy buffer-terminator cape corfu@@ -78,23 +77,13 @@ crux dtrt-indent envrc editorconfig - eldoc-box elisp-refs - esh-buf-stack - esh-help - eshell-fringe-status - eshell-toggle - eshell-up evil evil-anzu evil-collection evil-embrace - evil-exchange - evil-lion evil-matchit evil-numbers - evil-org - evil-quickscope evil-space evil-surround evil-textobj-tree-sitter@@ -114,7 +103,6 @@ just-ts-mode kind-icon lua-mode link-hint - lispyville magit markdown-mode marginalia@@ -122,10 +110,8 @@ nerd-icons nix-ts-mode doom-modeline persist-state - posframe rainbow-mode rainbow-delimiters - systemd tempel tempel-collection eglot-tempel
M user/settings/emacs/post-init.el → user/settings/emacs/post-init.el
@@ -199,14 +199,6 @@ (setq mac-right-option-modifier 'none) (define-key global-map (kbd "s-w") #'kill-current-buffer) (define-key global-map (kbd "s-k") #'kill-current-buffer :remove)) -(use-package avy - :defer 2 - :commands (avy-goto-char - avy-goto-char-2 - avy-next) - :general ("C-'" #'avy-goto-char-2) - :config (setq avy-all-windows nil)) - (use-package link-hint :defer t)@@ -371,7 +363,6 @@ :config (progn (setq-default evil-shift-width 2) (setq evil-mode-line-format nil) (evil-set-undo-system 'undo-redo) - (add-to-list 'evil-emacs-state-modes 'eshell-mode) (evil-mode +1)) :general (:states 'motion@@ -450,11 +441,6 @@ (setq evil-embrace-show-help-p nil) (push ?\/ evil-embrace-evil-surround-keys) (evil-embrace-enable-evil-surround-integration))) -(use-package evil-exchange - :after evil - :config (progn - (evil-exchange-cx-install))) - (with-eval-after-load "evil" (evil-define-operator my-evil-comment-or-uncomment (beg end) "Toggle comment for the region between BEG and END."@@ -462,24 +448,12 @@ (interactive "<r>") (comment-or-uncomment-region beg end)) (evil-define-key 'normal 'global (kbd "gc") 'my-evil-comment-or-uncomment)) -(use-package evil-lion - :after evil - :defer 10 - :config (progn - (evil-lion-mode +1))) - (use-package evil-matchit :after evil :defer 2 :config (progn (add-hook 'dired-mode-hook #'turn-off-evil-matchit-mode) (global-evil-matchit-mode +1))) - -(use-package evil-quickscope - :after evil - :commands (evil-quickscope-mode) - :ghook ('(magit-mode-hook git-rebase-mode-hook) #'turn-off-evil-quickscope-mode) - :config (global-evil-quickscope-mode +1)) (use-package evil-numbers :after evil@@ -487,14 +461,6 @@ :general (:states '(normal visual) "C-a" #'evil-numbers/inc-at-pt "C-q" #'evil-numbers/dec-at-pt)) -(use-package evil-org - :after org - :commands (evil-org-set-key-theme) - :init (progn - (add-hook 'org-agenda-mode-hook #'evil-org-agenda-set-keys)) - :ghook ('org-mode-hook #'evil-org-mode) - :gfhook #'evil-org-set-key-theme) - (use-package evil-textobj-tree-sitter :defer 5 :config (progn@@ -529,8 +495,7 @@ (use-package corfu :defer 1 :commands (corfu-mode global-corfu-mode) :hook ((prog-mode . corfu-mode) - (shell-mode . corfu-mode) - (eshell-mode . corfu-mode)) + (shell-mode . corfu-mode)) :custom ;; Hide commands in M-x which do not apply to the current mode. (read-extended-command-predicate #'command-completion-default-include-p)@@ -544,10 +509,7 @@ (corfu-preview-current nil) (corfu-preselect 'prompt) (corfu-on-exact-match 'quit) :config (progn - (global-corfu-mode +1) - (add-hook 'eshell-mode-hook (lambda () - (setq-local corfu-auto nil) - (corfu-mode +1))))) + (global-corfu-mode +1))) (use-package cape :after (corfu)@@ -588,11 +550,6 @@ :config (progn (setq eldoc-idle-delay 0.2 eldoc-echo-area-use-multiline-p nil) (global-eldoc-mode +1))) - -(use-package eldoc-box - :defer t - :general (:states '(normal) - "g h" #'eldoc-box-help-at-point)) (use-package ehelp :defer 15@@ -682,55 +639,6 @@ (bind-key "%" #'dired-create-empty-file 'dired-mode-map)) ;;; Shells -(use-package eshell - :commands (eshell) - :functions (eshell/pwd) - :gfhook #'turn-off-display-line-numbers-mode - :general (:keymaps 'eshell-command-map - "C-r" #'eshell-history-backwards - "C-s" #'eshell-history-forwards) - :init (progn - (with-eval-after-load 'evil-ex - (evil-ex-define-cmd "esh[ell]" #'eshell))) - :config (progn - (eshell-load-modules eshell-modules-list) - (setq eshell-prompt-function (lambda () - (concat (eshell/pwd) "\n$ ")) - eshell-prompt-regexp "^[$][[:blank:]]" - eshell-cmpl-cycle-completions nil) - (add-hook 'eshell-exit-hook (lambda () - (when (window-deletable-p) - (delete-window)))))) - -(use-package eshell-toggle - :commands (eshell-toggle) - :general ("C-`" #'eshell-toggle) - :config (progn - (setq eshell-toggle-find-project-root-package 'project))) - -(declare-function eshell-push-command "esh-buf-stack" (CMD)) -(defun my-bind-esh-push () - (general-define-key - :states '(normal insert) - :keymaps 'local - "M-q" #'eshell-push-command)) - -(use-package esh-buf-stack - :after (eshell) - :ghook ('eshell-mode-hook #'my-bind-esh-push) - :config (setup-eshell-buf-stack)) - -(use-package esh-help - :after (eshell) - :config (setup-esh-help-eldoc)) - -(use-package eshell-fringe-status - :after eshell - :ghook '(eshell-mode-hook)) - -(use-package eshell-up - :after (eshell)) - (use-package shell :defer t :general (:keymaps 'shell-mode-map@@ -861,11 +769,6 @@ (use-package rainbow-delimiters :ghook '(clojure-mode-hook emacs-lisp-mode-hook)) -(use-package lispyville - :ghook '(emacs-lisp-mode-hook - clojure-mode-hook - racket-mode-hook)) - (use-package aggressive-indent :ghook '(emacs-lisp-mode-hook clojure-mode-hook@@ -959,7 +862,6 @@ "s" #'project-search) :config (progn (setq project-switch-commands #'magit-project-status) (with-eval-after-load 'evil-ex - (evil-ex-define-cmd "pesh[ell]" #'project-eshell) (evil-ex-define-cmd "pb" #'project-switch-to-buffer) (evil-ex-define-cmd "psw[itch]" #'project-switch-project))))@@ -1191,7 +1093,6 @@ ;;; Take me to my leader (my-leader-def "" nil - "`" #'eshell-toggle "h" '(:keymap ehelp-map :package ehelp) "w" '(:keymap evil-window-map :package evil) "x" '(:keymap ctl-x-map)