Add forge, hl-todo

init.el

@@ -1,11 +1,17 @@
 ;;; EMACS init file -*- lexical-binding:t -*-
 
+(defconst my-is-nixos (file-exists-p "/nix")
+  "Whether or not Emacs is running on NixOS.")
+
+(when my-is-nixos
+  (setq auth-sources '("/run/agenix/authinfo")))
+
 (with-eval-after-load 'package
   (add-to-list 'package-archives
                '("melpa" . "https://melpa.org/packages/"))
   (package-initialize))
 
-(setq use-package-always-ensure (not (file-exists-p "/nix"))
+(setq use-package-always-ensure (not my-is-nixos)
       use-package-always-defer t
       use-package-expand-minimally t)
 (require 'use-package)
@@ -256,13 +262,14 @@
 (use-package aggressive-indent
   :custom
   (aggressive-indent-sit-for-time 0.1)
-  :hook (emacs-lisp-mode
+  :hook
-         ielm-mode
+  emacs-lisp-mode
-         lisp-mode
+  ielm-mode
-         lisp-interaction-mode
+  lisp-mode
-         scheme-mode
+  lisp-interaction-mode
-         clojure-mode
+  scheme-mode
-         nix-mode)
+  clojure-mode
+  nix-mode
   :config
   (with-eval-after-load 'meow
     (add-to-list 'aggressive-indent-protected-commands #'my-meow-undo)
@@ -280,20 +287,23 @@
   (which-key-mode))
 
 (use-package lsp-mode
-  :hook ((c-ts-mode . lsp-deferred)
+  :hook
-         (c++-ts-mode . lsp-deferred)
+  (c-ts-mode . lsp-deferred)
-         (html-mode . lsp-deferred)
+  (c++-ts-mode . lsp-deferred)
-         (lsp-mode . lsp-enable-which-key-integration))
+  (html-mode . lsp-deferred)
+  (lsp-mode . lsp-enable-which-key-integration)
   :custom
   (read-process-output-max (* 1024 1024)) ; 1 MB
   (lsp-keymap-prefix "M-o"))
 
 (use-package lsp-java
-  :hook (java-ts-mode . lsp-deferred))
+  :hook
+  (java-ts-mode . lsp-deferred))
 
 (use-package lsp-ui)
 (use-package lsp-treemacs
-  :hook (lsp-mode . lsp-treemacs-sync-mode))
+  :hook
+  (lsp-mode . lsp-treemacs-sync-mode))
 
 (use-package dap-mode
   :bind (:map lsp-command-map ("d" . dap-hydra))
@@ -327,19 +337,22 @@
 (use-package yasnippet-snippets)
 
 (use-package consult
-  :bind (("M-s r" . consult-ripgrep)
+  :bind
-         ("M-s d" . consult-find)
+  ("M-s r" . consult-ripgrep)
-         ("C-x M-:" . consult-complex-command)
+  ("M-s d" . consult-find)
-         ("C-x b" . consult-buffer)
+  ("C-x M-:" . consult-complex-command)
-         ("C-x r b" . consult-bookmark)))
+  ("C-x b" . consult-buffer)
+  ("C-x r b" . consult-bookmark))
 
 (use-package consult-yasnippet
-  :bind (("C-c s" . consult-yasnippet)
+  :bind
-         ("C-c S" . consult-yasnippet-visit-snippet-file)))
+  ("C-c s" . consult-yasnippet)
+  ("C-c S" . consult-yasnippet-visit-snippet-file))
 
 (use-package embark
-  :bind (("C-." . embark-act)
+  :bind
-         ("C-;" . embark-dwim)))
+  ("C-." . embark-act)
+  ("C-;" . embark-dwim))
 
 (use-package embark-consult)
 
@@ -388,7 +401,7 @@
   :demand t)
 
 (use-package all-the-icons-completion
-  :after (marginalia all-the-icons)
+  :after marginalia all-the-icons
   :hook (marginalia-mode . all-the-icons-completion-marginalia-setup)
   :init
   (all-the-icons-completion-mode))
@@ -434,9 +447,10 @@
   (buffer-face-mode))
 
 (use-package org
-  :hook ((org-mode . org-indent-mode)
+  :hook
-         (org-mode . auto-fill-mode)
+  (org-mode . org-indent-mode)
-         (org-mode . my-set-text-modes-font))
+  (org-mode . auto-fill-mode)
+  (org-mode . my-set-text-modes-font)
   :custom-face
   (org-block ((t (:family "JetbrainsMono Nerd Font" :height 105))))
   (org-code ((t (:family "JetbrainsMono Nerd Font" :height 105))))
@@ -551,6 +565,10 @@
 (use-package magit
   :hook (git-commit-setup . my-magit-commit-text-setup))
 
+(use-package forge
+  :after magit
+  :demand t)
+
 (use-package tramp
   :custom
   (remote-file-name-inhibit-cache nil)
@@ -561,14 +579,16 @@
                                      tramp-file-name-regexp)))
 
 (use-package vterm
-  :bind (("C-c t" . vterm)
+  :bind
-         ("C-c T" . vterm-other-window))
+  ("C-c t" . vterm)
+  ("C-c T" . vterm-other-window)
   :hook (vterm-mode . my-inhibit-hl-line-mode)
   :config
   (with-eval-after-load 'meow
     (defvar meow-vterm-normal-mode-map
       (let ((map (make-sparse-keymap)))
-        (define-key map (kbd "RET") #'vterm-send-return) map))
+        (define-key map (kbd "RET") #'vterm-send-return)
+        map))
     (setq vterm-keymap-exceptions '("C-c"))
     (define-key vterm-mode-map (kbd "C-c ESC") #'vterm-send-escape)
     (dolist (c '((yank . vterm-yank)
@@ -598,9 +618,13 @@
 
 (use-package xkcd)
 
+(use-package hl-todo
+  :hook prog-mode)
+
 (use-package ligature
-  :hook (prog-mode
+  :hook
-         (ligature-mode . prettify-symbols-mode))
+  prog-mode
+  (ligature-mode . prettify-symbols-mode)
   :custom
   (prettify-symbols-unprettify-at-point t)
   :config
@@ -631,6 +655,8 @@
 (defun my-load-theme-with-solaire ()
   (load-theme 'catppuccin t)
   (catppuccin-reload)
+  (face-spec-set 'font-lock-variable-name-face `((t (:foreground
+                                                     ,(catppuccin-get-color 'flamingo)))))
   (solaire-global-mode)
   (when (daemonp)
     (remove-hook 'server-after-make-frame-hook #'my-load-theme-with-solaire)))
@@ -648,6 +674,16 @@
       (add-hook 'server-after-make-frame-hook #'my-load-theme-with-solaire)
     (my-load-theme-with-solaire)))
 
+(use-package with-editor
+  :bind
+  ([remap async-shell-command] . with-editor-async-shell-command)
+  ([remap shell-command] . with-editor-shell-command)
+  :hook
+  (shell-mode . with-editor-export-editor)
+  (eshell-mode . with-editor-export-editor)
+  (term-exec . with-editor-export-editor)
+  (vterm-mode . with-editor-export-editor))
+
 (use-package emacs-everywhere
   :ensure nil
   :commands emacs-everywhere