msyds/sydnix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip: fix: Fix and refactor emacs-wrapper and Straight.el things

Browse Source
This commit is contained in:
Madeleine Sydney
2025-01-07 04:30:21 -07:00
parent 1262b8049f
commit ae74a9a15a
4 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
users/crumb/programs/emacs.nix
View File

@@ -26,16 +26,24 @@ let
overlays = [ emacs-overlay ];
};
straightBaseDir = "${config.xdg.dataHome}/straight";
emacsDataDir = "${config.xdg.dataHome}/emacs";
emacsCacheDir = "${emacsDataDir}/cache";
straightBaseDir = "${emacsDataDir}/straight";
emacsWrapper = pkgs.symlinkJoin {
name = "emacs-wrapper";
paths = [ emacsPackage ];
buildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ pkgs.makeWrapper ];
buildInputs = [
pkgs.git # Dependency of Straight.el.
];
postBuild = ''
for i in $out/bin/emacs-*; do
wrapProgram "$i" \
--add-flags "--init-directory \"${emacsConfigDir}\""
--add-flags "--init-directory \"${emacsConfigDir}\"" \
--set EMACS_STRAIGHT_BASE_DIR "${straightBaseDir}" \
--set EMACS_CACHE_DIR "${emacsCacheDir}" \
--set EMACS_DATA_DIR "${emacsDataDir}"
done
'';
};
@@ -43,7 +51,7 @@ in {
sydnix.impermanence.cache.directories = [ straightBaseDir ];
home.packages = [ emacsWrapper ];
home.sessionVariables.EMACS_STRAIGHT_BASE_DIR = straightBaseDir;
# home.sessionVariables.EMACS_STRAIGHT_BASE_DIR = straightBaseDir;
# programs.emacs = {
# enable = true;

6
users/crumb/programs/emacs/init-straight.el
View File

@@ -10,7 +10,7 @@
(let ((bootstrap-file
(file-name-concat straight-base-dir
"repos/straight.el/bootstrap.el"))
"straight/repos/straight.el/bootstrap.el"))
(bootstrap-version 7))
(unless (file-exists-p bootstrap-file)
(let* ((url "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el")
@@ -19,6 +19,8 @@
(with-current-buffer url-buffer
(goto-char (point-max))
(eval-print-last-sexp))))
(load bootstrap-file nil 'nomessage))
(load-file bootstrap-file)
;; (load bootstrap-file nil 'nomessage)
)
(setq straight-use-package-by-default t))

9
users/crumb/programs/emacs/lib/syd-prelude.el
View File

@@ -2,4 +2,13 @@
;; (eval-when-compile (require 'cl-lib))
(defvar syd-data-dir
(or (getenv "EMACS_DATA_DIR")
(error "Need $EMACS_DATA_DIR"))
"Directory analogous to XDG_DATA_HOME for miscellaneous Emacs things.")
(defvar syd-cache-dir
(or (getenv "EMACS_CACHE_DIR")
(error "Need $EMACS_CACHE_DIR")))
(provide 'syd-prelude)