Skip to content

Allow using list of configs in config #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+23 −17
Open

Allow using list of configs in config #491

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41fd2f3
allow using list of config
kero0 May 14, 2025
55b3042
fix: reading path to org file
kero0 May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 23 additions & 17 deletions elisp.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,47 @@ in
, override ? (self: super: { })
}:
let
isOrgModeFile =
isOrgModeFile = config:
let
ext = lib.last (builtins.split "\\." (builtins.toString config));
type = builtins.typeOf config;
in
(type == "path" || lib.hasPrefix "/" config) && ext == "org";

readFile' = configFile:
let
orgModeConfigFile = pkgs.runCommand "readFile-${configFile}" {
nativeBuildInputs = [ package ];
} ''
cp ${configFile} config.org
emacs -Q --batch ./config.org -f org-babel-tangle
mv config.el $out
'';
in builtins.readFile (if isOrgModeFile configFile then orgModeConfigFile else configFile);

configText =
let f = config:
let
type = builtins.typeOf config;
in # configText can be sourced from either:
# - A string with context { config = "${hello}/config.el"; }
if type == "string" && builtins.hasContext config && lib.hasPrefix builtins.storeDir config then builtins.readFile config
if type == "string" && builtins.hasContext config && lib.hasPrefix builtins.storeDir config then readFile' config
# - A config literal { config = "(use-package foo)"; }
else if type == "string" then config
# - A config path { config = ./config.el; }
else if type == "path" then builtins.readFile config
else if type == "path" then readFile' config
# - A derivation { config = pkgs.writeText "config.el" "(use-package foo)"; }
else if lib.isDerivation config then builtins.readFile "${config}"
else if lib.isDerivation config then readFile' "${config}"
# - A list of any combination of these types
else if type == "list" then map f config
else throw "Unsupported type for config: \"${type}\"";
in lib.concatStringsSep "\n" (lib.lists.flatten (f config));


packages = parse.parsePackagesFromUsePackage {
inherit configText isOrgModeFile alwaysTangle alwaysEnsure;
inherit configText alwaysTangle alwaysEnsure;
};

emacsPackages = (pkgs.emacsPackagesFor package).overrideScope (self: super:
# for backward compatibility: override was a function with one parameter
if builtins.isFunction (override super)
Expand Down Expand Up @@ -75,22 +92,11 @@ emacsWithPackages (epkgs:
# name of the default init file must be default.el according to elisp manual
defaultInitFileName = "default.el";
configFile = pkgs.writeText defaultInitFileName configText;
orgModeConfigFile = pkgs.runCommand defaultInitFileName {
nativeBuildInputs = [ package ];
} ''
cp ${configFile} config.org
emacs -Q --batch ./config.org -f org-babel-tangle
mv config.el $out
'';
in
epkgs.trivialBuild {
pname = "default";
src =
if defaultInitFile == true
then
if isOrgModeFile
then orgModeConfigFile
else configFile
if defaultInitFile == true then configFile
else
if defaultInitFile.name == defaultInitFileName
then defaultInitFile
Expand Down