refactor(emacs): declare config bankruptcy
Some checks failed
Check Formatting of Files / Check-Formatting (push) Has been cancelled
Some checks failed
Check Formatting of Files / Check-Formatting (push) Has been cancelled
This commit is contained in:
parent
0e3ceba316
commit
7a5e718ad1
GPG Key ID:
C3FADDE7A8534BEB
3
users/price/dots/.config/emacs/.gitignore
vendored
3
users/price/dots/.config/emacs/.gitignore
vendored
@ -4,4 +4,5 @@
|
||||
!early-init.el
|
||||
!config
|
||||
!config/*
|
||||
!config/**/*
|
||||
!config/**/*
|
||||
!config.org
|
||||
|
||||
18
users/price/dots/.config/emacs/config.org
Normal file
18
users/price/dots/.config/emacs/config.org
Normal file
@ -0,0 +1,18 @@
|
||||
#+TITLE: Price Hiller's Emacs Configuration
|
||||
#+AUTHOR: Price Hiller
|
||||
#+EMAIL: price@orion-technologies.io
|
||||
#+OPTIONS: num:nil
|
||||
|
||||
* General.el
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
;; General for keybindings
|
||||
(use-package general
|
||||
:ensure t
|
||||
:demand t)
|
||||
(elpaca-wait)
|
||||
#+end_src
|
||||
|
||||
* Evil Mode
|
||||
#+begin_src emacs-lisp
|
||||
#+end_src
|
||||
@ -1,9 +0,0 @@
|
||||
(use-package flymake
|
||||
:ensure nil
|
||||
:init
|
||||
(define-globalized-minor-mode global-flymake-mode flymake-mode
|
||||
(lambda () (flymake-mode t)))
|
||||
:custom
|
||||
(flymake-show-diagnostics-at-end-of-line t)
|
||||
:config
|
||||
(global-flymake-mode))
|
||||
@ -1,16 +0,0 @@
|
||||
(use-package indent-bars
|
||||
:ensure (:host github
|
||||
:depth 1
|
||||
:repo "jdtsmith/indent-bars")
|
||||
:init
|
||||
(define-globalized-minor-mode global-indent-bars-mode indent-bars-mode
|
||||
(lambda () (indent-bars-mode t)))
|
||||
:custom
|
||||
(indent-bars-starting-column 0)
|
||||
(indent-bars-pad-frac 0.2)
|
||||
(indent-bars-treesit-support t)
|
||||
(indent-bars-pattern ".")
|
||||
(indent-bars-display-on-blank-lines nil)
|
||||
(indent-bars-width-frace 0.2)
|
||||
:config
|
||||
(global-indent-bars-mode t))
|
||||
@ -1,6 +0,0 @@
|
||||
(use-package indent-bars
|
||||
:ensure (:host github
|
||||
:depth 1
|
||||
:repo "jdtsmith/indent-bars")
|
||||
:custom
|
||||
(indent-bars-width-frace 0.2))
|
||||
@ -1,20 +0,0 @@
|
||||
;;; -*- lexical-binding: t -*-
|
||||
;;; Colorize color names and delims
|
||||
|
||||
;; Set background colors for color codes
|
||||
(use-package rainbow-mode
|
||||
:init
|
||||
(define-globalized-minor-mode global-rainbow-mode rainbow-mode
|
||||
(lambda () (rainbow-mode t)))
|
||||
:config
|
||||
|
||||
(global-rainbow-mode t))
|
||||
|
||||
(use-package rainbow-delimiters
|
||||
:init
|
||||
(define-globalized-minor-mode global-rainbow-delimiters-mode rainbow-delimiters-mode
|
||||
(lambda () (rainbow-delimiters-mode t)))
|
||||
:config
|
||||
(global-rainbow-delimiters-mode t))
|
||||
|
||||
|
||||
@ -1,4 +1 @@
|
||||
;;; -*- lexical-binding: t -*-
|
||||
(set-face-attribute 'default nil :family "Fira Code" :height 120)
|
||||
(set-face-attribute 'fixed-pitch nil :family "Fira Code":height 130)
|
||||
(set-face-attribute 'variable-pitch nil :family "Fira Code":height 130)
|
||||
(setq package-enable-at-startup nil)
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
;; -*- lexical-binding: t -*-
|
||||
;; Install elpaca
|
||||
;; Install and setup Elpaca
|
||||
(defvar elpaca-installer-version 0.7)
|
||||
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
|
||||
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
|
||||
@ -38,750 +37,11 @@
|
||||
(load "./elpaca-autoloads")))
|
||||
(add-hook 'after-init-hook #'elpaca-process-queues)
|
||||
(elpaca `(,@elpaca-order))
|
||||
|
||||
(setq package-enable-at-startup nil)
|
||||
|
||||
;; Elpaca use package support
|
||||
(elpaca elpaca-use-package
|
||||
(elpaca-use-package-mode)
|
||||
(setq use-package-always-ensure t))
|
||||
|
||||
;; Block until current queue processed
|
||||
(elpaca-wait)
|
||||
|
||||
;; General for keybindings
|
||||
(use-package general
|
||||
:ensure t
|
||||
:demand t)
|
||||
(elpaca-wait)
|
||||
|
||||
(general-create-definer key-leader
|
||||
:states 'normal
|
||||
:keymaps 'override
|
||||
:prefix "SPC")
|
||||
|
||||
(key-leader
|
||||
:states 'normal
|
||||
"/" '(comment-line :which-key "Comment: Toggle Current Line")
|
||||
)
|
||||
|
||||
(key-leader
|
||||
:states 'visual
|
||||
"/" '(comment-or-uncomment-region :which-key "Comment: Toggle Selected Lines"))
|
||||
|
||||
(key-leader
|
||||
:states '(normal visual)
|
||||
:keymaps 'emacs-lisp-mode-map
|
||||
"f" '(nil :which-key "File"))
|
||||
|
||||
(key-leader
|
||||
:states 'normal
|
||||
:keymaps 'emacs-lisp-mode-map
|
||||
"f r" '(eval-buffer :which-key "File: Evaluate"))
|
||||
|
||||
(key-leader
|
||||
:states 'visual
|
||||
:keymaps 'emacs-lisp-mode-map
|
||||
"f r" '(eval-region :which-key "File: Evaluate Region"))
|
||||
|
||||
(key-leader
|
||||
:states 'normal
|
||||
"b b" #'ibuffer)
|
||||
|
||||
(general-def
|
||||
"<escape>" #'keyboard-escape-quit)
|
||||
|
||||
|
||||
;; Ensure emacs paths load the same as our shell
|
||||
(use-package exec-path-from-shell
|
||||
:config
|
||||
(when (memq window-system '(mac ns x))
|
||||
(exec-path-from-shell-initialize)))
|
||||
|
||||
;; Which key to hint key bindings
|
||||
(use-package which-key
|
||||
:defer nil
|
||||
:general
|
||||
(key-leader
|
||||
:states 'normal
|
||||
"w w" #'which-key-show-top-level)
|
||||
:custom
|
||||
(which-key-idle-delay 1)
|
||||
(which-key-max-description-length 50)
|
||||
:init
|
||||
(which-key-mode))
|
||||
|
||||
(custom-set-variables
|
||||
;; custom-set-variables was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
'(custom-safe-themes
|
||||
'("d445c7b530713eac282ecdeea07a8fa59692c83045bf84dd112dd738c7bcad1d"
|
||||
default))
|
||||
'(doom-modeline-check-simple-format t nil nil "Customized with use-package doom-modeline")
|
||||
'(indent-bars-width-frac 0.05)
|
||||
'(tool-bar-mode nil))
|
||||
|
||||
;; Doom Themes
|
||||
(use-package doom-themes
|
||||
:ensure t
|
||||
:custom
|
||||
(doom-themes-enable-bold t)
|
||||
(doom-themes-enable-italic t)
|
||||
:config
|
||||
(load-theme 'doom-one t)
|
||||
(doom-themes-treemacs-config)
|
||||
(doom-themes-org-config))
|
||||
|
||||
(use-package doom-modeline
|
||||
:custom
|
||||
(doom-modeline-height 25)
|
||||
(doom-modeline-bar-width 5)
|
||||
(doom-modeline-icon t)
|
||||
(doom-modeline-major-mode-icon t)
|
||||
(doom-modeline-major-mode-color-icon t)
|
||||
(doom-modeline-buffer-file-name-style 'truncate-upto-project)
|
||||
(doom-modeline-buffer-state-icon t)
|
||||
(doom-modeline-buffer-modification-icon t)
|
||||
(doom-modeline-minor-modes nil)
|
||||
(doom-modeline-enable-word-count nil)
|
||||
(doom-modeline-buffer-encoding t)
|
||||
(doom-modeline-indent-info nil)
|
||||
(doom-modeline-checker-simple-format t)
|
||||
(doom-modeline-vcs-max-length 12)
|
||||
(doom-modeline-env-version t)
|
||||
(doom-modeline-irc-stylize 'identity)
|
||||
(doom-modeline-github-timer nil)
|
||||
(doom-modeline-gnus-timer nil)
|
||||
:config
|
||||
(doom-modeline-mode))
|
||||
|
||||
(use-package transient)
|
||||
(use-package magit
|
||||
:after transient)
|
||||
|
||||
(use-package nerd-icons)
|
||||
|
||||
(use-package nerd-icons-ibuffer
|
||||
:ensure t
|
||||
:hook (ibuffer-mode . nerd-icons-ibuffer-mode))
|
||||
|
||||
(use-package all-the-icons
|
||||
:if (display-graphic-p))
|
||||
|
||||
(use-package treemacs
|
||||
:defer t
|
||||
:init
|
||||
:general
|
||||
(key-leader
|
||||
:states 'normal
|
||||
"t" '(nil :which-key "Treemacs"))
|
||||
(key-leader
|
||||
:states 'normal
|
||||
"t t" '(treemacs :which-key "Treemacs: Toggle")
|
||||
"t p" '(nil :which-key "Treemacs Project"))
|
||||
(key-leader
|
||||
:states 'normal
|
||||
"t p n" '(nil :which-key "Treemacs Project: New"))
|
||||
:custom
|
||||
(treemacs-silent-refresh t)
|
||||
(treemacs-silent-filewatch t)
|
||||
(treemacs-filewatch-mode t)
|
||||
(treemacs-show-hidden-files nil)
|
||||
(treemacs-follow-after-init t)
|
||||
(treemacs-expand-after-init t)
|
||||
(treemacs-file-event-delay 100)
|
||||
(treemacs-follow-mode t)
|
||||
:hook (treemacs-mode . (lambda () (display-line-numbers-mode -1))))
|
||||
|
||||
(use-package treemacs-icons-dired
|
||||
:hook (dired-mode . treemacs-icons-dired-enable-once))
|
||||
|
||||
(use-package treemacs-evil
|
||||
:after treemacs)
|
||||
|
||||
;; Download Evil
|
||||
(use-package goto-chg)
|
||||
(use-package evil
|
||||
:defer nil
|
||||
:general
|
||||
:custom
|
||||
(evl-kbd-macro-suppress-motion-error t)
|
||||
(evil-want-C-u-scroll t)
|
||||
(evil-want-integration t)
|
||||
(evil-want-keybinding 'nil)
|
||||
(which-key-allow-evil-operators t)
|
||||
(evil-undo-system 'undo-redo)
|
||||
(evil-want-fine-undo t)
|
||||
(evil-emacs-state-modes nil)
|
||||
(evil-insert-state-modes nil)
|
||||
(evil-motion-state-modes nil)
|
||||
:config
|
||||
(evil-mode 1))
|
||||
|
||||
|
||||
(use-package evil-matchit
|
||||
:after evil
|
||||
:config
|
||||
(global-evil-matchit-mode))
|
||||
|
||||
(use-package targets
|
||||
:ensure (:host github
|
||||
:depth 1
|
||||
:repo "noctuid/targets.el"
|
||||
:custom
|
||||
(targets-user-text-objects '((pipe "|" nil separator)
|
||||
(paren "(" ")" pair :more-keys "b")
|
||||
(bracket "[" "]" pair :more-keys "r")
|
||||
(curly "{" "}" pair :more-keys "c")))
|
||||
:config
|
||||
(targets-setup t
|
||||
:inside-key nil
|
||||
:around-key nil
|
||||
:remote-key nil)))
|
||||
|
||||
(use-package evil-surround
|
||||
:after evil
|
||||
:config
|
||||
(global-evil-surround-mode 1))
|
||||
|
||||
(use-package evil-collection
|
||||
:after evil
|
||||
:config
|
||||
(evil-collection-init))
|
||||
|
||||
(use-package evil-goggles
|
||||
:after evil evil-surround
|
||||
:config
|
||||
(evil-goggles-mode)
|
||||
(evil-goggles-use-diff-faces))
|
||||
|
||||
;; Allow to jump to characters, etc.
|
||||
(use-package avy
|
||||
:general
|
||||
(:keymaps '(normal operator)
|
||||
"f" 'avy-goto-char))
|
||||
|
||||
;; Improved PDF Experience
|
||||
(use-package pdf-tools
|
||||
:ensure nil
|
||||
:init
|
||||
(pdf-tools-install)
|
||||
:config
|
||||
(keymap-set pdf-view-mode-map "<remap> <scroll-up-command>"
|
||||
#'pdf-view-scroll-up-or-next-page)
|
||||
(keymap-set pdf-view-mode-map "<remap> <scroll-down-command>"
|
||||
#'pdf-view-scroll-down-or-previous-page)
|
||||
(add-hook 'pdf-tools-enabled-hook (lambda ()
|
||||
(pdf-view-themed-minor-mode)
|
||||
(display-line-numbers-mode -1))))
|
||||
;; Configure Tempel
|
||||
(use-package tempel
|
||||
:custom
|
||||
(tempel-trigger-prefix ">")
|
||||
:init
|
||||
;; Setup completion at point
|
||||
(defun tempel-setup-capf ()
|
||||
;; Add the Tempel Capf to `completion-at-point-functions'.
|
||||
;; `tempel-expand' only triggers on exact matches. Alternatively use
|
||||
;; `tempel-complete' if you want to see all matches, but then you
|
||||
;; should also configure `tempel-trigger-prefix', such that Tempel
|
||||
;; does not trigger too often when you don't expect it. NOTE: We add
|
||||
;; `tempel-expand' *before* the main programming mode Capf, such
|
||||
;; that it will be tried first.
|
||||
(setq-local completion-at-point-functions
|
||||
(cons #'tempel-complete
|
||||
completion-at-point-functions)))
|
||||
|
||||
(add-hook 'conf-mode-hook 'tempel-setup-capf)
|
||||
(add-hook 'prog-mode-hook 'tempel-setup-capf)
|
||||
(add-hook 'text-mode-hook 'tempel-setup-capf))
|
||||
|
||||
(use-package tempel-collection
|
||||
:after tempel)
|
||||
|
||||
;; We do setup for hotfuzz in the orderless package
|
||||
(use-package hotfuzz
|
||||
:ensure (:host github
|
||||
:depth 1
|
||||
:repo "axelf4/hotfuzz"
|
||||
:pre-build (("cmake" "-DCMAKE_C_FLAGS='-O3 -march=native'" ".") ("cmake" "--build" "."))))
|
||||
|
||||
(use-package orderless
|
||||
:after hotfuzz
|
||||
:config
|
||||
(defun +orderless--consult-suffix ()
|
||||
"Regexp which matches the end of string with Consult tofu support."
|
||||
(if (and (boundp 'consult--tofu-char) (boundp 'consult--tofu-range))
|
||||
(format "[%c-%c]*$"
|
||||
consult--tofu-char
|
||||
(+ consult--tofu-char consult--tofu-range -1))
|
||||
"$"))
|
||||
|
||||
;; Recognizes the following patterns:
|
||||
;; * .ext (file extension)
|
||||
;; * regexp$ (regexp matching at end)
|
||||
(defun +orderless-consult-dispatch (word _index _total)
|
||||
(cond
|
||||
;; Ensure that $ works with Consult commands, which add disambiguation suffixes
|
||||
((string-suffix-p "$" word)
|
||||
`(orderless-regexp . ,(concat (substring word 0 -1) (+orderless--consult-suffix))))
|
||||
;; File extensions
|
||||
((and (or minibuffer-completing-file-name
|
||||
(derived-mode-p 'eshell-mode))
|
||||
(string-match-p "\\`\\.." word))
|
||||
`(orderless-regexp . ,(concat "\\." (substring word 1) (+orderless--consult-suffix))))))
|
||||
|
||||
(orderless-define-completion-style +orderless-with-initialism
|
||||
(orderless-matching-styles '(orderless-initialism orderless-literal orderless-regexp)))
|
||||
(setq
|
||||
completion-ignore-case t
|
||||
completion-styles '(hotfuzz orderless basic)
|
||||
completion-category-defaults nil
|
||||
completion-category-overrides '((file (styles partial-completion))
|
||||
(command (styles +orderless-with-initialism))
|
||||
(variable (styles +orderless-with-initialism))
|
||||
(symbol (styles +orderless-with-initialism)))
|
||||
orderless-component-separator #'orderless-escapable-split-on-space
|
||||
orderless-style-dispatchers (list #'+orderless-consult-dispatch
|
||||
#'orderless-affix-dispatch)
|
||||
orderless-matching-styles
|
||||
'(orderless-literal
|
||||
orderless-prefixes
|
||||
orderless-initialism)))
|
||||
|
||||
(use-package corfu
|
||||
:after tempel tempel-collection
|
||||
:custom
|
||||
(completion-cycle-threshold nil)
|
||||
(corfu-min-width 60)
|
||||
(corfu-max-width corfu-min-width)
|
||||
(corfu-cycle t)
|
||||
(corfu-auto t)
|
||||
(corfu-auto-prefix 1)
|
||||
(corfu-on-exact-match nil)
|
||||
(corfu-preselect 'prompt)
|
||||
(corfu-separator ?\s)
|
||||
(tab-always-indent 'complete)
|
||||
(corfu-scroll-margin 5)
|
||||
(corfu-popupinfo-delay 0.1)
|
||||
:general
|
||||
(:keymaps 'corfu-map
|
||||
:states 'insert
|
||||
"TAB" #'corfu-next
|
||||
[remap pixel-scroll-interpolate-up] #'corfu-scroll-down
|
||||
[remap pixel-scroll-interpolate-down] #'corfu-scroll-up
|
||||
[tab] #'corfu-next
|
||||
"S-TAB" #'corfu-previous
|
||||
[backtab] #'corfu-previous
|
||||
"S-SPC" #'corfu-insert-separator
|
||||
"<escape>" #'corfu-quit
|
||||
"<return>" #'corfu-insert
|
||||
"M-d" #'corfu-show-documentation
|
||||
"M-d" #'corfu-show-location)
|
||||
:init
|
||||
(global-corfu-mode)
|
||||
(corfu-history-mode)
|
||||
(corfu-popupinfo-mode))
|
||||
|
||||
;; Add extensions
|
||||
(use-package cape
|
||||
:ensure (:host github
|
||||
:repo "minad/cape"
|
||||
:depth 1)
|
||||
:init
|
||||
;; Add to the global default value of `completion-at-point-functions' which is
|
||||
;; used by `completion-at-point'. The order of the functions matters, the
|
||||
;; first function returning a result wins. Note that the list of buffer-local
|
||||
;; completion functions takes precedence over the global list.
|
||||
(add-to-list 'completion-at-point-functions #'cape-dabbrev)
|
||||
(add-to-list 'completion-at-point-functions #'cape-file)
|
||||
(add-to-list 'completion-at-point-functions #'cape-elisp-block)
|
||||
(add-to-list 'completion-at-point-functions #'cape-keyword)
|
||||
(add-to-list 'completion-at-point-functions #'cape-elisp-symbol)
|
||||
(add-to-list 'completion-at-point-functions #'cape-elisp-block)
|
||||
(add-to-list 'completion-at-point-functions #'cape-tex)
|
||||
(add-to-list 'completion-at-point-functions #'cape-emoji))
|
||||
|
||||
(use-package kind-icon
|
||||
:ensure t
|
||||
:after corfu nerd-icons
|
||||
:custom
|
||||
(kind-icon-use-icons nil)
|
||||
(kind-icon-default-face 'corfu-default) ; to compute blended backgrounds correctly
|
||||
(kind-icon-mapping
|
||||
`(
|
||||
(array ,(nerd-icons-codicon "nf-cod-symbol_array") :face font-lock-type-face)
|
||||
(boolean ,(nerd-icons-codicon "nf-cod-symbol_boolean") :face font-lock-builtin-face)
|
||||
(class ,(nerd-icons-codicon "nf-cod-symbol_class") :face font-lock-type-face)
|
||||
(color ,(nerd-icons-codicon "nf-cod-symbol_color") :face success)
|
||||
(command ,(nerd-icons-codicon "nf-cod-terminal") :face default)
|
||||
(constant ,(nerd-icons-codicon "nf-cod-symbol_constant") :face font-lock-constant-face)
|
||||
(constructor ,(nerd-icons-codicon "nf-cod-triangle_right") :face font-lock-function-name-face)
|
||||
(enummember ,(nerd-icons-codicon "nf-cod-symbol_enum_member") :face font-lock-builtin-face)
|
||||
(enum-member ,(nerd-icons-codicon "nf-cod-symbol_enum_member") :face font-lock-builtin-face)
|
||||
(enum ,(nerd-icons-codicon "nf-cod-symbol_enum") :face font-lock-builtin-face)
|
||||
(event ,(nerd-icons-codicon "nf-cod-symbol_event") :face font-lock-warning-face)
|
||||
(field ,(nerd-icons-codicon "nf-cod-symbol_field") :face font-lock-variable-name-face)
|
||||
(file ,(nerd-icons-codicon "nf-cod-symbol_file") :face font-lock-string-face)
|
||||
(folder ,(nerd-icons-codicon "nf-cod-folder") :face font-lock-doc-face)
|
||||
(interface ,(nerd-icons-codicon "nf-cod-symbol_interface") :face font-lock-type-face)
|
||||
(keyword ,(nerd-icons-codicon "nf-cod-symbol_keyword") :face font-lock-keyword-face)
|
||||
(macro ,(nerd-icons-codicon "nf-cod-symbol_misc") :face font-lock-keyword-face)
|
||||
(magic ,(nerd-icons-codicon "nf-cod-wand") :face font-lock-builtin-face)
|
||||
(method ,(nerd-icons-codicon "nf-cod-symbol_method") :face font-lock-function-name-face)
|
||||
(function ,(nerd-icons-codicon "nf-cod-symbol_method") :face font-lock-function-name-face)
|
||||
(module ,(nerd-icons-codicon "nf-cod-file_submodule") :face font-lock-preprocessor-face)
|
||||
(numeric ,(nerd-icons-codicon "nf-cod-symbol_numeric") :face font-lock-builtin-face)
|
||||
(operator ,(nerd-icons-codicon "nf-cod-symbol_operator") :face font-lock-comment-delimiter-face)
|
||||
(param ,(nerd-icons-codicon "nf-cod-symbol_parameter") :face default)
|
||||
(property ,(nerd-icons-codicon "nf-cod-symbol_property") :face font-lock-variable-name-face)
|
||||
(reference ,(nerd-icons-codicon "nf-cod-references") :face font-lock-variable-name-face)
|
||||
(snippet ,(nerd-icons-codicon "nf-cod-symbol_snippet") :face font-lock-string-face)
|
||||
(string ,(nerd-icons-codicon "nf-cod-symbol_string") :face font-lock-string-face)
|
||||
(struct ,(nerd-icons-codicon "nf-cod-symbol_structure") :face font-lock-variable-name-face)
|
||||
(text ,(nerd-icons-codicon "nf-cod-text_size") :face font-lock-doc-face)
|
||||
(typeparameter ,(nerd-icons-codicon "nf-cod-list_unordered") :face font-lock-type-face)
|
||||
(type-parameter ,(nerd-icons-codicon "nf-cod-list_unordered") :face font-lock-type-face)
|
||||
(unit ,(nerd-icons-codicon "nf-cod-symbol_ruler") :face font-lock-constant-face)
|
||||
(value ,(nerd-icons-codicon "nf-cod-symbol_field") :face font-lock-builtin-face)
|
||||
(variable ,(nerd-icons-codicon "nf-cod-symbol_variable") :face font-lock-variable-name-face)
|
||||
(t ,(nerd-icons-codicon "nf-cod-code") :face font-lock-warning-face)))
|
||||
:config
|
||||
(add-to-list 'corfu-margin-formatters #'kind-icon-margin-formatter))
|
||||
|
||||
(use-package nerd-icons-completion
|
||||
:after marginalia
|
||||
:config
|
||||
(nerd-icons-completion-mode)
|
||||
(add-hook 'marginalia-mode-hook #'nerd-icons-completion-marginalia-setup))
|
||||
|
||||
;; Enable vertico
|
||||
(use-package vertico
|
||||
:general
|
||||
(:keymaps '(normal insert visual motion)
|
||||
"M-." #'vertico-repeat) ; Perfectly return to the state of the last Vertico minibuffer usage
|
||||
(:keymaps 'vertico-map
|
||||
[remap pixel-scroll-interpolate-up] #'vertico-scroll-down
|
||||
[remap pixel-scroll-interpolate-down] #'vertico-scroll-up
|
||||
"C-<return>" #'vertico-insert
|
||||
"<escape>" #'minibuffer-keyboard-quit
|
||||
"M-s" #'vertico-next-group
|
||||
"M-a" #'vertico-previous-group
|
||||
"TAB" #'vertico-next
|
||||
[tab] #'vertico-next
|
||||
"S-TAB" #'vertico-previous
|
||||
[backtab] #'vertico-previous
|
||||
"<backspace>" #'vertico-directory-delete-char
|
||||
"C-<backspace>" #'vertico-directory-delete-word
|
||||
"<return>" #'vertico-directory-enter
|
||||
"M-j" #'vertico-quick-insert)
|
||||
:hook (minibuffer-setup . vertico-repeat-save) ; Make sure vertico state is saved for `vertico-repeat'
|
||||
:custom
|
||||
(vertico-count 15)
|
||||
(vertico-resize t)
|
||||
(vertico-cycle nil)
|
||||
(enable-recursive-minibuffers t)
|
||||
(vertico-grid-lookahead 50)
|
||||
(vertico-buffer-display-action '(display-buffer-reuse-window))
|
||||
(vertico-multiform-categories
|
||||
'((file reverse)
|
||||
(consult-ripgrep buffer)
|
||||
(consult-location)
|
||||
(imenu buffer)
|
||||
(library reverse indexed)
|
||||
(org-roam-node reverse indexed)
|
||||
(t reverse)))
|
||||
(vertico-multiform-commands
|
||||
'(("flyspell-correct-*" grid reverse)
|
||||
(org-refile grid reverse indexed)
|
||||
(consult-yank-pop indexed)
|
||||
(consult-lsp-diagnostics)
|
||||
))
|
||||
:init
|
||||
(defun crm-indicator (args)
|
||||
(cons (format "[CRM%s] %s"
|
||||
(replace-regexp-in-string
|
||||
"\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" ""
|
||||
crm-separator)
|
||||
(car args))
|
||||
(cdr args)))
|
||||
(advice-add #'completing-read-multiple :filter-args #'crm-indicator)
|
||||
|
||||
;; Do not allow the cursor in the minibuffer prompt
|
||||
(setq minibuffer-prompt-properties
|
||||
'(read-only t cursor-intangible t face minibuffer-prompt))
|
||||
(add-hook 'minibuffer-setup-hook #'cursor-intangible-mode)
|
||||
|
||||
(setq read-extended-command-predicate
|
||||
#'command-completion-default-include-p)
|
||||
(vertico-mode)
|
||||
(vertico-mouse-mode))
|
||||
|
||||
;; Enable rich annotations using the Marginalia package
|
||||
(use-package marginalia
|
||||
:ensure (:host github
|
||||
:depth 1
|
||||
:repo "minad/marginalia")
|
||||
:general
|
||||
(:keymaps 'minibuffer-local-map
|
||||
"M-A" #'marginalia-cycle)
|
||||
:custom
|
||||
(marginalia-max-relative-age 0)
|
||||
(marginalia-align #'center)
|
||||
:init
|
||||
(marginalia-mode))
|
||||
|
||||
(use-package embark
|
||||
:after marginalia
|
||||
:general
|
||||
("C-." 'embark-act)
|
||||
:custom
|
||||
(prefix-help-command #'embark-prefix-help-command)
|
||||
:init)
|
||||
|
||||
(use-package embark-consult
|
||||
:hook
|
||||
(embark-collect-mode . consult-preview-at-point-mode))
|
||||
|
||||
(use-package consult
|
||||
:init
|
||||
(advice-add #'register-preview :override #'consult-register-window)
|
||||
(setq register-preview-delay 0.5
|
||||
register-preview-function #'consult-register-format
|
||||
xref-show-xrefs-function #'consult-xref
|
||||
xref-show-definitions-function #'consult-xref
|
||||
consult-narrow-key "<"
|
||||
completion-in-region-function #'consult-completion-in-region)
|
||||
:general
|
||||
(key-leader
|
||||
:states 'normal
|
||||
"c" '(nil :which-key "Consult")
|
||||
"c b" '(consult-buffer :which-key "Consult: Buffers")
|
||||
"c f" '(consult-fd :which-key "Consult: Find File")
|
||||
"c r" '(consult-recent-file :which-key "Consult: Recent Files")))
|
||||
|
||||
|
||||
;; Persist history over Emacs restarts. Vertico sorts by history position.
|
||||
(use-package savehist
|
||||
:ensure nil
|
||||
:init
|
||||
(savehist-mode))
|
||||
|
||||
;; Treesitter
|
||||
(use-package tree-sitter-langs)
|
||||
|
||||
|
||||
(use-package tree-sitter
|
||||
:after tree-sitter-langs
|
||||
:config
|
||||
(require 'tree-sitter-langs)
|
||||
(global-tree-sitter-mode)
|
||||
(add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode))
|
||||
|
||||
(use-package treesit-auto
|
||||
:ensure (:host github :repo "renzmann/treesit-auto")
|
||||
:after tree-sitter
|
||||
:custom
|
||||
(setq treesit-auto-install 'prompt)
|
||||
:config
|
||||
(global-treesit-auto-mode))
|
||||
|
||||
(use-package ts-fold
|
||||
:ensure (:host github :repo "emacs-tree-sitter/ts-fold")
|
||||
:after
|
||||
tree-sitter
|
||||
:config
|
||||
(global-ts-fold-mode)
|
||||
(global-ts-fold-indicators-mode)
|
||||
(ts-fold-line-comment-mode))
|
||||
|
||||
;; Undo Tree
|
||||
(use-package vundo
|
||||
:defer t
|
||||
:hook (vundo-mode . (lambda () (setq-local cursor-type nil)))
|
||||
:custom
|
||||
(vundo-glyph-alist vundo-unicode-symbols))
|
||||
|
||||
;; Persistent Undo
|
||||
(use-package undo-fu-session
|
||||
:config
|
||||
(undo-fu-session-global-mode))
|
||||
|
||||
;; Better wrapping
|
||||
(use-package adaptive-wrap
|
||||
:custom
|
||||
(adaptive-wrap-extra-indent 1)
|
||||
:config
|
||||
(defun turn-on-adaptive-wrap-prefix-mode ()
|
||||
"Turns on adaptive-wrap-prefix-mode."
|
||||
(interactive)
|
||||
(adaptive-wrap-prefix-mode 1))
|
||||
(define-globalized-minor-mode global-adaptive-wrap-prefix-mode
|
||||
adaptive-wrap-prefix-mode
|
||||
turn-on-adaptive-wrap-prefix-mode)
|
||||
(global-visual-line-mode 1)
|
||||
(global-adaptive-wrap-prefix-mode 1))
|
||||
|
||||
;; Setup Language Servers
|
||||
|
||||
(use-package lsp-mode
|
||||
:general
|
||||
(key-leader
|
||||
:states 'visual
|
||||
"l f" '(lsp-format-buffer :which-key "LSP Format: Region"))
|
||||
(key-leader
|
||||
:states 'normal
|
||||
"k" '(lsp-ui-doc-glance :which-key "LSP: Glance Symbol")
|
||||
"K" '(lsp-describe-thing-at-point :which-key "LSP: Full Doc")
|
||||
"l" '(nil :which-key "LSP")
|
||||
"l f" '(lsp-format-buffer :which-key "LSP Format: Buffer")
|
||||
"l i" '(lsp-treemacs-implementations :which-key "LSP: Implementation")
|
||||
"l r" '(lsp-treemacs-references :which-key "LSP: Refrences")
|
||||
"l n" '(lsp-rename :which-key "LSP: Rename")
|
||||
"l R" '(lsp-restart :which-key "LSP: Restart")
|
||||
"l d" '(lsp-find-definition :which-key "LSP: Definition")
|
||||
"l D" '(lsp-find-declaration :which-key "LSP: Declaration")
|
||||
"l c" '(lsp-execute-code-action :which-key "LSP: Code Actions")
|
||||
"l t" '(nil :which-key "LSP Treemacs")
|
||||
"l t e" '(lsp-treemacs-errors-list :which-key "LSP Treemacs: Errors List")
|
||||
"l t s" '(lsp-treemacs-symbols :which-key "LSP Treemacs: Symbols")
|
||||
"l t q" '(lsp-treemacs-quick-fix :which-key "LSP Treemacs: Quickfix")
|
||||
"l t h" '(lsp-treemacs-call-heirarchy :which-key "LSP Treemacs: Call Hierarchy"))
|
||||
:custom
|
||||
(lsp-keymap-prefix "M-l")
|
||||
(lsp-auto-execute-action 'nil)
|
||||
(lsp-auto-guess-root t)
|
||||
(lsp-enable-which-key-integration t)
|
||||
:hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode)
|
||||
;; (XXX-mode . lsp)
|
||||
;; if you want which-key integration
|
||||
(lsp-mode . lsp-enable-which-key-integration))
|
||||
:commands lsp
|
||||
:config
|
||||
(with-eval-after-load 'lsp-mode
|
||||
(lsp-treemacs-sync-mode)
|
||||
(setq lsp-modeline-diagnostics-scope :workspace)))
|
||||
|
||||
;; optionally
|
||||
(use-package lsp-ui
|
||||
:custom
|
||||
(lsp-ui-doc-delay 0.1)
|
||||
:commands
|
||||
lsp-ui-mode
|
||||
lsp-ui-doc-enable)
|
||||
|
||||
;; optionally if you want to use debugger
|
||||
(use-package dap-mode
|
||||
:config
|
||||
(require 'dap-cpptools)
|
||||
(require 'dap-gdb-lldb)
|
||||
(dap-register-debug-template "Rust::GDB Run Configuration"
|
||||
(list :type "gdb"
|
||||
:request "launch"
|
||||
:name "GDB::Run"
|
||||
:gdbpath "rust-gdb"
|
||||
:target nil
|
||||
:cwd nil))
|
||||
(dap-ui-mode)
|
||||
(dap-tooltip-mode)
|
||||
(dap-ui-controls-mode)
|
||||
(dap-auto-configure-mode)
|
||||
(dap-mode))
|
||||
|
||||
;; Better scrolling
|
||||
(defun pixel-scroll-kbd-up ()
|
||||
(interactive)
|
||||
(let ((half-height (/ (window-height) 2)))
|
||||
(unless (pos-visible-in-window-p (point-min))
|
||||
(pixel-scroll-precision-interpolate (* 10 half-height)))
|
||||
(pixel-scroll-precision-interpolate (* 10 half-height))))
|
||||
|
||||
(defun pixel-scroll-kbd-down ()
|
||||
(interactive)
|
||||
(let ((half-height (/ (window-height) 2)))
|
||||
(unless (pos-visible-in-window-p (point-max))
|
||||
(pixel-scroll-precision-interpolate (* 10 (- half-height))))
|
||||
(pixel-scroll-precision-interpolate (* 10 (- half-height)))))
|
||||
|
||||
(use-package pixel-scroll
|
||||
:ensure nil
|
||||
:bind
|
||||
:general
|
||||
(:keymaps 'pixel-scroll-precision-mode-map
|
||||
:states 'normal
|
||||
"C-u" #'pixel-scroll-kbd-up
|
||||
"C-d" #'pixel-scroll-kbd-down
|
||||
"C-f" #'pixel-scroll-interpolate-down
|
||||
"C-b" #'pixel-scroll-interpolate-up)
|
||||
:bind
|
||||
([remap scroll-up-command] . pixel-scroll-interpolate-down)
|
||||
([remap scroll-down-command] . pixel-scroll-interpolate-up)
|
||||
:custom
|
||||
(pixel-scroll-precision-interpolate-page t)
|
||||
:init
|
||||
(pixel-scroll-precision-mode 1))
|
||||
|
||||
;; Rust integration
|
||||
(use-package rustic
|
||||
:general
|
||||
(key-leader
|
||||
:states '(normal rustic-mode)
|
||||
"f r" '(rustic-cargo-run :which-key "Cargo: Run"))
|
||||
:config
|
||||
(rustic-mode))
|
||||
|
||||
;;; Org Mode Appearance ------------------------------------
|
||||
(require 'files)
|
||||
(use-package org
|
||||
:hook (org-mode . org-indent-mode)
|
||||
:general
|
||||
(key-leader
|
||||
:states 'normal
|
||||
"o" '(nil :which-key "Org"))
|
||||
:custom
|
||||
(org-agenda-files '("~/Notes" "~/Git/College"))
|
||||
(org-hide-emphasis-markers t))
|
||||
|
||||
(use-package org-modern
|
||||
:after org
|
||||
:config
|
||||
(global-org-modern-mode))
|
||||
|
||||
;; Emacs Settings
|
||||
(electric-pair-mode)
|
||||
(menu-bar-mode -1) ; Disable menubar
|
||||
(scroll-bar-mode -1) ; Disable visible scrollbar
|
||||
(tool-bar-mode -1) ; Disable toolbar
|
||||
(tooltip-mode) ; Enable tooltips
|
||||
(set-fringe-mode 10) ; Breathing room
|
||||
(setq visible-bell nil) ; Enable visible bell
|
||||
(blink-cursor-mode 0) ; Disable blinking cursor
|
||||
(setq display-line-numbers-type 'relative)
|
||||
(column-number-mode t)
|
||||
(global-display-line-numbers-mode t)
|
||||
(setq-default indent-tabs-mode nil)
|
||||
(global-hl-line-mode t)
|
||||
(setq use-dialog-box nil)
|
||||
(global-auto-revert-mode t)
|
||||
(recentf-mode t)
|
||||
(fset 'yes-or-no-p 'y-or-n-p)
|
||||
(save-place-mode 1)
|
||||
|
||||
(mapc 'load (file-expand-wildcards (expand-file-name "./config/*.el" user-emacs-directory)))
|
||||
(mapc 'load (file-expand-wildcards (expand-file-name "./config/**/*.el" user-emacs-directory)))
|
||||
(custom-set-faces
|
||||
;; custom-set-faces was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
'(avy-lead-face ((t (:foreground "#FF5D62" :slant oblique :weight bold))))
|
||||
'(evil-goggles-change-face ((t (:inherit diff-removed))))
|
||||
'(evil-goggles-delete-face ((t (:inherit diff-removed))))
|
||||
'(evil-goggles-paste-face ((t (:inherit diff-added))))
|
||||
'(evil-goggles-undo-redo-add-face ((t (:inherit diff-added))))
|
||||
'(evil-goggles-undo-redo-change-face ((t (:inherit diff-changed))))
|
||||
'(evil-goggles-undo-redo-remove-face ((t (:inherit diff-removed))))
|
||||
'(evil-goggles-yank-face ((t (:inherit diff-changed))))
|
||||
'(italic ((t (:slant oblique)))))
|
||||
;; Load in the config via org babel
|
||||
(package-initialize)
|
||||
(org-babel-load-file "~/.config/emacs/config.org")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user