From c12417c36277a1f0fafa8294b61d3870f26444b3 Mon Sep 17 00:00:00 2001
From: Marien Zwart <marien.zwart@gmail.com>
Date: Tue, 7 May 2024 23:02:59 +1000
Subject: [PATCH] Rename doom.nix to default.nix

---
 README.md               |  5 +++--
 doom.nix => default.nix |  0
 fetch-overrides.nix     |  2 +-
 flake.nix               | 12 ++++++------
 home-manager.nix        |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename doom.nix => default.nix (100%)

diff --git a/README.md b/README.md
index 0178817..80b080f 100644
--- a/README.md
+++ b/README.md
@@ -106,8 +106,9 @@ The overlay adds two packages:
 ### Without flakes
 
 This is currently not explicitly supported, but should be possible (use
-`pkgs.callPackages doom.nix`). PRs extending this part of the documentation are
-welcome, as are (within reason) changes necessary to support use without flakes.
+`pkgs.callPackages ./nix-doom-emacs-unstraightened`). PRs extending this part of
+the documentation are welcome, as are (within reason) changes necessary to
+support use without flakes.
 
 ### Options
 
diff --git a/doom.nix b/default.nix
similarity index 100%
rename from doom.nix
rename to default.nix
diff --git a/fetch-overrides.nix b/fetch-overrides.nix
index 06d0388..9151a4a 100644
--- a/fetch-overrides.nix
+++ b/fetch-overrides.nix
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Data loaded by doom.nix.
+# Data loaded by default.nix.
 {
   extraUrls = {
     # Straight recipe from el-get
diff --git a/flake.nix b/flake.nix
index bc67ece..1ec0cc1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,7 @@
     };
   };
 
-  outputs = { systems, doomemacs, nixpkgs, emacs-overlay, ... }: let
+  outputs = { self, systems, doomemacs, nixpkgs, emacs-overlay, ... }: let
     perSystemPackages = let
       eachSystem = nixpkgs.lib.genAttrs (import systems);
     in
@@ -56,17 +56,17 @@
           # 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 ./doom.nix (common // { doomDir = ./doomdirs/minimal; })).doomEmacs;
-          doom-full = (pkgs.callPackages ./doom.nix (common // { full = true; doomDir = ./doomdirs/minimal; })).doomEmacs;
-          doom-example = (pkgs.callPackages ./doom.nix (common // { doomDir = ./doomdirs/example; })).doomEmacs;
-          doom-example-without-loader = (pkgs.callPackages ./doom.nix (common // {
+          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 = "";
           })).doomEmacs;
         });
       overlays.default = final: prev:
         let
-          callPackages = args: (final.callPackages ./doom.nix ({
+          callPackages = args: (final.callPackages self ({
             doomSource = doomemacs;
             emacsPackagesFor = emacsPackagesForFromOverlay final;
           } // args));
diff --git a/home-manager.nix b/home-manager.nix
index 539b23f..36aac3f 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -101,7 +101,7 @@ in {
     (let
       # Hack to avoid pkgs.extend (see flake.nix).
       inherit (emacsOverlay {} pkgs) emacsPackagesFor;
-      doomPackages = pkgs.callPackages ./doom.nix {
+      doomPackages = pkgs.callPackages ./. {
         inherit doomSource emacsPackagesFor;
         inherit (cfg) emacs doomDir doomLocalDir profileName noProfileHack;
       };