From 2cc2bdaf6338596848c342c4de6ad189fd914dd0 Mon Sep 17 00:00:00 2001
From: Marien Zwart <marien.zwart@gmail.com>
Date: Tue, 7 May 2024 23:19:43 +1000
Subject: [PATCH] Fix excessively long lines

This keeps nix code within 100 columns except for one string in a
comment.
---
 default.nix |  9 ++++++---
 flake.nix   | 13 ++++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/default.nix b/default.nix
index 39a904c..77989d6 100644
--- a/default.nix
+++ b/default.nix
@@ -121,7 +121,9 @@ let
 
             # 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 =
               customPackages.${name}
                 or (if origEPkg == null || (p ? pin && isElpa)
@@ -187,7 +189,7 @@ let
                 inherit url;
                 rev = pin;
                 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,
                 # expecting to inherit the rest of the recipe from Straight.
               } // 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
   # 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 3 and packages.el from step 1.
diff --git a/flake.nix b/flake.nix
index 1ec0cc1..b3fcaee 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,9 +56,16 @@
           # Current Doom + NixOS 23.11 requires emacs-overlay: Doom pins
           # emacs-fish-completion, which moved from gitlab to github recently
           # enough stable nixpkgs pulls it from the wrong source.
-          doom-minimal = (pkgs.callPackages self (common // { doomDir = ./doomdirs/minimal; })).doomEmacs;
-          doom-full = (pkgs.callPackages self (common // { full = true; doomDir = ./doomdirs/minimal; })).doomEmacs;
-          doom-example = (pkgs.callPackages self (common // { doomDir = ./doomdirs/example; })).doomEmacs;
+          doom-minimal = (pkgs.callPackages self (common // {
+            doomDir = ./doomdirs/minimal;
+          })).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 // {
             doomDir = ./doomdirs/example;
             profileName = "";