From a1f3ab65dafb3abc0b1852fce4f5cffc08ed5c6d Mon Sep 17 00:00:00 2001 From: Janis Date: Mon, 15 Jul 2024 16:20:15 +0200 Subject: [PATCH] sdfffffffff --- init.org | 114 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 78 insertions(+), 36 deletions(-) diff --git a/init.org b/init.org index c9263a7..880d383 100644 --- a/init.org +++ b/init.org @@ -40,7 +40,7 @@ https://github.com/noctuid/evil-guide?tab=readme-ov-file#keymap-precedence ** Tangling init.org From Sophie's emacs.d: -#+begin_src emacs-lisp :tangle no +#+begin_src emacs-lisp (defun tangle-init () "If the current buffer is init.org the code-blocks are tangled, and the tangled file is compiled." @@ -159,31 +159,38 @@ Add package repositories and rank them by priority ** Global Variables #+begin_src emacs-lisp - (set-language-environment "UTF-8") - (column-number-mode t) ;; Show current column number in mode line - (delete-selection-mode t) ;; Replace selected text when yanking - (dirtrack-mode t) ;; Directory tracking in shell - (global-so-long-mode t) ;; Mitigate performance for long lines - (global-visual-line-mode t) ;; Break lines instead of truncating them - (global-auto-revert-mode t) ;; Revert buffers automatically when they change - (recentf-mode t) ;; Remember recently opened files - (savehist-mode t) ;; Remember minibuffer prompt history - (save-place-mode t) ;; Remember last cursor location in file - (show-paren-mode t) ;; Highlight matching parentheses +(set-language-environment "UTF-8") +(column-number-mode t) ;; Show current column number in mode line +(delete-selection-mode t) ;; Replace selected text when yanking +(dirtrack-mode t) ;; Directory tracking in shell +(global-so-long-mode t) ;; Mitigate performance for long lines +(global-visual-line-mode t) ;; Break lines instead of truncating them +(global-auto-revert-mode t) ;; Revert buffers automatically when they change +(recentf-mode t) ;; Remember recently opened files +(savehist-mode t) ;; Remember minibuffer prompt history +(save-place-mode t) ;; Remember last cursor location in file +(show-paren-mode t) ;; Highlight matching parentheses #+end_src #+begin_src emacs-lisp - (setq-default tab-width 4 - fill-column 80 - indent-tabs-mode nil) +(setq-default tab-width 4 + fill-column 80 + indent-tabs-mode nil) #+end_src #+begin_src emacs-lisp - (use-package exec-path-from-shell - :ensure t - :config - (when (daemonp) - (exec-path-from-shell-initialize))) + (use-package exec-path-from-shell + :ensure t + :config + (when (daemonp) + (exec-path-from-shell-initialize))) + #+end_src + + #+begin_src emacs-lisp + (use-package keychain-environment + :defer t + :config + (keychain-refresh-environment)) #+end_src Keymap: @@ -197,6 +204,15 @@ Keymap: :keymap custom-bindings-map) #+end_src * Visuals +** Borders, Frames & Windows +#+begin_src emacs-lisp +(add-to-list 'default-frame-alist '(internal-border-width . 8 )) +(set-fringe-mode 4) +(setq-default fringes-outside-margins 0) +(setq-default indicate-buffer-boundaries nil) +(setq-default indicate-empty-lines nil) +(set-face-attribute 'header-line t :inherit 'default) +#+end_src ** Themes Light theme for writing #+begin_src emacs-lisp @@ -832,23 +848,33 @@ Realistically, I will probably never use 90% of Helm's functionality, so vertico #+end_src ** Vertico #+begin_src emacs-lisp - (use-package vertico - :bind (:map minibuffer-local-map - ("C-h" . backward-kill-word)) - :config - (vertico-mode 1) - (setq vertico-count 25 - completion-ignore-case t - read-buffer-completion-ignore-case t - read-file-name-completion-ignore-case t)) +(use-package vertico + :bind (:map minibuffer-local-map + ("C-h" . backward-kill-sexpr)) + :config + (vertico-mode 1) + (setq vertico-count 25 + completion-ignore-case t + read-buffer-completion-ignore-case t + read-file-name-completion-ignore-case t)) - (use-package vertico-posframe - :config - (vertico-posframe-mode 1) - (setq vertico-posframe-width 90 - vertico-posframe-height vertico-count)) +(vertico-multiform-mode) +#+end_src - (use-package savehist :init (savehist-mode)) +Use =vertico-posframe= to make the =vertico= buffer floating in the centre of the frame. +#+begin_src emacs-lisp +(use-package vertico-posframe + :config + (vertico-posframe-mode 1) + (setq vertico-posframe-height vertico-count + vertico-multiform-commands + '((consult-line (:not posframe)) + (consult-ripgrep (:not posframe)) + (embark-act (:not posframe)) + (t posframe)) + )) + +(use-package savehist :init (savehist-mode)) #+end_src Use consult-xref for lsp-xref and xref-find-references. @@ -889,6 +915,9 @@ Use consult-xref for lsp-xref and xref-find-references. (global-corfu-mode)) (use-package emacs + :custom + ;; TODO + (enable-recursive-minibuffers t) :init ;; TAB cycle if there are only few candidates (setq completion-cycle-threshold 3) @@ -953,6 +982,19 @@ This package seems to slow down search quite a bit in common buffers like find-f orderless-component-separator "[ |]")) #+end_src +Use embark for in-mini-buffer actions: +#+begin_src emacs-lisp +(use-package embark + :defer t + :bind (("C-." . embark-act)) + :config + ()) + +(use-package embark-consult + :defer t + :hook (embark-collect-mode . consult-preview-at-point-mode)) +#+end_src + #+begin_src emacs-lisp (defun my-consult-line-wrapper () (interactive) @@ -969,7 +1011,7 @@ This package seems to slow down search quite a bit in common buffers like find-f (bind-key "C-s" #'my-consult-line-wrapper custom-bindings-map) (bind-key "C-M-s" #'my-consult-ripgrep-wrapper custom-bindings-map) - ; Ensure posframe is always restored when exiting a minibuffer +; Ensure posframe is always restored when exiting a minibuffer (add-hook 'minibuffer-exit-hook (lambda () (vertico-posframe-mode 1)))