amadaluzia/pankomacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: replace config setq with custom

Browse source 
they are basically equivalent and one actually loads properly
This commit is contained in:
Artur Manuel 2024-10-09 21:10:27 +01:00
commit 5491e99ab5
1 changed files with 197 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

384
emacs/config.el
View file

@ -1,187 +1,197 @@
(use-package emacs (use-package emacs
:init :init
(defun crm-indicator (args) (defun crm-indicator (args)
(cons (format "[CRM%s] %s" (cons (format "[CRM%s] %s"
(replace-regexp-in-string (replace-regexp-in-string
"\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" "" "\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" ""
crm-separator) crm-separator)
(car args)) (car args))
(cdr args))) (cdr args)))
(advice-add #'completing-read-multiple :filter-args #'crm-indicator) (advice-add #'completing-read-multiple :filter-args #'crm-indicator)
(setq minibuffer-prompt-properties (setq minibuffer-prompt-properties
'(read-only t cursor-intangible t face minibuffer-prompt)) '(read-only t cursor-intangible t face minibuffer-prompt))
(add-hook 'minibuffer-setup-hook #'cursor-intangible-mode) (add-hook 'minibuffer-setup-hook #'cursor-intangible-mode)
:config :custom
(setq inhibit-startup-screen t (inhibit-startup-screen t)
initial-scratch-message nil (inhibit-splash-screen t)
enable-recursive-minibuffers t (initial-scratch-message nil)
read-extended-command-predicate #'command-completion-default-include-p (enable-recursive-minibuffers t)
tab-always-indent 'complete) (read-extended-command-predicate #'command-completion-default-include-p)
(setq-default mode-line-format nil) (tab-always-indent 'complete)
(menu-bar-mode -1) :config
(tool-bar-mode -1) (setq-default mode-line-format nil)
(scroll-bar-mode -1) (menu-bar-mode -1)
:hook ((prog-mode . display-line-numbers-mode) (tool-bar-mode -1)
(text-mode . display-line-numbers-mode))) (scroll-bar-mode -1)
:hook ((prog-mode . display-line-numbers-mode)
(use-package spacious-padding (text-mode . display-line-numbers-mode)))
:ensure t
:init (use-package spacious-padding
(spacious-padding-mode)) :ensure t
:init
(use-package nano-modeline (spacious-padding-mode))
:ensure t
:hook ((prog-mode . nano-modeline-prog-mode) (use-package nano-modeline
(text-mode . nano-modeline-text-mode) :ensure t
(org-mode . nano-modeline-org-mode) :hook ((prog-mode . nano-modeline-prog-mode)
(org-capture-mode . nano-modeline-org-capture-mode) (text-mode . nano-modeline-text-mode)
(org-agenda-mode . nano-modeline-org-agenda-mode))) (org-mode . nano-modeline-org-mode)
(org-capture-mode . nano-modeline-org-capture-mode)
(use-package vertico (org-agenda-mode . nano-modeline-org-agenda-mode)))
:ensure t
:init (use-package vertico
(vertico-mode) :ensure t
:config :init
(setq vertico-scroll-margin 0 (vertico-mode)
vertico-count 8 :custom
vertico-resize nil (vertico-scroll-margin 0)
vertico-cycle t)) (vertico-count 8)
(vertico-resize nil)
(use-package orderless (vertico-cycle t))
:ensure t
:custom (use-package orderless
(completion-styles '(orderless basic)) :ensure t
(completion-category-defaults nil) :custom
(completion-category-overrides '((file (styles partial-completion))))) (completion-styles '(orderless basic))
(completion-category-defaults nil)
(use-package corfu (completion-category-overrides '((file (styles partial-completion)))))
:ensure t
:config (use-package corfu
(setq corfu-cycle t :ensure t
corfu-auto t :custom
corfu-scroll-margin 4) (corfu-cycle t)
:hook (prog-mode . corfu-mode) (corfu-auto t)
:init (corfu-scroll-margin 4)
(global-corfu-mode)) :hook (prog-mode . corfu-mode)
:init
(use-package consult (global-corfu-mode))
:ensure t
:bind (("C-c M-x" . consult-mode-command) (use-package consult
("C-c h" . consult-history) :ensure t
("C-c k" . consult-kmacro) :bind (("C-c M-x" . consult-mode-command)
("C-c m" . consult-man) ("C-c h" . consult-history)
("C-c i" . consult-info) ("C-c k" . consult-kmacro)
("C-x M-:" . consult-complex-command) ("C-c m" . consult-man)
("C-x b" . consult-buffer) ("C-c i" . consult-info)
("C-x 4 b" . consult-buffer-other-window) ("C-x M-:" . consult-complex-command)
("C-x 5 b" . consult-buffer-other-frame) ("C-x b" . consult-buffer)
("C-x t b" . consult-buffer-other-tab) ("C-x 4 b" . consult-buffer-other-window)
("C-x r b" . consult-bookmark) ("C-x 5 b" . consult-buffer-other-frame)
("C-x p b" . consult-project-buffer) ("C-x t b" . consult-buffer-other-tab)
("M-#" . consult-register-load) ("C-x r b" . consult-bookmark)
("M-'" . consult-register-store) ("C-x p b" . consult-project-buffer)
("C-M-#" . consult-register) ("M-#" . consult-register-load)
("M-y" . consult-yank-pop) ("M-'" . consult-register-store)
("M-g e" . consult-compile-error) ("C-M-#" . consult-register)
("M-g f" . consult-flymake) ("M-y" . consult-yank-pop)
("M-g g" . consult-goto-line) ("M-g e" . consult-compile-error)
("M-g M-g" . consult-goto-line) ("M-g f" . consult-flymake)
("M-g o" . consult-outline) ("M-g g" . consult-goto-line)
("M-g m" . consult-mark) ("M-g M-g" . consult-goto-line)
("M-g k" . consult-global-mark) ("M-g o" . consult-outline)
("M-g i" . consult-imenu) ("M-g m" . consult-mark)
("M-g I" . consult-imenu-multi) ("M-g k" . consult-global-mark)
("M-s d" . consult-find) ("M-g i" . consult-imenu)
("M-s c" . consult-locate) ("M-g I" . consult-imenu-multi)
("M-s g" . consult-grep) ("M-s d" . consult-find)
("M-s G" . consult-git-grep) ("M-s c" . consult-locate)
("M-s r" . consult-ripgrep) ("M-s g" . consult-grep)
("M-s l" . consult-line) ("M-s G" . consult-git-grep)
("M-s L" . consult-line-multi) ("M-s r" . consult-ripgrep)
("M-s k" . consult-keep-lines) ("M-s l" . consult-line)
("M-s u" . consult-focus-lines) ("M-s L" . consult-line-multi)
("M-s e" . consult-isearch-history) ("M-s k" . consult-keep-lines)
:map isearch-mode-map ("M-s u" . consult-focus-lines)
("M-e" . consult-isearch-history) ("M-s e" . consult-isearch-history)
("M-s e" . consult-isearch-history) :map isearch-mode-map
("M-s l" . consult-line) ("M-e" . consult-isearch-history)
("M-s L" . consult-line-multi) ("M-s e" . consult-isearch-history)
:map minibuffer-local-map ("M-s l" . consult-line)
("M-s" . consult-history) ("M-s L" . consult-line-multi)
("M-r" . consult-history)) :map minibuffer-local-map
:hook (completion-list-mode . consult-preview-at-point-mode) ("M-s" . consult-history)
:init ("M-r" . consult-history))
(setq register-preview-delay 0.5 :hook (completion-list-mode . consult-preview-at-point-mode)
register-preview-function #'consult-register-format) :init
(advice-add #'register-preview :override #'consult-register-window) (setq register-preview-delay 0.5
(setq xref-show-xrefs-function #'consult-xref register-preview-function #'consult-register-format)
xref-show-definitions-function #'consult-xref) (advice-add #'register-preview :override #'consult-register-window)
:config (setq xref-show-xrefs-function #'consult-xref
(consult-customize xref-show-definitions-function #'consult-xref)
consult-theme :preview-key '(:debounce 0.2 any) :config
consult-ripgrep consult-git-grep consult-grep (consult-customize
consult-bookmark consult-recent-file consult-xref consult-theme :preview-key '(:debounce 0.2 any)
consult--source-bookmark consult--source-file-register consult-ripgrep consult-git-grep consult-grep
consult--source-recent-file consult--source-project-recent-file consult-bookmark consult-recent-file consult-xref
:preview-key '(:debounce 0.4 any)) consult--source-bookmark consult--source-file-register
(setq consult-narrow-key "C-+")) consult--source-recent-file consult--source-project-recent-file
:preview-key '(:debounce 0.4 any))
(use-package marginalia :custom
:ensure t (consult-narrow-key "C-+"))
:bind (:map minibuffer-local-map
("M-A" . marginalia-cycle)) (use-package marginalia
:init :ensure t
(marginalia-mode)) :bind (:map minibuffer-local-map
("M-A" . marginalia-cycle))
(use-package savehist :init
:init (marginalia-mode))
(savehist-mode))
(use-package savehist
(use-package embark :init
:ensure t (savehist-mode))
:bind
(("C-." . embark-act) (use-package embark
("C-;" . embark-dwim) :ensure t
("C-h B" . embark-bindings)) :bind
:init (("C-." . embark-act)
(setq prefix-help-command #'embark-prefix-help-command) ("C-;" . embark-dwim)
(add-hook 'eldoc-documentation-functions #'embark-eldoc-first-target) ("C-h B" . embark-bindings))
(setq eldoc-documentation-strategy #'eldoc-documentation-compose-eagerly) :init
:config (setq prefix-help-command #'embark-prefix-help-command)
(add-to-list 'display-buffer-alist (add-hook 'eldoc-documentation-functions #'embark-eldoc-first-target)
'("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*" (setq eldoc-documentation-strategy #'eldoc-documentation-compose-eagerly)
nil :config
(window-parameters (mode-line-format . none)))) (add-to-list 'display-buffer-alist
(setq embark-indicators '("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
'(embark-minimal-indicator nil
embark-highlight-indicator (window-parameters (mode-line-format . none))))
embark-isearch-highlight-indicator))) :custom
(embark-indicators
(use-package which-key '(embark-minimal-indicator
:ensure t embark-highlight-indicator
:init (which-key-mode)) embark-isearch-highlight-indicator)))
(use-package embark-consult (use-package which-key
:ensure t :ensure t
:hook :init (which-key-mode))
(embark-collect-mode . consult-preview-at-point-mode))
(use-package embark-consult
(use-package consult-dir :ensure t
:ensure t :hook
:bind (("C-x C-d" . consult-dir) (embark-collect-mode . consult-preview-at-point-mode))
:map minibuffer-local-completion-map
("C-x C-d" . consult-dir) (use-package consult-dir
("C-x C-j" . consult-dir-jump-file))) :ensure t
:bind (("C-x C-d" . consult-dir)
(use-package base16-theme :map minibuffer-local-completion-map
:ensure t ("C-x C-d" . consult-dir)
:config ("C-x C-j" . consult-dir-jump-file)))
(load-theme 'base16-oxocarbon-dark t))
(use-package base16-theme
(use-package nix-mode :ensure t
:mode "\\.nix\\'") :config
(load-theme 'base16-oxocarbon-dark t))
(use-package envrc
:hook (after-init . envrc-global-mode)) (use-package nix-mode
:mode "\\.nix\\'")
(provide 'config)
(use-package envrc
:hook (after-init . envrc-global-mode))
(provide 'config)