Changes to Emacs config (can't explain because moving to elpaca)

I'm having issues with freezing the new versions of stuff in straight
for Emacs 30.  Moving to elpaca to hopefully get out of that.
This commit is contained in:
2024-10-14 00:43:26 +01:00
parent 6cc2b76332
commit e36e3bd66c
6 changed files with 1073 additions and 988 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -98,7 +98,6 @@ form (BRANCH-NAME<CHANGES>[REMOTE-STATUS])."
(lambda (item)
(if (listp item)
(propertize (car item)
'read-only t
'font-lock-face (cdr item)
'front-sticky '(font-lock-face read-only)
'rear-nonsticky '(font-lock-face read-only))

View File

@@ -18,6 +18,7 @@
'(escape-glyph ((t (:foreground "cyan"))))
'(eshell-ls-directory ((t (:foreground "DeepSkyBlue3" :weight bold))))
'(eshell-prompt ((t (:foreground "turquoise3" :weight bold))))
'(evil-goggles-default-face ((t (:background "#004065"))))
'(evil-mc-cursor-default-face ((t (:foreground "black" :background "white"))))
'(evil-mc-region-face ((t (:extend t :background "grey50"))))
'(fill-column-indicator ((t (:inherit shadow :foreground "gray23" :background "gray23" :weight thin))))
@@ -80,21 +81,21 @@
'(org-hide ((t (:foreground "black"))))
'(org-quote ((t (:slant italic))))
'(org-verbatim ((t (:foreground "red3"))))
'(outline-1 ((t (:inherit default :height 1.3
'(outline-1 ((t (:inherit default
:foreground "#db5823"))))
'(outline-2 ((t (:inherit default :height 1.2
'(outline-2 ((t (:inherit default
:foreground "#93a61a"))))
'(outline-3 ((t (:inherit default :height 1.1
'(outline-3 ((t (:inherit default
:foreground "#3c98e0"))))
'(outline-4 ((t (:inherit default :height 1.05
'(outline-4 ((t (:inherit default
:foreground "#c49619"))))
'(outline-5 ((t (:inherit default :height 1.02
'(outline-5 ((t (:inherit default
:foreground "#3cafa5"))))
'(outline-6 ((t (:inherit default :height 1.02
'(outline-6 ((t (:inherit default
:foreground "#93a61a"))))
'(outline-7 ((t (:inherit default :height 1.02
'(outline-7 ((t (:inherit default
:foreground "#ec423a"))))
'(outline-8 ((t (:inherit default :height 1.02
'(outline-8 ((t (:inherit default
:foreground "#3c98e0"))))
'(outline-minor-0 ((t (:extend t :weight bold :background "#01323d"))))
'(outline-minor-1 ((t (:extend t :inherit (outline-minor-0 outline-1) :background "#1e9d310d32a3"))))
@@ -122,8 +123,8 @@
'(tooltip ((t (:foreground "black" :background "lightyellow" :inherit (variable-pitch)))))
'(trailing-whitespace ((t (:background "red1"))))
'(whitespace-line ((t (:background "black" :foreground "violet"))))
'(whitespace-space ((t (:background "#0a0a0a" :foreground "black"))))
'(whitespace-tab ((t (:background "grey5" :foreground "grey20"))))
'(whitespace-space ((t (:background "#171717" :foreground "black"))))
'(whitespace-tab ((t (:background "#171717" :foreground "grey40"))))
`(font-lock-constant-face ((t (:foreground ,personal-solarized-name-colour :weight bold))))
`(font-lock-function-name-face ((t (:box nil :foreground ,personal-solarized-name-colour))))
`(font-lock-preprocessor-face ((t (:foreground ,personal-solarized-name-colour))))
@@ -131,6 +132,6 @@
'(default ((t (:family "RecMonoDuotone Nerd Font Propo" :foundry "ADBO" :width normal
:weight normal :slant normal :underline nil :overline nil
:extend nil :strike-through nil :box nil :inverse-video nil
:foreground "#b6b6b6" :background "black" :stipple nil :inherit nil)))))
:foreground "#b6b6b6" :background "#0a0a0a" :stipple nil :inherit nil)))))
(provide-theme 'personal-solarized)

View File

@@ -60,7 +60,7 @@ Returns a list of files with the directory preprended to them."
(defun +search/search-all ()
(interactive)
(let ((term (read-string "Search for: "))
(let ((term (read-string "Search for: " (thing-at-point 'symbol)))
(candidates (+search/-format-grep-candidates)))
(grep
(format "grep --color=auto -nIHZe \"%s\" -- %s"

View File

@@ -54,8 +54,10 @@
(straight-use-package 'org)
(straight-use-package 'no-littering)
(setq no-littering-etc-directory (expand-file-name ".config/" user-emacs-directory)
no-littering-var-directory (expand-file-name ".local/" user-emacs-directory)
(setq no-littering-etc-directory (expand-file-name ".config/"
user-emacs-directory)
no-littering-var-directory (expand-file-name ".local/"
user-emacs-directory)
custom-file (no-littering-expand-etc-file-name "custom.el"))
(load-file custom-file)
@@ -73,9 +75,11 @@
(when (daemonp)
(require 'general)
(require 'evil)
(require 'dired)
(require 'consult)
(require 'notmuch)
(require 'magit)
(require 'org)
(require 'company)
(require 'eshell)
(require 'org)

View File

@@ -13,7 +13,7 @@
("dired-rsync" . "5bcb851f3bf9c4f7c07299fcc25be7c408a68cda")
("drag-stuff.el" . "6d06d846cd37c052d79acd0f372c13006aa7e7c8")
("edit-indirect" . "82a28d8a85277cfe453af464603ea330eae41c05")
("eglot" . "3ba5d50af4263797d19c3c21f6a290247c9a9571")
;; ("eglot" . "3ba5d50af4263797d19c3c21f6a290247c9a9571")
("el-get" . "e1a3e59d800984ed7ef10469232b59b60244ae90")
("eldoc" . "a2aaed2b7c70c1f28dd212fe2f4304ce89c338d7")
("elisp-refs" . "bf3cca8f74065b1b31036f461e3a093b162311bd")
@@ -25,7 +25,7 @@
("emmet-mode" . "322d3bb112fced57d63b44863357f7a0b7eee1e3")
("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
("eshell-syntax-highlighting" . "fa1d368452ebd11727d267076ae568b892fa9cb9")
("evil" . "60ba716bf500ca21cdf5a8f83101449a1cbe3413")
;("evil" . "60ba716bf500ca21cdf5a8f83101449a1cbe3413")
("evil-collection" . "1ad283f5b7ac9320ac3d41bccfc71a52f714563a")
("evil-commentary" . "c5945f28ce47644c828aac1f5f6ec335478d17fb")
("evil-mc" . "cff3374bfe1b7b1932743425d7fc5d4ab66d747e")
@@ -33,16 +33,16 @@
("evil-org-mode" . "b1f309726b1326e1a103742524ec331789f2bf94")
("evil-surround" . "8fad8540c490d94a820004f227552ca08e3e3857")
("external-completion" . "d717c138623aeecc8e0a0312e0576e98604c43f2")
("f.el" . "19e1da061e759b05e8c480b426287a063ca39484")
;; ("f.el" . "19e1da061e759b05e8c480b426287a063ca39484")
("fd-dired" . "458464771bb220b6eb87ccfd4c985c436e57dc7e")
("flycheck" . "773c3eb31ebeb6bb2f9f57d28177882ca7073df0")
("flycheck-eglot" . "114e1315aaf0dc3196da67da426bbe2b46384fe2")
;; ("flycheck-eglot" . "114e1315aaf0dc3196da67da426bbe2b46384fe2")
("flymake" . "6950c8099e3ee7cafc701b1f86797b2a1b466067")
("general.el" . "833dea2c4a60e06fcd552b653dfc8960935c9fb4")
("gnu-elpa-mirror" . "b97c2f4f9fd0f451f2e32f3d14ebada0715dabf4")
("goto-chg" . "278cd3e6d5107693aa2bb33189ca503f22f227d0")
("haskell-mode" . "3e146c1a89db257bb75c7b33fa2a5a1a85aabd51")
("helpful" . "c57ff0d284b50ff430fe1f13fd48deaa0d1a910e")
;; ("helpful" . "c57ff0d284b50ff430fe1f13fd48deaa0d1a910e")
("hl-todo" . "0faf8569b67f5b23891416d9e7a67e3843338f2a")
("hydra" . "317e1de33086637579a7aeb60f77ed0405bf359b")
("jeison" . "19a51770f24eaa7b538c7be6a8a5c25d154b641f")
@@ -56,7 +56,7 @@
("notmuch" . "b6f144abe1f5aa3519240cf52f4cb9907fefcd0e")
("olivetti" . "a644ee9d24c7283435ce42e11498951e100608c9")
("orderless" . "6936fe46ef07df168a423f04efeda130b4e69753")
("org" . "6a5d0ed342efeb3a4c402672fbe9bfebd80af8b6")
;; ("org" . "6a5d0ed342efeb3a4c402672fbe9bfebd80af8b6")
("org-msg" . "055de4abf611c5d5e12c770fe149c1861b402817")
("org-reveal" . "f55c851bf6aeb1bb2a7f6cf0f2b7bd0e79c4a5a0")
("org-superstar-mode" . "54c81c27dde2a6dc461bb064e79a8b2089093a2e")
@@ -73,7 +73,7 @@
("sly" . "df62abae73bd511885c9c7ec0ea7ea1469a00923")
("sly-asdf" . "6f9d751469bb82530db1673c22e7437ca6c95f45")
("smartparens" . "79a338db115f441cd47bb91e6f75816c5e78a772")
("straight.el" . "ff63b154bef1ef8d92c141bd189001bff74f6982")
;; ("straight.el" . "ff63b154bef1ef8d92c141bd189001bff74f6982")
("swiper" . "595d44264420d989e420351ea25b3c99528547c0")
("transient" . "ef6cb3852f1d02224fbe9b9695cfe2d0dedbc271")
("typescript.el" . "fc3a4f3b275e8cf6cf41aa0c9ef42e25ef908feb")