lisp/mitch-defuns.el

@@ -39,9 +39,9 @@ declarations for color schemes."
   (tooltip-mode -1)
   (menu-bar-mode -1)
   (set-face-attribute 'fixed-pitch nil
-		      :family "MesloLGS Nerd Font")
+		      :family "MesloLGS NF")
   (set-face-attribute 'default nil
-		      :family "MesloLGS Nerd Font")
+		      :family "MesloLGS NF")
   ;; (set-face-attribute 'variable-pitch nil
   ;; 		      :inherit 'default
   ;; 		      :family "Sans Serif")

lisp/mitch-packages.el

@@ -20,33 +20,6 @@
   (global-prettify-symbols-mode 1)
   (auto-insert-mode))
 
-;; seq version workaround, see https://www.reddit.com/r/emacs/comments/1937vaz/emacs_291_on_windows_install_magit_requires_seq/?rdt=48529
-(defun +elpaca-unload-seq (e)
-  (and (featurep 'seq) (unload-feature 'seq t))
-  (elpaca--continue-build e))
-(defun +elpaca-seq-build-steps ()
-  (append (butlast (if (file-exists-p (expand-file-name "seq" elpaca-builds-directory))
-                       elpaca--pre-built-steps elpaca-build-steps))
-          (list '+elpaca-unload-seq 'elpaca--activate-package)))
-(use-package seq :elpaca `(seq :build ,(+elpaca-seq-build-steps)))
-
-;; eldoc version workarounds...
-(defun global-eldoc-mode (&rest args)
-	  "Placeholder function. Do nothing and return nil."
-	  nil)
-(defun +elpaca-unload-eldoc (e)
-  (and (featurep 'eldoc) (unload-feature 'eldoc t))
-  (elpaca--continue-build e))
-(defun +elpaca-eldoc-build-steps ()
-  (append (butlast (if (file-exists-p (expand-file-name "eldoc" elpaca-builds-directory))
-                       elpaca--pre-built-steps elpaca-build-steps))
-          (list '+elpaca-unload-eldoc 'elpaca--activate-package)))
-(use-package eldoc
-  :elpaca `(eldoc :build ,(+elpaca-eldoc-build-steps))
-  :init 
-  )
-
-(elpaca-wait)
 ;; (use-package no-littering) ;a bad start, and we need more
 
 (use-package epg
@@ -112,7 +85,6 @@
 (elpaca-wait)
 
 (use-package eldoc-box
-  :after eldoc
   :diminish (eldoc-mode eldoc-box-hover-at-point-mode)
   :hook (prog-mode . eldoc-box-hover-at-point-mode))
 
@@ -325,7 +297,7 @@ If the current window occupies the whole frame, split it."
   :hook (eshell-mode . eshell-syntax-highlighting-mode))
 (use-package eshell-dat
   :elpaca (eshell-dat
-	   :repo "https://git.mitchmarq42.xyz/mir/eshell-dat")
+	   :repo "https://git.mitchmarq42.xyz/mitch/eshell-dat")
   :after eshell)
 (use-package ansilove
   :elpaca (:host gitlab
@@ -341,7 +313,7 @@ If the current window occupies the whole frame, split it."
 ;; 			  system-architecture))
 ;;   (add-hook 'eshell-before-prompt-hook #'gitstatus-eshell-start))
 (use-package p11k
-  :elpaca (:repo "https://git.mitchmarq42.xyz/mir/p11k")
+  :elpaca (:repo "https://git.mitchmarq42.xyz/mitch/p11k-el")
   :after eshell
   :hook (eshell-first-time-mode . p11k-mode))
 
@@ -575,7 +547,7 @@ targets."
 (use-package sv-theme
   :elpaca (sv-theme
 	   :repo
-	   "https://git.mitchmarq42.xyz/mir/sv-theme")
+	   "https://git.mitchmarq42.xyz/mitch/vimcolors")
   :config
   (mitch/visual-setup)
   (load-theme 'airline-ravenpower t)
@@ -818,7 +790,6 @@ Return nil if DIR is not in a hugo project at all."
 
 ;; epic drop-down completion
 (use-package corfu
-  :after eldoc
   :elpaca (:files (:defaults "extensions/*.el"))
   ;; :if (display-graphic-p) ; breaks in emacsclient
   :custom
@@ -880,7 +851,6 @@ Return nil if DIR is not in a hugo project at all."
 	  (corfu-terminal-mode +1)))
 
 (use-package magit
-  :after seq
   :commands (madots magit-status magit)
   :hook (magit-mode . turn-off-line-numbers)
   :custom (vc-follow-symlinks t)
@@ -916,10 +886,9 @@ Return nil if DIR is not in a hugo project at all."
     (setq magit-bury-buffer-function #'kill-buffer-and-window)
     (magit-status)
     (run-with-timer 5 3 #'madots--cleanup)))
-;; ;; broken bc of hl-todo version issue
+(use-package magit-todos
-;; (use-package magit-todos
+  :after magit
-;;   :after magit
+  :init (magit-todos-mode))
-;;   :init (magit-todos-mode))
 (use-package blamer
   :elpaca (:host github :repo "artawower/blamer.el")
   :after magit
@@ -964,7 +933,7 @@ Return nil if DIR is not in a hugo project at all."
 (use-package dconf-mode
   :elpaca (dconf-mode
 	   :type git
-	   :repo "https://git.mitchmarq42.xyz/mir/dconf-mode"))
+	   :repo "https://git.mitchmarq42.xyz/mitch/dconf-mode.el"))
 
 (use-package info-variable-pitch
   :elpaca (info-variable-pitch
@@ -1238,28 +1207,28 @@ This is redefined for use with `hypop' library because multiple Emacs frames may
   :elpaca (:url "https://gitlab.com/niklaseklund/dtache")
   :hook (after-init . dtache-setup))
 
-;; (if (display-graphic-p)
+(if (display-graphic-p)
-;;     (unless (string= (getenv "XDG_SESSION_DESKTOP") "hyprland")
+    (unless (string= (getenv "XDG_SESSION_DESKTOP") "hyprland")
-;;       (progn
+      (progn
-;; 	(add-to-list 'load-path "~/.local/src/holo-layer")
+	(add-to-list 'load-path "~/.local/src/holo-layer")
-;; 	(require 'holo-layer)
+	(require 'holo-layer)
-;; 	(setq holo-layer-enable-cursor-animation t)
+	(setq holo-layer-enable-cursor-animation t)
-;; 	(setq holo-layer-cursor-color (face-attribute 'cursor :background))
+	(setq holo-layer-cursor-color (face-attribute 'cursor :background))
-;; 	(setq holo-layer-cursor-animation-duration 100)
+	(setq holo-layer-cursor-animation-duration 100)
-;; 	(holo-layer-enable))))
+	(holo-layer-enable))))
 
-;; (use-package oauth
+(use-package oauth
-;;   :elpaca (:fetcher codeberg
+  :elpaca (:fetcher codeberg
-;; 	   :repo "https://codeberg.org/martianh/emacs-oauth"
+	   :repo "https://codeberg.org/martianh/emacs-oauth"
-;; 		 :url  "https://codeberg.org/martianh/emacs-oauth")
+		 :url  "https://codeberg.org/martianh/emacs-oauth")
-;;   :custom (oauth-nonce-function 'oauth-internal-make-nonce))
+  :custom (oauth-nonce-function 'oauth-internal-make-nonce))
-;; ;; (elpaca-wait)
+;; (elpaca-wait)
-;; (use-package tumblesocks
+(use-package tumblesocks
-;;   :elpaca (:fetcher codeberg
+  :elpaca (:fetcher codeberg
-;; 	   :repo "https://codeberg.org/gargle/tumblesocks"
+	   :repo "https://codeberg.org/gargle/tumblesocks"
-;; 		 :url  "https://codeberg.org/gargle/tumblesocks")
+		 :url  "https://codeberg.org/gargle/tumblesocks")
-;;   :custom (tumblesocks-blog "mirqmarq428.tumblr.com")
+  :custom (tumblesocks-blog "mirqmarq428.tumblr.com")
-;;   )
+  )
 
 (use-package org-modern-indent
   :elpaca (:type git :host github :repo "jdtsmith/org-modern-indent")
@@ -1283,7 +1252,5 @@ This is redefined for use with `hypop' library because multiple Emacs frames may
 
 (use-package lua-mode)
 
-(use-package nix-mode)
-
 (provide 'mitch-packages)
 ;;; mitch-packages.el ends here