Rename doom.nix to default.nix

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
 

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

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));

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;
       };