Compare commits

...

2 Commits

Author SHA1 Message Date
Miranda Marquez
240ec1d4d3 only do the resolution stuff if neofetch exists 2024-05-25 20:52:33 -08:00
Miranda Marquez
7dcc262d39 move elpaca eldoc seq fix to obsolete.el 2024-05-25 20:45:06 -08:00
3 changed files with 37 additions and 34 deletions

23
init.el
View File

@ -333,29 +333,6 @@ If the current window occupies the whole frame, split it."
`(use-package--orig ,@(-replace :git use-package-git-keyword args)))) `(use-package--orig ,@(-replace :git use-package-git-keyword args))))
;; (use-package lua-mode :git nil) ;; (use-package lua-mode :git nil)
;; see https://www.reddit.com/r/emacs/comments/1937vaz/emacs_291_on_windows_install_magit_requires_seq/?rdt=48529
;; ;; seq version workaround
;; (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)))
;; (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)))
;; (elpaca eldoc :build (+elpaca-eldoc-build-steps))
(use-package compat) (use-package compat)
(use-package marginalia :init (marginalia-mode)) (use-package marginalia :init (marginalia-mode))
;; (elpaca gcmh (gcmh-mode)) ;; (elpaca gcmh (gcmh-mode))

View File

@ -71,6 +71,7 @@ console."
(pixel-scroll-precision-mode t) (pixel-scroll-precision-mode t)
(pixel-scroll-mode t)) (pixel-scroll-mode t))
;; Size of text. おまえ わ もう しんでいる. ;; Size of text. おまえ わ もう しんでいる.
(if (executable-find "neofetch")
(let* ((resolution (mapcar #'string-to-number (let* ((resolution (mapcar #'string-to-number
(split-string (split-string
(cadr (split-string (cadr (split-string
@ -81,7 +82,7 @@ console."
(font-height (/ resy 11))) (font-height (/ resy 11)))
(set-face-attribute 'fixed-pitch nil :height font-height) (set-face-attribute 'fixed-pitch nil :height font-height)
(set-face-attribute 'default nil :height font-height) (set-face-attribute 'default nil :height font-height)
(set-face-attribute 'variable-pitch nil :height (+ font-height 10)))) (set-face-attribute 'variable-pitch nil :height (+ font-height 10)))))
(defun toggle-ja-input () (defun toggle-ja-input ()
"Switch between english and japanese. Not broken." "Switch between english and japanese. Not broken."

View File

@ -26,6 +26,31 @@
;;; Code: ;;; Code:
(error "Please don't load `obsolete.el', it's obsolete.") (error "Please don't load `obsolete.el', it's obsolete.")
;; elpaca eldoc stuff, probably not good anymore
;; see https://www.reddit.com/r/emacs/comments/1937vaz/emacs_291_on_windows_install_magit_requires_seq/?rdt=48529
;; seq version workaround
(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)))
(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)))
(elpaca eldoc :build (+elpaca-eldoc-build-steps))
;; scribble SVGs in org buffers like it's 2005 (idk I was a baby then) ;; scribble SVGs in org buffers like it's 2005 (idk I was a baby then)
(use-package edraw (use-package edraw
:elpaca (:repo "https://github.com/misohena/el-easydraw") :elpaca (:repo "https://github.com/misohena/el-easydraw")