From 8f5e91d530b45ef15828ac44e04f9c0ef0df3c4f Mon Sep 17 00:00:00 2001 From: Oliver Payne Date: Sun, 10 Mar 2024 22:50:27 +0000 Subject: [PATCH] Update init.el Various changes --- init.el | 74 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/init.el b/init.el index 8e73c0f..05afb5a 100644 --- a/init.el +++ b/init.el @@ -1,3 +1,7 @@ +;; Restore gnus +;; customisation (why does it go to configured even with a bind. +;; Likewise for smartparen and yafolding) + ;;Use-package customisation before loading use-package. (setq use-package-compute-statistics t) (setq use-package-verbose t) @@ -12,18 +16,20 @@ (bind-key "M-\\" #'cycle-spacing) (bind-key "" #'switch-to-buffer) (bind-key "S-" #'switch-to-buffer-other-window) +(bind-key "C-." #'embark-act) +(bind-key "M-." #'embark-act-dwim) -(use-package diminish :ensure t) +(use-package diminish) (use-package emacs :init - (setq-default auto-fill-function 'do-auto-fill)) + (setq-default auto-fill-function 'do-auto-fill) + (add-to-list 'Info-directory-list "~/.emacs.d/info")) (use-package avy :bind (("M-j" . #'avy-goto-char-timer) :map isearch-mode-map ("M-j" . #'avy-isearch))) (use-package consult - :ensure t :bind (;; C-c bindings (mode-specific-map) ;; C-x bindings (ctl-x-map) ("C-x M-:" . consult-complex-command) ;; orig. repeat-complex-command @@ -72,38 +78,37 @@ ("M-s" . consult-history) ;; orig. next-matching-history-element ("M-r" . consult-history)) ;; orig. previous-matching-history-) ) -(use-package corfu - :ensure t - :init - (global-corfu-mode)) +(use-package eat + :hook (eshell-load eat-eshell-visual-command-mode)) (use-package expand-region - :ensure t :bind ("C-=" . er/expand-region)) +(use-package gnus + :bind ("C-c n" . gnus) + :config + (add-hook 'gnus-group-mode-hook 'gnus-topic-mode) + (add-hook 'gnus-group-mode-hook 'gnus-agent-mode)) (use-package magit - :ensure t :bind (("C-x g" . magit-status) ("" . magit-status))) -(use-package orderless - :ensure t) -(use-package project - :ensure t) -(use-package racket-mode - :ensure t) (use-package slime - :ensure t :init (setq inferior-lisp-program "sbcl") :defer t) -(use-package smartparens-config - :ensure smartparens - :config (progn (show-smartparens-global-mode t))) -(use-package vertico - :ensure t +(use-package smartparens + :hook (prog-mode . turn-on-smartparens-strict-mode) :config - (vertico-mode)) -(use-package yafolding - :ensure t - :hook 'prog-mode) + (require 'smartparens-config)) +(use-package vertico + :bind + ( + :map vertico-map + ("RET" . vertico-directory-enter) + ("DEL" . vertico-directory-delete-char) + ("M-DEL" . vertico-directory-tidy))) +(use-package which-key + :defer t) +;; (use-package yafolding +;; :hook prog-mode) ;; OS specific customisation ;; OpenBSD prefixes gnu coreutils programs with g @@ -131,18 +136,17 @@ '(custom-enabled-themes '(modus-vivendi)) '(custom-safe-themes '("2cc1b50120c0d608cc5064eb187bcc22c50390eb091fddfa920bf2639112adb6" "69f7e8101867cfac410e88140f8c51b4433b93680901bb0b52014144366a08c8" "eb50f36ed5141c3f702f59baa1968494dc8e9bd22ed99d2aaa536c613c8782db" "eb7cd622a0916358a6ef6305e661c6abfad4decb4a7c12e73d6df871b8a195f8" default)) - '(desktop-save-mode nil) '(dired-chown-program "gchown") '(dired-dwim-target 'dired-dwim-target-next) '(display-buffer-alist '(("\\*Async" display-buffer-no-window (nil)))) '(display-time-24hr-format t) '(display-time-day-and-date t) '(display-time-mode t) - '(eat-eshell-mode t) '(eat-kill-buffer-on-exit t) '(ediff-window-setup-function 'ediff-setup-windows-plain) - '(gnus-group-mode-hook '(gnus-topic-mode gnus-agent-mode)) - '(gnus-secondary-select-methods '((nnml ""))) + '(eshell-destroy-buffer-when-process-dies t) + '(global-corfu-mode t) + '(gnus-save-newsrc-file nil) '(gnus-select-method '(nntp "news.gmane.io")) '(isearch-lazy-count t) '(mail-sources '((file :path "/var/mail/olly"))) @@ -151,14 +155,10 @@ '(org-journal-dir "~/journal") '(org-journal-file-type 'monthly) '(package-archives - '(("melpa-stable" . "https://stable.melpa.org/packages/") - ("melpa" . "https://melpa.org/packages/") - ("gnu" . "https://elpa.gnu.org/packages/") + '(("gnu" . "https://elpa.gnu.org/packages/") ("nongnu" . "https://elpa.nongnu.org/nongnu/"))) '(package-selected-packages - '(yafold yafolding diminish sicp eat which-key eglot haskell-mode undo-tree expand-region project consult pdf-tools slime corfu smartparens modus-themes orderless solarized-theme vertico use-package racket-mode magit)) - '(prog-mode-hook - '(flyspell-prog-mode display-line-numbers-mode turn-on-smartparens-strict-mode)) + '(marginalia embark-consult embark avy diminish sicp eat which-key eglot haskell-mode expand-region project consult slime corfu smartparens modus-themes orderless vertico racket-mode magit)) '(save-place-mode t) '(savehist-mode t) '(scroll-bar-mode nil) @@ -167,9 +167,7 @@ '(text-mode-hook '(turn-on-flyspell turn-on-auto-fill text-mode-hook-identify)) '(tool-bar-mode nil) - '(use-package-compute-statistics t) - '(use-package-verbose t) - '(which-key-mode t) + '(vertico-mode t) '(xref-show-definitions-function 'consult-xref) '(xref-show-xrefs-function 'consult-xref))