diff options
| -rw-r--r-- | context.json | 8 | ||||
| -rw-r--r-- | dots/emacs/.emacs.d/early-init.el (renamed from dots/emacs/.config/emacs.d/early-init.el) | 0 | ||||
| -rw-r--r-- | dots/emacs/.emacs.d/empressomacs.org.j2 (renamed from dots/emacs/.config/emacs.d/empressomacs.org.j2) | 18 | ||||
| -rw-r--r-- | dots/emacs/.emacs.d/init.el (renamed from dots/emacs/.config/emacs.d/init.el) | 22 |
4 files changed, 30 insertions, 18 deletions
diff --git a/context.json b/context.json index 5effa4f..f58676c 100644 --- a/context.json +++ b/context.json @@ -7,7 +7,11 @@ } }, "env": { - "PINENTRY_USER_DATA": "PINENTRY_USE_MAC" + "PINENTRY_USER_DATA": "PINENTRY_USE_MAC", + "XDG_CONFIG_HOME" : "$HOME/.config", + "XDG_DATA_HOME" : "$HOME/.local/share", + "XDG_STATE_HOME" : "$HOME/.local/state", + "XDG_CACHE_HOME" : "$HOME/.cache" } }, "bcd074b37296": { @@ -78,7 +82,7 @@ } }, "emacs": { - "symbol": "'doom-gruvbox-dark", + "symbol": "'doom-gruvbox", "font": { "name": "Agave Nerd Font Mono", "size": 14 diff --git a/dots/emacs/.config/emacs.d/early-init.el b/dots/emacs/.emacs.d/early-init.el index 7bb24d4..7bb24d4 100644 --- a/dots/emacs/.config/emacs.d/early-init.el +++ b/dots/emacs/.emacs.d/early-init.el diff --git a/dots/emacs/.config/emacs.d/empressomacs.org.j2 b/dots/emacs/.emacs.d/empressomacs.org.j2 index 8aa8be5..e1f079d 100644 --- a/dots/emacs/.config/emacs.d/empressomacs.org.j2 +++ b/dots/emacs/.emacs.d/empressomacs.org.j2 @@ -93,8 +93,8 @@ (set-fringe-mode '(1 . 1)) ;; disable scroll bars - (scroll-bar-mode nil) - (horizontal-scroll-bar-mode nil) + (scroll-bar-mode -1) + (horizontal-scroll-bar-mode -1) #+END_SRC *** line - related #+BEGIN_SRC emacs-lisp @@ -146,11 +146,15 @@ must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~ #+END_SRC *** eager loading of theme #+BEGIN_SRC emacs-lisp - (require 'filenotify) - - (setq *theme-file* "~/.config/theme/emacs.el") - (file-notify-add-watch *theme-file* '(change) - #'(lambda (event) (load-file *theme-file*))) + ;; TODO: figure out why this won't work when this is a symlink. + (setq *theme-file* "~/.config/theme/emacs.el") + (defun lazy-theme (event) + (message "Event %S" event) + (load-file *theme-file*)) + + (file-notify-add-watch *theme-file* '(change attribute-change) + 'lazy-theme) + (lazy-theme nil) #+END_SRC * neotree diff --git a/dots/emacs/.config/emacs.d/init.el b/dots/emacs/.emacs.d/init.el index bff8177..a52ee9e 100644 --- a/dots/emacs/.config/emacs.d/init.el +++ b/dots/emacs/.emacs.d/init.el @@ -5,8 +5,13 @@ (defmacro in-remote-buffer (url &rest body) "evals in a buffer whose contents are raw retrieved from (url)" `(with-current-buffer (url-retrieve-synchronously - ,url 'silent 'inhibit-cookies) - ,body)) + ,url 'silent 'inhibit-cookies) + ;; delete headers + (goto-char (point-min)) + (re-search-forward "^$") + (delete-region (point) (point-min)) + + ,@body)) (defun eval-remote (url) "essentially `curl (url) | sh` (ﾉ´ヮ`)ﾉ*" @@ -24,15 +29,15 @@ (defvar *straight-src* "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el") (defun bootstrap-straight (&optional version file src) - "bootstrap straight (version), eval'ing (file) or falling back to (src)" + "bootstrap straight.el (version), eval'ing (file) or falling back to (src)" (or version (setq version *straight-version*)) (or file (setq file *straight-bootstrap-file*)) - (or src (setq src *stragith-src*)) - - (if file-exists-p file) + (or src (setq src *straight-src*)) + (if (file-exists-p file) (load file nil 'nomessage) - (eval-remote src)) -(bootstrap-staight) + (eval-remote src))) + +(bootstrap-straight) ;; install it and use it by default! (straight-use-package 'use-package) @@ -48,4 +53,3 @@ (defvar *settings-org* "empressomacs.org") (org-babel-load-file (find-user-file *settings-org*)) ;;-- </org_init> -- - |