fix scriba loading

This commit is contained in:
Kyle Isom 2025-04-12 13:25:42 -07:00
parent dcad820bad
commit ac418730a0
1 changed files with 35 additions and 16 deletions

33
init.el
View File

@ -17,6 +17,10 @@ present on disk."
(cl-remove-if-not #'file-exists-p (cl-remove-if-not #'file-exists-p
(mapcar #'localize-path paths))) (mapcar #'localize-path paths)))
(defun emacs-path (path)
"Return an expanded path inside the emacs directory."
(expand-file-name path user-emacs-directory))
(defun cache-path (path) (defun cache-path (path)
"Return a localized, expanded path within the emacs cache directory." "Return a localized, expanded path within the emacs cache directory."
(expand-file-name path (expand-file-name path
@ -32,8 +36,7 @@ present on disk."
(package-initialize) (package-initialize)
(let* ((home-dir (getenv "HOME")) (let* ((home-dir (getenv "HOME"))
(ensure-lisp (cl-concatenate (ensure-lisp (emacs-path "ensure.el")))
'string home-dir "/.emacs.d/ensure.el")))
(load ensure-lisp)) (load ensure-lisp))
;; reduce brain damage ;; reduce brain damage
@ -129,6 +132,7 @@ present on disk."
(require 'go-mode) (require 'go-mode)
(add-hook 'before-save-hook 'gofmt-before-save) (add-hook 'before-save-hook 'gofmt-before-save)
;;; L I S P
(when (file-exists-p (expand-file-name "~/quicklisp/slime-helper.el")) (when (file-exists-p (expand-file-name "~/quicklisp/slime-helper.el"))
(load (expand-file-name "~/quicklisp/slime-helper.el")) (load (expand-file-name "~/quicklisp/slime-helper.el"))
(ensure-package 'slime) (ensure-package 'slime)
@ -142,19 +146,34 @@ present on disk."
slime-truncate-lines nil) slime-truncate-lines nil)
(setq lisp-lambda-list-keyword-parameter-alignment t (setq lisp-lambda-list-keyword-parameter-alignment t
lisp-lambda-list-keyword-alignment t)) lisp-lambda-list-keyword-alignment t)
(when (executable-find "nyxt")
;; load nyxt
)
)
(add-hook 'clojure-mode-hook #'enable-paredit-mode) (add-hook 'clojure-mode-hook #'enable-paredit-mode)
(add-hook 'lisp-mode-hook #'enable-paredit-mode) (add-hook 'lisp-mode-hook #'enable-paredit-mode)
(add-hook 'lisp-interaction-mode-hook #'enable-paredit-mode) (add-hook 'lisp-interaction-mode-hook #'enable-paredit-mode)
(add-hook 'scheme-mode-hook #'enable-paredit-mode) (add-hook 'scheme-mode-hook #'enable-paredit-mode)
(add-hook 'emacs-lisp-mode-hook #'enable-paredit-mode)
(message "loading %s" (emacs-path "scriba.el"))
(let ((scriba-lisp (emacs-path "scriba.el")))
(when (and (file-exists-p scriba-lisp)
(load scriba-lisp))
(add-to-list 'auto-mode-alist '("\\.scr\\'" . scriba-mode))))
;;; gameboy dev ;;; gameboy dev
;;; don't load it until we need it.
(defun enable-rgbds-mode ()
"Enables RGBDS mode."
(let ((rgbds-lisp (expand-file-name "rgbds-mode.el" user-emacs-directory))) (let ((rgbds-lisp (expand-file-name "rgbds-mode.el" user-emacs-directory)))
(when (file-exists-p rgbds-lisp) (when (file-exists-p rgbds-lisp)
(load rgbds-lisp) (load rgbds-lisp)
(require 'rgbds-mode) (require 'rgbds-mode)
(add-to-list 'auto-mode-alist '("\\.gbasm\\'" . rgbds-mode )))) (add-to-list 'auto-mode-alist '("\\.gbasm\\'" . rgbds-mode )))))
;;; rust stuff --- no longer frens with rust ;;; rust stuff --- no longer frens with rust
;; (add-hook 'rust-mode-hook #'racer-mode) ;; (add-hook 'rust-mode-hook #'racer-mode)
@ -274,7 +293,7 @@ p :publishing-directory "/ssh:phobos.wntrmute.net:/var/www/sites/tmp/"
))) )))
(defvar *default-font* "Brass Mono") (defvar *default-font* "Brass Mono")
(defvar *acceptable-font-sizes '(13 14 15 16 18)) (defvar *acceptable-font-sizes* '(13 14 15 16 18))
(defun get-default-font () (defun get-default-font ()
(let* ((select-minimum-equal (lambda (x lst) (let* ((select-minimum-equal (lambda (x lst)
@ -287,11 +306,11 @@ p :publishing-directory "/ssh:phobos.wntrmute.net:/var/www/sites/tmp/"
(/ (apply #'* (list (/ (apply #'* (list
(display-pixel-width) (display-pixel-width)
(display-pixel-height))) (display-pixel-height)))
100000)) 115200))
(font-size (gethash (system-name) (font-size (gethash (system-name)
*host-font-size* *host-font-size*
(funcall select-minimum-equal scaled-screen-area (funcall select-minimum-equal scaled-screen-area
*acceptable-font-sizes)))) *acceptable-font-sizes*))))
(format "%s %d" *default-font* font-size))) (format "%s %d" *default-font* font-size)))
(when (window-system) (when (window-system)