Compare commits

..

5 Commits

Author SHA1 Message Date
mir
a8d836c6ff Add nix-mode for doing nix-things 2024-01-23 07:51:30 -09:00
mir
2d59d600ff Rename all my repos because reasons 2024-01-23 07:51:12 -09:00
mir
25ab856112 Disable a bunch of things that were overrated and broken
i love you holo-layer but please not right now
2024-01-23 07:50:42 -09:00
mir
23f4cf5205 Seq and Eldoc version issue workaround 2024-01-23 07:50:17 -09:00
mir
d3a2027752 Fix font names on Nix home-manager - this breaks existing installs 2024-01-23 07:48:22 -09:00
2 changed files with 63 additions and 30 deletions

View File

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

View File

@ -20,6 +20,33 @@
(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
@ -85,6 +112,7 @@
(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))
@ -297,7 +325,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/mitch/eshell-dat")
:repo "https://git.mitchmarq42.xyz/mir/eshell-dat")
:after eshell)
(use-package ansilove
:elpaca (:host gitlab
@ -313,7 +341,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/mitch/p11k-el")
:elpaca (:repo "https://git.mitchmarq42.xyz/mir/p11k")
:after eshell
:hook (eshell-first-time-mode . p11k-mode))
@ -547,7 +575,7 @@ targets."
(use-package sv-theme
:elpaca (sv-theme
:repo
"https://git.mitchmarq42.xyz/mitch/vimcolors")
"https://git.mitchmarq42.xyz/mir/sv-theme")
:config
(mitch/visual-setup)
(load-theme 'airline-ravenpower t)
@ -790,6 +818,7 @@ 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
@ -851,6 +880,7 @@ 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)
@ -886,9 +916,10 @@ 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)))
(use-package magit-todos
:after magit
:init (magit-todos-mode))
;; ;; broken bc of hl-todo version issue
;; (use-package magit-todos
;; :after magit
;; :init (magit-todos-mode))
(use-package blamer
:elpaca (:host github :repo "artawower/blamer.el")
:after magit
@ -933,7 +964,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/mitch/dconf-mode.el"))
:repo "https://git.mitchmarq42.xyz/mir/dconf-mode"))
(use-package info-variable-pitch
:elpaca (info-variable-pitch
@ -1207,28 +1238,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)
(unless (string= (getenv "XDG_SESSION_DESKTOP") "hyprland")
(progn
(add-to-list 'load-path "~/.local/src/holo-layer")
(require 'holo-layer)
(setq holo-layer-enable-cursor-animation t)
(setq holo-layer-cursor-color (face-attribute 'cursor :background))
(setq holo-layer-cursor-animation-duration 100)
(holo-layer-enable))))
;; (if (display-graphic-p)
;; (unless (string= (getenv "XDG_SESSION_DESKTOP") "hyprland")
;; (progn
;; (add-to-list 'load-path "~/.local/src/holo-layer")
;; (require 'holo-layer)
;; (setq holo-layer-enable-cursor-animation t)
;; (setq holo-layer-cursor-color (face-attribute 'cursor :background))
;; (setq holo-layer-cursor-animation-duration 100)
;; (holo-layer-enable))))
(use-package oauth
:elpaca (:fetcher codeberg
:repo "https://codeberg.org/martianh/emacs-oauth"
:url "https://codeberg.org/martianh/emacs-oauth")
:custom (oauth-nonce-function 'oauth-internal-make-nonce))
;; (elpaca-wait)
(use-package tumblesocks
:elpaca (:fetcher codeberg
:repo "https://codeberg.org/gargle/tumblesocks"
:url "https://codeberg.org/gargle/tumblesocks")
:custom (tumblesocks-blog "mirqmarq428.tumblr.com")
)
;; (use-package oauth
;; :elpaca (:fetcher codeberg
;; :repo "https://codeberg.org/martianh/emacs-oauth"
;; :url "https://codeberg.org/martianh/emacs-oauth")
;; :custom (oauth-nonce-function 'oauth-internal-make-nonce))
;; ;; (elpaca-wait)
;; (use-package tumblesocks
;; :elpaca (:fetcher codeberg
;; :repo "https://codeberg.org/gargle/tumblesocks"
;; :url "https://codeberg.org/gargle/tumblesocks")
;; :custom (tumblesocks-blog "mirqmarq428.tumblr.com")
;; )
(use-package org-modern-indent
:elpaca (:type git :host github :repo "jdtsmith/org-modern-indent")
@ -1252,5 +1283,7 @@ 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