From 44e278c8e5493ff418428a7b35b3bfa7fb3bc49e Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Tue, 9 Jan 2024 07:30:14 +0000 Subject: [PATCH] Lots of changes Remove doom-modeline, add diminish and customise to reduce number of minor modes displayed Remove dashboard Tweak corfu activation and mode-map binds --- README.org | 131 ++++++++++++++++++----------------------------------- 1 file changed, 45 insertions(+), 86 deletions(-) diff --git a/README.org b/README.org index 4291213..45a1c56 100644 --- a/README.org +++ b/README.org @@ -18,12 +18,12 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia use-short-answers t load-prefer-newer t indent-tabs-mode nil - even-window-sizes nil + even-window-sizes t global-auto-revert-non-file-buffers t dired-auto-revert-buffer t dired-dwim-target t - tab-always-indent 'complete - completion-cycle-threshold 3 + tab-always-indent t + completion-cycle-threshold nil completions-detailed t xref-show-definitions-function #'xref-show-definitions-completing-read kill-do-not-save-duplicates t @@ -40,8 +40,6 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia (global-auto-revert-mode +1) (delete-selection-mode +1) - (keymap-global-set "M-#" #'dictionary-lookup-definition) - ;; turn on spell checking, if available. (when (and (require 'ispell nil :noerror) (executable-find ispell-program-name)) (add-hook 'text-mode-hook #'flyspell-mode) @@ -80,6 +78,10 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia ("stable" . 70) ("melpa" . 0)))) #+end_src +** diminish modes +#+begin_src emacs-lisp + (use-package diminish :ensure t) +#+end_src ** Authentication #+begin_src emacs-lisp @@ -166,20 +168,27 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia truncate-lines nil truncate-partial-width-windows nil) - (menu-bar-mode -1) + (menu-bar-mode +1) + (global-display-line-numbers-mode +1) + (global-prettify-symbols-mode +1) (tool-bar-mode -1) (scroll-bar-mode -1) (tab-bar-mode -1) - (global-display-line-numbers-mode -1) - (global-prettify-symbols-mode +1) - (global-visual-line-mode +1) + + (use-package word-wrap-mode + :ensure t + :diminish + :init + (global-word-wrap-whitespace-mode +1)) (use-package which-key :ensure t + :diminish :config (which-key-mode +1)) (use-package page-break-lines :ensure t + :diminish :config (global-page-break-lines-mode +1)) ;; add visual pulse when changing focus, like beacon but built-in @@ -208,7 +217,12 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia (catppuccin-italic-blockquotes t) (catppuccin-italic-comments t) (catppuccin-italic-variables t) - (catppuccin-alternate-mode-line-and-minibuffer t) + (catppuccin-height-title-1 1.3) + (catppuccin-height-title-2 1.2) + (catppuccin-height-title-3 1.1) + (catppuccin-height-doc-title 1.3) + (catppuccin-highlight-matches t) + (catppuccin-alternate-mode-line-and-minibuffer nil) :config (load-theme 'catppuccin :no-confirm)) @@ -288,6 +302,7 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia #+begin_src emacs-lisp (use-package ligature :ensure t + :diminish :config ;; Enable all ligatures in programming modes (ligature-set-ligatures '(prog-mode org-mode) @@ -355,79 +370,14 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia #+end_src ** Modeline #+begin_src emacs-lisp - (line-number-mode +1) - (column-number-mode +1) - (size-indication-mode +1) + (line-number-mode -1) + (column-number-mode -1) + (size-indication-mode -1) (display-battery-mode -1) (display-time-mode -1) -#+end_src -*** Doom Modeline -#+begin_src emacs-lisp :tangle yes - (use-package doom-modeline - :ensure t - :custom - (doom-modeline-icon t) - (doom-modeline-mu4e t) - (doom-modeline-github nil) - (doom-modeline-env-version nil) - (doom-modeline-buffer-file-name-style 'file-name) - (doom-modeline-buffer-encoding 'nondefault) - (doom-modeline-enable-word-count t) - (doom-modeline-continuous-word-count-modes - '(org-mode markdown-mode gfm-mode)) - :config - (doom-modeline-mode +1)) + (setq mode-line-compact 'long) #+end_src - -** Dashboard -#+begin_src emacs-lisp - ;; Dashboard - (setq ) - (use-package dashboard - :ensure t - :demand - :bind (("C-c o d" . dashboard-open)) - :custom - (dashboard-center-content t) - (dashboard-icon-type 'nerd-icons) - (dashboard-set-heading-icons t) - (dashboard-set-file-icons t) - (dashboard-set-navigator t) - (dashboard-set-init-info t) - (dashboard-startup-banner 'ascii) - (dashboard-agenda-item-icon "-") - (dashboard-agenda-release-buffers t) - (dashboard-agenda-sort-strategy '(time-up)) - (dashboard-agenda-time-string-format "%Y-%m-%d %H:%M") - (dashboard-projects-backend 'project-el) - (dashboard-projects-switch-function 'project-switch-project) - (dashboard-projects-show-base t) - (dashboard-recentf-show-base 'align) - (dashboard-items '((agenda . 10) - (recents . 10) - (projects . 10))) - (dashboard-heading-icons '((agenda . "nf-oct-calendar") - (recents . "nf-oct-history") - (projects . "nf-oct-rocket"))) - (dashboard-banner-ascii (concat " .000000. \n" - " .0. .0. \n" - " .00. .00. \n" - " .000cl. .lc000. \n" - ".0 0.\n" - "0. .o0000o. .0\n" - " 00 .0' '0. 00 \n" - " 00 .0 0. 00 \n" - " HHHHH HHHHHHHHHHHH HHHHH \n" - "HHHH HHH HHHHHHHHHHHHHH HHHH\n" - " HHHHHH HHHHHHHHH HHHHHHHH \n" - " HHH HHHH HHHHHHHHH HHHH \n" - " HHH HHHHHH \n" - " HHHHH HH \n")) - :config - (setq initial-buffer-choice 'dashboard-open)) -#+end_src - ** Darkroom #+begin_src emacs-lisp (use-package darkroom @@ -733,8 +683,10 @@ Set treesit to fontify all elements, default was 3 (out of 4) (treesit-auto-add-to-auto-mode-alist) (global-treesit-auto-mode +1)) - (setq rust-ts-mode-hook rust-mode-hook) (setq python-ts-mode-hook python-mode-hook) + + (with-eval-after-load 'rust-mode + (setq rust-ts-mode-hook rust-mode-hook)) #+end_src @@ -742,6 +694,7 @@ Set treesit to fontify all elements, default was 3 (out of 4) #+begin_src emacs-lisp :tangle yes (use-package eldoc :ensure t + :diminish :custom (eldoc-echo-area-display-truncation-message nil) (eldoc-echo-area-prefer-doc-buffer t) @@ -752,6 +705,7 @@ Set treesit to fontify all elements, default was 3 (out of 4) #+BEGIN_SRC emacs-lisp (use-package eglot :ensure t + :diminish :demand :bind (("C-c c e" . eglot) ("C-c c C-e" . eglot-reconnect) @@ -782,6 +736,7 @@ Set treesit to fontify all elements, default was 3 (out of 4) #+begin_src emacs-lisp (use-package apheleia :ensure t + :diminish :bind (("C-c c f" . apheleia-format-buffer)) :hook (prog-mode) :custom (apheleia-remote-algorithm 'local) @@ -802,6 +757,7 @@ Set treesit to fontify all elements, default was 3 (out of 4) (use-package flymake-popon :ensure t :after flymake + :diminish :config (global-flymake-popon-mode +1)) #+end_src @@ -879,17 +835,19 @@ Set treesit to fontify all elements, default was 3 (out of 4) :custom (corfu-cycle t) (corfu-auto t) - (corfu-auto-prefix 3) + (corfu-auto-prefix 2) (corfu-quit-no-match 'separator) (corfu-quit-at-boundary 'separator) (corfu-preview-current nil) (corfu-preselect 'directory) :bind ( :map corfu-map ("M-SPC" . corfu-insert-separator) + ("C-SPC" . corfu-insert) ("RET" . nil) - ("S-RET". corfu-insert) - ("TAB" . corfu-insert) - ([tab] . corfu-insert)) + ("TAB" . corfu-next) + ([tab] . corfu-next) + ("S-TAB" . corfu-previous) + ([backtab] . corfu-previous)) :init (global-corfu-mode +1) (corfu-history-mode +1) @@ -981,15 +939,16 @@ Set treesit to fontify all elements, default was 3 (out of 4) #+end_src ** Snippets #+begin_src emacs-lisp + (use-package yasnippet-snippets :ensure t) + (use-package yasnippet :ensure t + :diminish :hook ((prog-mode org-mode) . yas-minor-mode) :config (require 'yasnippet-snippets) (yas-reload-all)) - (use-package yasnippet-snippets :ensure t) - (use-package yasnippet-capf :ensure t :after yasnippet