logistic-bot/nix-doom-emacs-unstraightened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix excessively long lines

Browse source 
This keeps nix code within 100 columns except for one string in a
comment.
This commit is contained in:
Marien Zwart 2024-05-07 23:19:43 +10:00
parent c12417c362
commit 2cc2bdaf63
No known key found for this signature in database
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
default.nix
View file

@ -121,7 +121,9 @@ let
# TODO: check notmuch works correctly without notmuch-version.el # TODO: check notmuch works correctly without notmuch-version.el
isElpa = origEPkg != null && (origEPkg == esuper.elpaPackages.${name} or null || origEPkg == esuper.nongnuPackages.${name} or null); isElpa = origEPkg != null && (
origEPkg == esuper.elpaPackages.${name} or null
|| origEPkg == esuper.nongnuPackages.${name} or null);
epkg = epkg =
customPackages.${name} customPackages.${name}
or (if origEPkg == null || (p ? pin && isElpa) or (if origEPkg == null || (p ? pin && isElpa)
@ -187,7 +189,7 @@ let
inherit url; inherit url;
rev = pin; rev = pin;
submodules = !(p.recipe.nonrecursive or false); submodules = !(p.recipe.nonrecursive or false);
# TODO: might need to pull ref from derivation.src if we're not pulling it from p.recipe? # TODO: pull ref from derivation.src when not pulling it from p.recipe?
# Note Doom does have packages with pin + branch (or nonrecursive) set, # Note Doom does have packages with pin + branch (or nonrecursive) set,
# expecting to inherit the rest of the recipe from Straight. # expecting to inherit the rest of the recipe from Straight.
} // optionalAttrs (p ? recipe.branch) { ref = p.recipe.branch; } } // optionalAttrs (p ? recipe.branch) { ref = p.recipe.branch; }
@ -213,7 +215,8 @@ let
# Step 3: Build an emacsWithPackages, pulling all packages from step 1 from # Step 3: Build an emacsWithPackages, pulling all packages from step 1 from
# the set from step 2. # the set from step 2.
emacsWithPackages = doomEmacsPackages.emacsWithPackages (epkgs: (map (p: epkgs.${p}) (builtins.attrNames doomPackageSet))); emacsWithPackages = doomEmacsPackages.emacsWithPackages
(epkgs: (map (p: epkgs.${p}) (builtins.attrNames doomPackageSet)));
# Step 4: build a DOOMDIR, Doom profile and profile loader using Emacs from # Step 4: build a DOOMDIR, Doom profile and profile loader using Emacs from
# step 3 and packages.el from step 1. # step 3 and packages.el from step 1.

13
flake.nix
View file

@ -56,9 +56,16 @@
# Current Doom + NixOS 23.11 requires emacs-overlay: Doom pins # Current Doom + NixOS 23.11 requires emacs-overlay: Doom pins
# emacs-fish-completion, which moved from gitlab to github recently # emacs-fish-completion, which moved from gitlab to github recently
# enough stable nixpkgs pulls it from the wrong source. # enough stable nixpkgs pulls it from the wrong source.
doom-minimal = (pkgs.callPackages self (common // { doomDir = ./doomdirs/minimal; })).doomEmacs; doom-minimal = (pkgs.callPackages self (common // {
doom-full = (pkgs.callPackages self (common // { full = true; doomDir = ./doomdirs/minimal; })).doomEmacs; doomDir = ./doomdirs/minimal;
doom-example = (pkgs.callPackages self (common // { doomDir = ./doomdirs/example; })).doomEmacs; })).doomEmacs;
doom-full = (pkgs.callPackages self (common // {
full = true;
doomDir = ./doomdirs/minimal;
})).doomEmacs;
doom-example = (pkgs.callPackages self (common // {
doomDir = ./doomdirs/example;
})).doomEmacs;
doom-example-without-loader = (pkgs.callPackages self (common // { doom-example-without-loader = (pkgs.callPackages self (common // {
doomDir = ./doomdirs/example; doomDir = ./doomdirs/example;
profileName = ""; profileName = "";