gave up on meow / god mode, just using ';' now
This commit is contained in:
@@ -12,9 +12,59 @@
|
||||
(corfu-auto-prefix 2)
|
||||
(corfu-popupinfo-delay '(0.5 . 0.3)))
|
||||
|
||||
;; (use-package corfu-terminal
|
||||
;; :after corfu
|
||||
;; :init
|
||||
;; (unless (display-graphic-p)
|
||||
;; (corfu-terminal-mode +1)))
|
||||
|
||||
(use-package vertico
|
||||
:init
|
||||
(vertico-mode))
|
||||
(vertico-mode)
|
||||
:config
|
||||
(vertico-multiform-mode t)
|
||||
|
||||
(setq vertico-multiform-commands
|
||||
'(
|
||||
(consult-imenu posframe indexed)
|
||||
(consult-completion-in-region grid)))
|
||||
)
|
||||
|
||||
;; Configure directory extension.
|
||||
(use-package vertico-directory
|
||||
:after vertico
|
||||
:ensure nil
|
||||
;; More convenient directory navigation commands
|
||||
:bind (:map vertico-map
|
||||
("RET" . vertico-directory-enter)
|
||||
("DEL" . vertico-directory-delete-char)
|
||||
("M-DEL" . vertico-directory-delete-word))
|
||||
;; Tidy shadowed file names
|
||||
:hook (rfn-eshadow-update-overlay . vertico-directory-tidy))
|
||||
|
||||
(use-package vertico-posframe
|
||||
:after vertico
|
||||
:config
|
||||
(vertico-posframe-mode t)
|
||||
|
||||
(setq vertico-posframe-width 150
|
||||
vertico-posframe-min-width 90
|
||||
vertico-posframe-border-width 3
|
||||
vertico-count 15
|
||||
vertico-scroll-margin 4)
|
||||
)
|
||||
|
||||
;use consult + vertico instead of corfu if in terminal
|
||||
(use-package consult
|
||||
:defer t
|
||||
:init
|
||||
(setq completion-in-region-function #'consult-completion-in-region
|
||||
consult-fd-args '("fd" "--color=never" "--hidden" ))
|
||||
:config
|
||||
(add-hook 'after-change-major-mode-hook
|
||||
(lambda ()
|
||||
(setq completion-in-region-function #'consult-completion-in-regionc)))
|
||||
)
|
||||
|
||||
(use-package marginalia
|
||||
:init
|
||||
@@ -23,7 +73,6 @@
|
||||
(use-package orderless
|
||||
:custom
|
||||
(completion-styles '(orderless basic))
|
||||
(completion-category-overrides '((file (styles partial-completion))))
|
||||
(completion-pcm-leading-wildcard t))
|
||||
|
||||
(provide 'completion-packages)
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
;; Tree-sitter & LSP tweaks (Core transformative changes)
|
||||
|
||||
(use-package treesit-auto
|
||||
:functions global-treesit-auto-mode
|
||||
:config
|
||||
(treesit-auto-add-to-auto-mode-alist 'all)
|
||||
:hook (after-init . global-treesit-auto-mode)
|
||||
:custom
|
||||
(treesit-auto-install 'prompt)
|
||||
)
|
||||
|
||||
(use-package treesit-fold
|
||||
:defer t
|
||||
:commands (treesit-fold-close
|
||||
treesit-fold-close-all
|
||||
treesit-fold-open
|
||||
treesit-fold-toggle
|
||||
treesit-fold-open-all
|
||||
treesit-fold-mode
|
||||
global-treesit-fold-mode
|
||||
treesit-fold-open-recursively
|
||||
treesit-fold-line-comment-mode)
|
||||
:custom
|
||||
(treesit-fold-line-count-show t)
|
||||
(treesit-fold-line-count-format "--▼--")
|
||||
:config
|
||||
(set-face-attribute 'treesit-fold-replacement-face nil
|
||||
:foreground "#808080"
|
||||
:box nil
|
||||
:weight 'bold))
|
||||
|
||||
;; Tree-sitter hooks
|
||||
(dolist (hook '(c-ts-mode-hook c++-ts-mode-hook java-ts-mode-hook rust-ts-mode-hook
|
||||
go-ts-mode-hook ruby-ts-mode-hook js-ts-mode-hook typescript-ts-mode-hook
|
||||
tsx-ts-mode-hook css-ts-mode-hook html-ts-mode-hook bash-ts-mode-hook
|
||||
cmake-ts-mode-hook dockerfile-ts-mode-hook json-ts-mode-hook toml-ts-mode-hook yaml-ts-mode-hook))
|
||||
(add-hook hook #'treesit-fold-mode))
|
||||
|
||||
(with-eval-after-load 'treesit
|
||||
(setq treesit-font-lock-level 4))
|
||||
|
||||
(use-package mason
|
||||
:defer t
|
||||
:config
|
||||
(mason-setup))
|
||||
|
||||
(use-package lsp-mode
|
||||
:defer t
|
||||
:hook ((c-mode . lsp-deferred)
|
||||
(c++-mode . lsp-deferred)
|
||||
(c-ts-mode . lsp-deferred)
|
||||
(c++-ts-mode . lsp-deferred)
|
||||
(typescript-ts-mode . lsp-deferred)
|
||||
(js-ts-mode . lsp-deferred)
|
||||
(tsx-ts-mode . lsp-deferred)
|
||||
(arduino-mode . lsp-deferred)
|
||||
(toml-ts-mode . lsp-deferred)
|
||||
(json-ts-mode . lsp-deferred)
|
||||
(lsp-mode . lsp-enable-which-key-integration))
|
||||
:commands lsp
|
||||
:init
|
||||
(setq lsp-keymap-prefix "C-l")
|
||||
:config
|
||||
(setq lsp-clients-clangd-executable "clangd"
|
||||
lsp-clangd-binary-path "/usr/bin/clangd"
|
||||
lsp-clients--clangd-default-executable "/usr/bind/clangd"
|
||||
lsp-completion-provider :none
|
||||
lsp-clients-clangd-args '("--header-insertion=iwyu" "--fallback-style=LLVM")
|
||||
)
|
||||
|
||||
(with-eval-after-load 'lsp-mode
|
||||
(define-key lsp-command-map (kbd "a") #'lsp-execute-code-action)
|
||||
(define-key lsp-command-map (kbd "d") #'lsp-ui-doc-glance)
|
||||
(define-key lsp-command-map (kbd "r") #'lsp-rename)
|
||||
|
||||
;; Safe Capability Filter: Handles both association list (alist) and hash-table formats
|
||||
(advice-add 'lsp--client-capabilities :filter-return
|
||||
(lambda (caps)
|
||||
(cond
|
||||
;; If it's a hash table
|
||||
((hash-table-p caps)
|
||||
(when-let ((text-doc (gethash "textDocument" caps)))
|
||||
(if (hash-table-p text-doc)
|
||||
(remhash "inlineCompletion" text-doc)
|
||||
(setcdr (assoc "inlineCompletion" text-doc) nil))))
|
||||
;; If it's an association list (alist)
|
||||
((listp caps)
|
||||
(when-let ((text-doc (cdr (assoc 'textDocument caps))))
|
||||
(setcdr (assoc 'textDocument caps)
|
||||
(assq-delete-all 'inlineCompletion text-doc)))))
|
||||
caps))
|
||||
|
||||
;; Set up arduino-mode safely after lsp-mode is loaded
|
||||
(add-to-list 'lsp-language-id-configuration '(arduino-mode . "cpp"))
|
||||
(lsp-register-client
|
||||
(make-lsp-client
|
||||
:new-connection (lsp-stdio-connection '("clangd" "--header-insertion=never"))
|
||||
:activation-fn (lsp-activate-on "arduino")
|
||||
:server-id 'lsp-arduino-clangd
|
||||
))))
|
||||
|
||||
(use-package lsp-ui
|
||||
:defer t
|
||||
:after lsp-mode
|
||||
:commands lsp-ui-mode
|
||||
:init
|
||||
(setq lsp-ui-sideline-show-symbol t
|
||||
lsp-ui-side-show-code-actions t
|
||||
lsp-ui-sideline-show-hover t
|
||||
|
||||
lsp-ui-doc-enable t
|
||||
lsp-ui-doc-delay 1
|
||||
lsp-ui-doc-position 'at-point
|
||||
lsp-ui-sideline-show-hover t
|
||||
lsp-ui-sideline-show-diagnostics t
|
||||
lsp-ui-side-show-code-actions t
|
||||
lsp-ui-sideline-delay 0.25
|
||||
|
||||
)
|
||||
)
|
||||
|
||||
(with-eval-after-load 'lsp-mode
|
||||
(add-to-list 'lsp-disabled-clients 'tailwindcss))
|
||||
|
||||
(provide 'dev-packages)
|
||||
@@ -1,27 +1,37 @@
|
||||
;;; editing-packages.el --- Editing and navigation configuration -*- lexical-binding: t; -*-
|
||||
|
||||
(use-package meow
|
||||
:config
|
||||
(setq meow-use-clipboard nil
|
||||
meow--kbd-kill-region "C-S-x")
|
||||
(meow-setup)
|
||||
(meow-global-mode 1)
|
||||
)
|
||||
|
||||
(use-package avy
|
||||
:defer t
|
||||
:config
|
||||
(setq avy-timeout-seconds 0.25
|
||||
avy-style 'at-full
|
||||
avy-keys (number-sequence ?a ?z)))
|
||||
avy-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l ?A ?S ?D ?F ?G ?H ?J ?K ?L)
|
||||
avy-orders-alist nil)
|
||||
)
|
||||
|
||||
(use-package smartparens
|
||||
:config
|
||||
(smartparens-global-mode 1))
|
||||
(use-package surround
|
||||
:defer t
|
||||
:bind-keymap ("M-'" . surround-keymap)) ; Or bind to a prefix in general-def
|
||||
|
||||
(use-package kirigami
|
||||
:defer t
|
||||
:commands (kirigami-open-fold kirigami-open-fold-rec kirigami-close-fold
|
||||
kirigami-toggle-fold kirigami-open-folds
|
||||
kirigami-close-folds-except-current
|
||||
kirigami-close-folds))
|
||||
|
||||
(use-package embark
|
||||
:defer t
|
||||
:bind
|
||||
(("M-m" . embark-act)
|
||||
("C-h B" . embark-bindings)
|
||||
)
|
||||
:config
|
||||
(add-to-list 'display-buffer-alist
|
||||
'("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
|
||||
nil
|
||||
(window-parameters (mode-line-format . none))))
|
||||
)
|
||||
|
||||
|
||||
(provide 'editing-packages)
|
||||
|
||||
+25
-13
@@ -3,25 +3,37 @@
|
||||
(use-package clipetty
|
||||
:hook (after-init . global-clipetty-mode))
|
||||
|
||||
|
||||
(use-package dirvish
|
||||
:defer t
|
||||
:config
|
||||
(dirvish-peek-mode)
|
||||
(dirvish-side-follow-mode)
|
||||
(add-hook 'dirvish-directory-view-mode 'diredfl-mode))
|
||||
(add-hook 'dirvish-directory-view-mode 'diredfl-mode)
|
||||
(with-eval-after-load 'dirvish
|
||||
(define-key dirvish-mode-map (kbd "a") #'dirvish-setup-menu)
|
||||
(define-key dirvish-mode-map (kbd "v") #'dirvish-move))
|
||||
)
|
||||
|
||||
(use-package embark
|
||||
|
||||
:bind
|
||||
(("C-." . embark-act)
|
||||
("C-h B" . embark-bindings)
|
||||
)
|
||||
(use-package shell-pop
|
||||
:defer t
|
||||
:custom
|
||||
;(shell-pop-universal-key "C-s s")
|
||||
(shell-pop-window-position "bottom")
|
||||
(shell-pop-term-shell shell-file-name)
|
||||
(shell-pop-window-size 50)
|
||||
)
|
||||
|
||||
(with-eval-after-load 'shell-pop
|
||||
(setopt shell-pop-shell-type '("ghostel" "*ghostel*"
|
||||
(lambda ()
|
||||
(when (fboundp 'ghostel)
|
||||
(let ((ghostel-shell shell-pop-term-shell))
|
||||
(ghostel)))))))
|
||||
|
||||
(use-package dired-clipboard
|
||||
:hook (dired-mode . dired-clipboard-mode)
|
||||
:config
|
||||
(add-to-list 'display-buffer-alist
|
||||
'("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
|
||||
nil
|
||||
(window-parameters (mode-line-format . none))))
|
||||
(setq dired-clipboard-use-wl-copy t
|
||||
dired-clipboard-wayland-target 'uri-list)
|
||||
)
|
||||
|
||||
(use-package benchmark-init
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
|
||||
(use-package denote
|
||||
:defer t
|
||||
:config
|
||||
(setq denote-directory (list (expand-file-name "~/lyfi/SOR/Notes/"))
|
||||
(setq denote-directory (list (expand-file-name "~/lyrinv/SOR/Notes/"))
|
||||
denote-file-type 'markdown-yaml
|
||||
denote-prompts '(title subdirectory keywords)))
|
||||
|
||||
(use-package jinx
|
||||
:hook (emacs-startup . global-jinx-mode)
|
||||
:custom (jinx-languages "en_US nl_NL"))
|
||||
denote-prompts '(title subdirectory keywords))
|
||||
)
|
||||
|
||||
(provide 'tutilities-packages)
|
||||
|
||||
@@ -1,40 +1,5 @@
|
||||
;;; visuals-packages.el --- Visual and structural configuration -*- lexical-binding: t; -*-
|
||||
|
||||
(use-package treesit-auto
|
||||
:functions global-treesit-auto-mode
|
||||
:config
|
||||
(treesit-auto-add-to-auto-mode-alist 'all)
|
||||
:hook (after-init . global-treesit-auto-mode)
|
||||
:custom
|
||||
(treesit-auto-install 'prompt)
|
||||
)
|
||||
|
||||
(use-package treesit-fold
|
||||
:commands (treesit-fold-close
|
||||
treesit-fold-close-all
|
||||
treesit-fold-open
|
||||
treesit-fold-toggle
|
||||
treesit-fold-open-all
|
||||
treesit-fold-mode
|
||||
global-treesit-fold-mode
|
||||
treesit-fold-open-recursively
|
||||
treesit-fold-line-comment-mode)
|
||||
:custom
|
||||
(treesit-fold-line-count-show t)
|
||||
(treesit-fold-line-count-format "--▼--")
|
||||
:config
|
||||
(set-face-attribute 'treesit-fold-replacement-face nil
|
||||
:foreground "#808080"
|
||||
:box nil
|
||||
:weight 'bold))
|
||||
|
||||
;; Tree-sitter hooks
|
||||
(dolist (hook '(c-ts-mode-hook c++-ts-mode-hook java-ts-mode-hook rust-ts-mode-hook
|
||||
go-ts-mode-hook ruby-ts-mode-hook js-ts-mode-hook typescript-ts-mode-hook
|
||||
tsx-ts-mode-hook css-ts-mode-hook html-ts-mode-hook bash-ts-mode-hook
|
||||
cmake-ts-mode-hook dockerfile-ts-mode-hook json-ts-mode-hook toml-ts-mode-hook))
|
||||
(add-hook hook #'treesit-fold-mode))
|
||||
|
||||
t
|
||||
(use-package highlight-quoted
|
||||
:hook (emacs-lisp-mode . highlight-quoted-mode))
|
||||
|
||||
@@ -49,6 +14,17 @@
|
||||
(prog-mode . rainbow-delimiters-mode)
|
||||
(inferior-ess-mode . rainbow-delimiters-mode))
|
||||
|
||||
(use-package highlight-parentheses
|
||||
:hook (prog-mode . highlight-parentheses-mode)
|
||||
:config
|
||||
(setq highlight-parentheses-colors
|
||||
'("grey95" "#111" "#333" "#666")
|
||||
highlight-parentheses-background-colors
|
||||
'("#111" "blue" "green" "red")
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
(use-package indent-bars
|
||||
:config
|
||||
(setq indent-bars-prefer-character ?.
|
||||
@@ -57,11 +33,12 @@
|
||||
indent-bars-pad-frac 0.2
|
||||
indent-bars-color-by-depth '(:regexp "outline-\\([0-9]+\\)" :blend 0.9)
|
||||
indent-bars-highlight-current-depth '(:face default :blend 0.4))
|
||||
(add-hook 'prog-mode-hook #'indent-bars-mode)
|
||||
;(add-hook 'prog-mode-hook #'indent-bars-mode)
|
||||
:hook (prog-mode . indent-bars-mode))
|
||||
|
||||
|
||||
(use-package colorful-mode
|
||||
:defer t
|
||||
:config (setq colorful-allow-mouse-clicks nil))
|
||||
|
||||
(use-package doom-modeline
|
||||
@@ -71,7 +48,9 @@
|
||||
:config
|
||||
(setq
|
||||
doom-modeline-minor-modes t
|
||||
doom-modeline-indent-info t)
|
||||
doom-modeline-indent-info t
|
||||
doom-modeline-column-zero-based t
|
||||
doom-modeline-position-column-line-format '("%l:%c"))
|
||||
)
|
||||
|
||||
;;---
|
||||
@@ -79,17 +58,20 @@
|
||||
;;---
|
||||
|
||||
(use-package nerd-icons-completion
|
||||
:defer t
|
||||
:after marginalia
|
||||
:config
|
||||
(nerd-icons-completion-mode)
|
||||
(add-hook 'marginalia-mode-hook #'nerd-icons-completion-marginalia-setup))
|
||||
|
||||
(use-package nerd-icons-corfu
|
||||
:defer t
|
||||
:after corfu
|
||||
:config
|
||||
(add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
|
||||
|
||||
(use-package nerd-icons-dired
|
||||
:defer t
|
||||
:config
|
||||
(nerd-icons-dired-mode)
|
||||
(add-hook 'dired-mode-hook #'nerd-icons-dired-mode))
|
||||
|
||||
Reference in New Issue
Block a user