emacs/.emacs.d/config/init-completion.el

@@ -62,9 +62,6 @@
 ;; Embark adds context actions to completion candidates (and other things!)
 (use-package embark
   :config
-  ;; Make sure identifier at point is the first target
-  (setq embark-target-finders (remove 'embark-target-identifier-at-point embark-target-finders))
-  (add-to-list 'embark-target-finders 'embark-target-identifier-at-point)
   (defun embark-which-key-indicator ()
     "An embark indicator that displays keymaps using which-key.
 The which-key help message will show the type and value of the
@@ -160,22 +157,10 @@ targets."
   ([remap projectile-grep] #'consult-grep)
   ("C-c p" #'consult-yank-from-kill-ring))
 
-(use-package consult-eglot
-  :after (consult eglot)
+(use-package consult-flycheck
+  :after flycheck
   :general
-  (eglot-prefix-map "s" #'consult-eglot-symbols))
-
-(use-package consult-org-roam
-  :after (consult org-roam)
-  :config
-  (consult-org-roam-mode 1)
-  :custom
-  (consult-org-roam-grep-func #'consult-ripgrep)
-  (consult-org-roam-buffer-after-buffers t)
-  :general
-  (org-roam-commands-map "b" #'consult-org-roam-backlinks
-                         "B" #'consult-org-roam-backlinks-recursive
-                         "l" #'consult-org-roam-forward-links))
+  (flycheck-command-map "!" #'consult-flycheck))
 
 (use-package embark-consult
   :general

emacs/.emacs.d/config/init-editing.el

@@ -23,9 +23,6 @@
   (defun sp-wrap-angle-bracket ()
     (interactive)
     (sp-wrap-with-pair "<"))
-  (defun sp-wrap-backtick ()
-    (interactive)
-    (sp-wrap-with-pair "`"))
   (defun sp-after-equals-p (_id action _context)
     (when (memq action '(insert navigate))
       (sp--looking-back-p "=>" 2)))
@@ -73,8 +70,7 @@
           "g{" #'sp-wrap-curly
           "g\"" #'sp-wrap-double-quote
           "g'" #'sp-wrap-single-quote
-          "g<" #'sp-wrap-angle-bracket
-          "g`" #'sp-wrap-backtick))
+          "g<" #'sp-wrap-angle-bracket))
 
 (use-package evil-smartparens
   :after (evil smartparens)

emacs/.emacs.d/config/init-ide.el

@@ -44,32 +44,13 @@
   :custom
   (xref-prompt-for-identifier nil))
 
-;; Inline syntax checking
-(use-package flymake
-  :straight (:type built-in)
-  :config
-  (defvar flymake-map (make-sparse-keymap)
-    "Keymap for flymake commands.")
-  (general-def flymake-map
-    "n" #'flymake-goto-next-error
-    "p" #'flymake-goto-prev-error
-    "b" #'flymake-show-diagnostics-buffer
-    "l" #'consult-flymake
-    "a" #'flymake-show-project-diagnostics)
-  (leader-def-key "e" flymake-map)
-  :hook (prog-mode . flymake-mode))
-
-
-;; LSP client
 (use-package eglot
   :commands (eglot)
   :config
-  (add-to-list 'eglot-stay-out-of 'flymake)
   (defun my-eglot-managed-hook ()
     (if (eglot-managed-p)
         (setq-local corfu-preview-current nil)
-      (kill-local-variable 'corfu-preview-current))
-    (add-hook 'flymake-diagnostic-functions 'eglot-flymake-backend nil t))
+      (kill-local-variable 'corfu-preview-current)))
   (add-hook 'eglot-managed-mode-hook #'my-eglot-managed-hook)
   (add-to-list 'eglot-server-programs
                '(js-web-mode . ("typescript-language-server" "--stdio")))
@@ -202,9 +183,9 @@
     "Prefix keymap for eglot commands.")
   (general-def eglot-prefix-map
     "a" #'eglot-code-actions
-    "R" #'eglot-reconnect
-    "S" #'eglot-shutdown
-    "r" #'eglot-rename
+    "r" #'eglot-reconnect
+    "s" #'eglot-shutdown
+    "R" #'eglot-rename
     "f" #'eglot-format-buffer
     "i" #'eglot-code-action-organize-imports
     "h" #'eldoc
@@ -227,7 +208,6 @@
   (ruby-ts-mode . eglot-ensure)
   (sh-mode . eglot-ensure)
   (bash-ts-mode . eglot-ensure)
-  (yaml-mode . eglot-ensure)
   :custom
   (eglot-confirm-server-initiated-edits nil)
   (eglot-connect-timeout nil))
@@ -247,28 +227,19 @@
 ;; Code formatting library
 (use-package apheleia
   :straight (apheleia :host github :repo "raxod502/apheleia")
-  :config
-  (add-to-list 'apheleia-mode-alist '(ruby-mode . (rubocop)))
   :general
-  (prog-mode-map "C-c f" #'apheleia-format-buffer))
+  ("C-c f" #'apheleia-format-buffer))
 
 ;; AI assistance
 (use-package copilot
   :straight (:host github :repo "copilot-emacs/copilot.el" :files ("dist" "*.el"))
-  :hook ((prog-mode . copilot-mode)
-         (yaml-mode . copilot-mode)
-         (json-mode . copilot-mode)
-         (forge-post-mode . copilot-mode)
-         (git-commit-mode . copilot-mode))
-  :config
-  (add-to-list 'warning-suppress-types '(copilot))
+  :hook (prog-mode . copilot-mode)
   :general
   (prog-mode-map "C-c <tab>" #'copilot-complete)
   (copilot-completion-map "C-n" #'copilot-next-completion
                           "C-p" #'copilot-previous-completion
                           "C-<tab>" #'copilot-accept-completion
                           "C-M-<tab>" #'copilot-accept-completion-by-word
-                          "C-S-<tab>" #'copilot-accept-completion-by-line
                           "C-g" #'copilot-clear-overlay))
 
 ;; Debugger interface

emacs/.emacs.d/config/init-mac.el

@@ -1,16 +1,7 @@
 ;; -*- lexical-binding: t;  -*-
 
-(defcustom my-light-theme 'doom-solarized-light
-  "My light theme."
-  :type 'symbol
-  :group 'personal
-  :options (custom-available-themes))
-
-(defcustom my-dark-theme 'doom-solarized-dark
-  "My dark theme."
-  :type 'symbol
-  :group 'personal
-  :options (custom-available-themes))
+(defvar my-light-theme 'doom-solarized-light)
+(defvar my-dark-theme 'doom-solarized-dark)
 
 (defun mac-appearance () (plist-get (mac-application-state) :appearance))
 
@@ -34,7 +25,4 @@
 
 (add-hook 'after-init-hook #'theme-timer-hook)
 
-(unbind-key "C-<tab>" global-map)
-(unbind-key "C-S-<tab>" global-map)
-
 (provide 'init-mac)

emacs/.emacs.d/config/init-org.el

@@ -164,7 +164,7 @@
   (setq org-roam-v2-ack t)
   (defvar org-roam-commands-map (make-sparse-keymap))
   (general-def org-roam-commands-map
-    "r" #'org-roam-buffer-toggle
+    "l" #'org-roam-buffer-toggle
     "f" #'org-roam-node-find
     "i" #'org-roam-node-insert
     "I" #'org-roam-node-insert-immediate)

emacs/.emacs.d/config/init-ruby.el

@@ -1,7 +1,6 @@
 ;; -*- lexical-binding: t; -*-
 (use-package ruby-mode
-  :straight (:type built-in)
-  :hook (ruby-mode . highlight-indent-guides-mode))
+  :straight (:type built-in))
 
 (use-package rbenv
   :hook (after-init . global-rbenv-mode))

emacs/.emacs.d/config/init-run-command.el

@@ -22,9 +22,7 @@
        (list :command-name "apply"
              :command-line "terraform apply")
        (list :command-name "destroy"
-             :command-line "terraform destroy")
-       (list :command-name "format"
-             :command-line "terraform fmt -recursive"))))
+             :command-line "terraform destroy"))))
 
   (defun run-command-recipe-local ()
     (when run-command-local-commands

homebrew/Brewfile

@@ -52,7 +52,6 @@ brew "terraform-ls"
 brew "texinfo"
 brew "typescript-language-server"
 brew "vscode-langservers-extracted"
-brew "yaml-language-server"
 brew "youtube-dl"
 cask "alfred"
 cask "bartender"
@@ -68,7 +67,6 @@ cask "intellij-idea"
 cask "iterm2"
 cask "notion"
 cask "notion-calendar"
-cask "protonvpn"
 cask "railwaycat/emacsmacport/emacs-mac"
 cask "rectangle"
 cask "slack"