fix hgh/update-projects

.gitignore

@@ -1,3 +1,4 @@
 *
 !*.el
 !user-lisp
+work

custom.el

@@ -4,17 +4,21 @@
  ;; 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.
- '(eglot-code-action-indications '(eldoc-hint))
+ '(apheleia-log-only-errors nil)
+ '(custom-enabled-themes '(deeper-blue))
  '(package-selected-packages
-   '(apheleia cape dart-mode dumb-jump dumber-jump exec-path-from-shell
-	      jai-mode magit marginalia markdown-mode move-text
-	      multiple-cursors nael orderless undo-tree vertico vterm
-	      yaml yaml-mode))
+   '(apheleia cape dart-mode diminish dotenv-mode dumber-jump embark evil
+	      evil-collection evil-surround exec-path-from-shell
+	      fish-mode forge ghostel jai-mode magit marginalia mise
+	      move-text multiple-cursors org-roam pgmacs
+	      terraform-mode undo-tree yaml-mode yasnippet
+	      yasnippet-snippets))
  '(package-vc-selected-packages
-   '((jai-mode :url "https://github.com/valignatev/jai-mode.git"))))
+   '((pgmacs :url "https://github.com/emarsden/pgmacs.git")
+     (jai-mode :url "https://github.com/valignatev/jai-mode.git"))))
 (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.
- )
+ '(eglot-inlay-hint-face ((t (:inherit shadow :height 0.8)))))

init.el

@@ -4,74 +4,85 @@
 (package-initialize)
 
 (if (string= system-type "darwin")
-    (set-frame-font "Berkeley Mono 16" nil t)
+    (set-frame-font "Berkeley Mono 18" nil t)
   (set-frame-font "BerkeleyMono 14" nil t))
 
-(load-theme 'modus-vivendi)
+(load-theme 'deeper-blue)
 
 (when (string= system-type "darwin")
+  (setq manual-program "gman")
   (setq dired-use-ls-dired nil)
   (setq mac-command-modifier 'control))
 
-(setq hgh/cua t)
-
-(defun hgh/set-cua-keymaps ()
-  (setq cua-mode 1)
-  (keymap-global-set "C-o" #'find-file)
-  (keymap-global-set "C-f" #'isearch-forward)
-  (keymap-global-set "C-r" #'compile)
-  (keymap-global-set "C-b" #'switch-to-buffer)
-  (keymap-global-set "C-j" #'eldoc)
-  (keymap-global-set "<f1>" #'hgh/edit-init-file))
-
-(defun hgh/set-non-cua-keymaps ()
-  (keymap-global-set "C-c c"   #'compile)
-  (keymap-global-set "C-h h"   #'eldoc)
-  (keymap-global-set "C-c e i" #'hgh/edit-init-file))
-
-(hgh/set-cua-keymaps)
-
-(setq duplicate-line-final-position -1
-      duplicate-region-final-position -1)
-(keymap-global-set "C-,"     #'duplicate-dwim)
 (keymap-global-set "M-o"     #'other-window)
-;; (keymap-global-set "M-i"     #'imenu)
+(keymap-global-set "M-i"     #'imenu)
+(keymap-global-set "C-c c"   #'compile)
 (keymap-global-set "M-0"     #'delete-window)
 (keymap-global-set "M-1"     #'delete-other-windows)
 (keymap-global-set "M-2"     #'split-window-below)
 (keymap-global-set "M-3"     #'split-window-right)
-(keymap-global-set "M-i"     #'complete-symbol)
 
-(require 'completion-preview)
-(keymap-set completion-preview-active-mode-map "M-n" #'completion-preview-next-candidate)
-(keymap-set completion-preview-active-mode-map "M-p" #'completion-preview-prev-candidate)
+(keymap-global-set "C-x C-b" #'ibuffer)
+
+(keymap-global-set "C-c e i" #'hgh/edit-init-file)
+(keymap-global-set "C-c e l" #'hgh/load-init-file)
+(keymap-global-set "C-,"     #'duplicate-dwim)
+
+(keymap-set help-map "h" #'eldoc)
+;; (keymap-global-set "C-h h"   #'eldoc)
+
+(require 'grep)
+(grep-apply-setting 'grep-command "rg --no-heading")
+(grep-apply-setting 'grep-find-command nil)
+
+(defun hgh/emacs-directory (path)
+  (concat user-emacs-directory path))
 
 (setq
- custom-file "~/.emacs.d/custom.el"
+ org-default-notes-file "~/inbox.org"
+ org-todo-keywords '((sequence "TODO" "INPROGRESS" "DONE"))
+ custom-file (hgh/emacs-directory "custom.el")
  make-backup-files nil
  dired-dwim-target t
- use-package-compute-statistics t
- treesit-font-lock-level 4)
+ manual-program "gman"
+ speedbar-window-default-width 25
+ speedbar-window-max-width 25
+ duplicate-line-final-position -1
+ duplicate-region-final-position -1
+ competions-detailed t
+ auth-sources '("~/.authinfo"))
 
-(load-file "~/.emacs.d/utils.el")
+(require 'project)
+(setq project-switch-commands '((project-find-file "Find file" "f")
+                                (project-find-dir "Find dir" "d")
+                                (project-dired "Dired" "D")
+                                (project-find-regexp "ripgrep" "g")
+                                (magit-project-status "Magit" "m")))
 
-(setq-default cursor-type 'bar)
+(define-key project-prefix-map "u" #'hgh/update-projects)
+
+(when (file-directory-p (hgh/emacs-directory "work"))
+  (load-file (hgh/emacs-directory "work/work.el"))
+  (add-to-list 'load-path (hgh/emacs-directory "work")))
+
+(load-file (hgh/emacs-directory "utils.el"))
 
 (setopt
  use-short-answers t
  use-dialog-box nil
  use-package-enable-imenu-support t
- tab-width 4)
+ display-line-numbers-type 'relative)
 
 (electric-pair-mode 1)
-(ido-mode -1)
-(fido-mode -1)
+(fido-mode 1)
 (global-completion-preview-mode 1)
-(global-eldoc-mode 1)
 (tab-bar-mode -1)
 (tool-bar-mode -1)
 (scroll-bar-mode -1)
 (global-hl-line-mode 1)
+(global-eldoc-mode 1)
+(global-display-line-numbers-mode 1)
+(global-auto-revert-mode 1)
 
 (defun hgh/untabify-buffer ()
   (interactive)
@@ -79,6 +90,8 @@
 
 (add-hook 'compilation-filter-hook 'ansi-color-compilation-filter)
 (add-hook 'before-save-hook 'delete-trailing-whitespace)
+(add-hook 'before-save-hook 'hgh/untabify-buffer)
+
 
 (if (file-exists-p custom-file)
     (load-file custom-file))
@@ -87,20 +100,101 @@
 (setq use-package-always-ensure t)
 
 (use-package exec-path-from-shell
+  :custom
+  (exec-path-from-shell-variables '("PATH" "MANPATH" "AWS_ACCESS_KEY_ID" "AWS_SECRET_ACCESS_KEY" "AWS_SESSION_TOKEN"))
   :demand t)
 
 (exec-path-from-shell-initialize)
 
+(use-package diminish
+  :demand t
+  :config
+  (diminish 'eldoc-mode)
+  (diminish 'completion-preview-mode))
+
+(setq treesit-enabled-modes t)
+
+(defun hgh/dired-this-directory ()
+  (interactive)
+  (dired (file-name-directory buffer-file-name)))
+
+(use-package evil
+  :custom
+  (evil-want-C-u-scroll t)
+  (evil-want-Y-yank-to-eol t)
+  (evil-move-beyond-eol t)
+  (evil-undo-system 'undo-tree)
+  :ensure t
+  :init
+  (setq evil-want-integration t) ;; This is optional since it's already set to t by default.
+  (setq evil-want-keybinding nil)
+
+  (defvar hgh/evil-eglot-prefix-map
+    (let ((map (make-sparse-keymap)))
+      (define-key map "a" 'eglot-code-actions)
+      (define-key map "r" 'eglot-rename)
+      map))
+  :config
+  (evil-set-leader nil (kbd "SPC"))
+  (evil-mode 1)
+
+  (evil-global-set-key 'normal (kbd "M-.") #'xref-find-definitions)
+
+  (evil-global-set-key 'normal (kbd "<leader>ff") #'find-file)
+  (evil-global-set-key 'normal (kbd "<leader>fs") #'save-buffer)
+  (evil-global-set-key 'normal (kbd "<leader>fb") #'switch-to-buffer)
+  (evil-global-set-key 'normal (kbd "<leader>gs") #'magit)
+  (evil-global-set-key 'normal (kbd "<leader>gg") #'magit)
+  (evil-global-set-key 'normal (kbd "<leader>rw") #'hgh/dired-this-directory)
+  (evil-global-set-key 'normal (kbd "<leader>h")  #'help-command)
+
+  (evil-global-set-key 'normal (kbd "<leader>w")  evil-window-map)
+  (evil-global-set-key 'normal (kbd "<leader>p")  project-prefix-map)
+  (evil-global-set-key 'visual (kbd "TAB")        #'indent-region)
+  (evil-global-set-key 'normal (kbd "]d")         #'flymake-goto-next-error)
+  (evil-global-set-key 'normal (kbd "[d")         #'flymake-goto-prev-error)
+  (evil-define-key 'normal eglot-mode-map (kbd "<leader>l") hgh/evil-eglot-prefix-map)
+  (evil-global-set-key 'normal (kbd "[d")         #'flymake-goto-prev-error))
+
+(use-package evil-collection
+  :diminish 'evil-collection-unimpaired-mode
+  :after evil
+  :ensure t
+  :custom
+  (evil-collection-key-blacklist '("SPC"))
+  :config
+  (evil-collection-init)
+
+  (require 'compile)
+  (keymap-set compilation-minor-mode-map "SPC" nil)
+  (keymap-set compilation-mode-map "SPC" nil)
+  (keymap-set help-mode-map "SPC" nil))
+
+(use-package evil-surround
+  :ensure t
+  :config
+  (global-evil-surround-mode 1))
+
 (use-package move-text
   :bind (("M-<down>" . 'move-text-down)
-         ("M-<up>"   . 'move-text-up)))
+         ("M-j"      . 'move-text-down)
+         ("M-<up>"   . 'move-text-up)
+         ("M-k"      . 'move-text-up)))
 
 (use-package jai-mode
   :vc (:url "https://github.com/valignatev/jai-mode.git"
-	    :rev :newest))
+            :rev :newest))
 
 (use-package magit
-  :bind ("C-x g" . magit-status))
+  :bind ("C-x g" . magit-status)
+  :config
+  (when (require 'evil nil 'noerror)
+    (evil-global-set-key 'normal (kbd "<leader>gg") #'magit-status)))
+
+(use-package forge
+  :ensure t
+  :after magit
+  :custom (forge-add-default-bindings nil))
 
 (use-package multiple-cursors
   :custom
@@ -108,12 +202,7 @@
   :bind (("C->"     . mc/mark-next-like-this)
          ("C-<"     . mc/mark-previous-like-this)
          ("C-c C-<" . mc/mark-all-like-this)
-         ("C-c C->" . mc/mark-lines))
-  :init
-  (advice-add 'mc/mark-next-like-this :before #'hgh/set-box-cursor)
-  (advice-add 'mc/mark-previous-like-this :before #'hgh/set-box-cursor)
-  (advice-add 'mc/mark-all-like-this :before #'hgh/set-box-cursor)
-  (add-hook 'multiple-cursors-mode-disabled-hook #'hgh/set-bar-cursor))
+         ("C-c C->" . mc/mark-lines)))
 
 (use-package cape
   :hook ((completion-at-point-functions . cape-dabbrev)
@@ -125,64 +214,159 @@
   :config
   (push
    '(:language "jai" :type "function"
-               :supports ("ag" "grep" "rg" "git-grep")
-               :regex "\\bJJJ\\s*::"
-               :tests ("test ::"))
+	       :supports ("ag" "grep" "rg" "git-grep")
+	       :regex "\\bJJJ\\s*::"
+	       :tests ("test ::"))
    dumber-jump-find-rules)
   (push
    '(:language "jai" :type "variable"
-               :supports ("ag" "grep" "rg" "git-grep")
-               :regex "\\bJJJ\\s*(:|:\\s*=|::)"
-               :tests ("test: Type" "test : Type = Val" "test :: Val"))
+	       :supports ("ag" "grep" "rg" "git-grep")
+	       :regex "\\bJJJ\\s*(:|:\\s*=|::)"
+	       :tests ("test: Type" "test : Type = Val" "test :: Val"))
    dumber-jump-find-rules)
   (push
    '(:language "jai" :type "type"
-               :supports ("ag" "grep" "rg" "git-grep")
-               :regex "\\bJJJ\\s*::"
-               :tests ("test ::"))
+	       :supports ("ag" "grep" "rg" "git-grep")
+	       :regex "\\bJJJ\\s*::"
+	       :tests ("test ::"))
    dumber-jump-find-rules))
 
-;; go-ts-mode registers its `\\.go\\'' -> auto-mode-alist entry with a
-;; top-level form that has no autoload cookie, so it only runs once
-;; the file is loaded.  Add the mapping ourselves so .go files open in
-;; go-ts-mode (grammar already lives under tree-sitter/).
-(add-to-list 'auto-mode-alist '("\\.go\\'" . go-ts-mode))
-(add-to-list 'auto-mode-alist '("go\\.mod\\'" . go-mod-ts-mode))
-
 (use-package eglot
+  :custom
+  (eglot-documentation-renderer 'markdown-ts-view-mode)
+  (eglot-code-action-indications nil)
+  :bind (("C-c l a" . eglot-code-actions))
   :hook ((jai-mode . eglot-ensure)
-         (go-ts-mode . eglot-ensure))
+         (dart-mode . eglot-ensure)
+         (terraform-mode . eglot-ensure)
+         (typescript-ts-mode . eglot-ensure)
+         (tsx-ts-mode . eglot-ensure)
+         (elixir-ts-mode . eglot-ensure))
+
   :config
-  (push '(jai-mode "jails" "-jai_path" "/home/grant/.local/jai/") eglot-server-programs)
+  (push `(jai-mode "jails" "-jai_path" ,(concat (getenv "HOME") "/.local/jai/")) eglot-server-programs)
   (push '(sql-mode "postgres-language-server" "lsp-proxy") eglot-server-programs)
-  (push '(dart-mode "fvm" "dart" "language-server" "--client-id" "emacs.eglot-dart") eglot-server-programs))
+  (setf (alist-get '(elixir-mode elixir-ts-mode heex-ts-mode)
+                   eglot-server-programs
+                   nil nil #'equal)
+        '("/Users/grant/programming/thirdparty/elixir-ls/build/language_server.sh" "--stdio"))
+  )
 
 (use-package yaml-mode)
 
-(use-package vterm)
+(use-package fish-mode)
+
+(use-package yasnippet
+  :diminish yas-minor-mode
+  :config
+  (yas-global-mode 1))
+
+(use-package yasnippet-snippets)
+
+(use-package undo-tree
+  :diminish undo-tree-mode
+  :custom
+  (undo-tree-history-directory-alist `(,(cons "." (concat (file-name-directory user-init-file) "undo-tree"))))
+  :config
+  (global-undo-tree-mode 1))
 
 (use-package dart-mode)
 
-(use-package nael)
-
-(use-package vertico
-  :init
-  (vertico-mode 1))
-
-(use-package marginalia
-  :init
-  (marginalia-mode 1))
-
-(use-package orderless)
-
-(use-package go-ts-mode
+(use-package flymake
   :custom
-  (go-ts-mode-indent-offset 4))
+  (flymake-wrap-around t))
 
-(use-package undo-tree
+(use-package markdown-ts-mode
+  :mode ("\\.md\\'" . markdown-ts-mode)
+  :defer t)
+
+(use-package org-roam
+  :custom
+  (org-roam-directory (file-truename "~/org-roam"))
   :init
-  (global-undo-tree-mode 1))
+  (defvar hgh/org-roam-node-map
+    (define-keymap
+      "o" #'org-roam-node-find
+      "f" #'org-roam-node-find
+      "i" #'org-roam-node-insert
+      "c" #'org-roam-capture)
+    "Keymap for capturing new org roam nodes.")
+  (evil-global-set-key 'normal (kbd "<leader>o") hgh/org-roam-node-map)
+  :config
+  (condition-case err
+      (make-directory "~/org-roam")
+    (file-already-exists nil))
+  (org-roam-db-autosync-mode))
+
+(use-package ghostel
+  :custom
+  (ghostel-module-auto-install "download"))
+
+(use-package terraform-mode
+  :init
+  (setf (alist-get "\\.tfstate\\'" auto-mode-alist nil nil #'string=) 'json-ts-mode))
 
 (use-package apheleia
-  :init
+  :diminish apheleia-mode
+  :config
+  (dolist (pair apheleia-formatters)
+    (let ((formatter (symbol-name (car pair))))
+      (when (string-prefix-p "prettier" formatter)
+        (setf (alist-get (car pair) apheleia-formatters)
+	      '("npx" "prettier" "--stdin-filepath" filepath)))))
   (apheleia-global-mode 1))
+
+
+(use-package mise
+  :diminish mise-mode
+  :config
+  (global-mise-mode 1))
+
+(use-package dotenv-mode)
+
+;; Enable rich annotations using the Marginalia package
+(use-package marginalia
+  ;; Bind `marginalia-cycle' locally in the minibuffer.  To make the binding
+  ;; available in the *Completions* buffer, add it to the
+  ;; `completion-list-mode-map'.
+  :bind (:map minibuffer-local-map
+	      ("M-A" . marginalia-cycle))
+
+  ;; The :init section is always executed.
+  :init
+
+  ;; Marginalia must be activated in the :init section of use-package such that
+  ;; the mode gets enabled right away. Note that this forces loading the
+  ;; package.
+  (marginalia-mode -1))
+
+(use-package embark
+  :ensure t
+
+  :bind
+  (("M-'" . embark-act)         ;; pick some comfortable binding
+   ("C-;" . embark-dwim))        ;; good alternative: M-.
+
+  :init
+
+  ;; Optionally replace the key help with a completing-read interface
+  ;; Show the Embark target at point via Eldoc. You may adjust the
+  ;; Eldoc strategy, if you want to see the documentation from
+  ;; multiple providers. Beware that using this can be a little
+  ;; jarring since the message shown in the minibuffer can be more
+  ;; than one line, causing the modeline to move up and down:
+
+  ;; (add-hook 'eldoc-documentation-functions #'embark-eldoc-first-target)
+  ;; (setq eldoc-documentation-strategy #'eldoc-documentation-compose-eagerly)
+
+  ;; Add Embark to the mouse context menu. Also enable `context-menu-mode'.
+  ;; (context-menu-mode 1)
+  ;; (add-hook 'context-menu-functions #'embark-context-menu 100)
+
+  :config
+
+  ;; Hide the mode line of the Embark live/completions buffers
+  (add-to-list 'display-buffer-alist
+	       '("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
+                 nil
+                 (window-parameters (mode-line-format . none)))))

utils.el

@@ -3,8 +3,31 @@
   (interactive)
   (find-file user-init-file))
 
+(defun hgh/load-init-file ()
+  (interactive)
+  (load-file user-init-file))
+
+(defun hgh/duplicate-dwim ()
+  (interactive)
+  (duplicate-dwim)
+  (next-line))
+
 (defun hgh/set-bar-cursor(&rest args)
   (setq-local cursor-type 'bar))
 
 (defun hgh/set-box-cursor(&rest args)
   (setq-local cursor-type 'box))
+
+(defun hgh/update-projects ()
+  (interactive)
+  (dolist (path '("/programming/projects/"
+                  "/programming/projects/worktrees"
+                  "/programming/thirdparty/"
+                  "/programming/probe/"))
+    (let ((projects-root (concat (getenv "HOME") path)))
+      (make-directory projects-root t)
+      (dolist (dir (directory-files projects-root t "^[^.]"))
+        (when (file-directory-p dir)
+          (let ((pr (project--find-in-directory dir)))
+            (when pr (project-remember-project pr)))))))
+  (message "Project list updated."))