diff --git a/README.md b/README.md index b5a572c..893d7bc 100644 --- a/README.md +++ b/README.md @@ -39,9 +39,9 @@ Please report any issues. > inputs are automatically updated daily as long as tests pass. Updating > manually may update to an incompatible version of Doom or Emacs packages. -3. Copy your Doom configuration into `doomdirs/example` (overwriting what's there) -4. Make sure all files are added (`git add doomdirs/example`) -5. Run `nix run .#doom-example`. +3. Copy your Doom configuration into `doomdir` (overwriting what's there) +4. Make sure all files are added (`git add doomdir`) +5. Run `nix run .#doom-emacs`. If this does not work, the "with flakes" setup below is unlikely to work either. Please file an issue. diff --git a/checks.nix b/checks.nix index 07d6d0c..36f32c2 100644 --- a/checks.nix +++ b/checks.nix @@ -69,9 +69,9 @@ in { })).emacsWithDoom; allModules = mkDoom { doomDir = allModsDoomDir; }; allModulesAndFlags = mkDoom { doomDir = allFlagsDoomDir; }; - example = mkDoom { doomDir = ./doomdirs/example; }; + example = mkDoom { doomDir = ./doomdir; }; example-without-loader = mkDoom { - doomDir = ./doomdirs/example; + doomDir = ./doomdir; profileName = ""; }; interactive = doomTest "minimal" { config = [ "default" ]; } { }; diff --git a/doomdirs/example/init.el b/doomdir/init.el similarity index 100% rename from doomdirs/example/init.el rename to doomdir/init.el diff --git a/doomdirs/example/packages.el b/doomdir/packages.el similarity index 100% rename from doomdirs/example/packages.el rename to doomdir/packages.el diff --git a/flake.nix b/flake.nix index ae01720..75ae136 100644 --- a/flake.nix +++ b/flake.nix @@ -80,16 +80,16 @@ makeDoomPackages = doomFromPackages pkgs; }); packages = perSystemPackages (pkgs: { - doom-example = (doomFromPackages pkgs { + doom-emacs = (doomFromPackages pkgs { # TODO: drop after NixOS 24.05 release. emacs = pkgs.emacs29; - doomDir = ./doomdirs/example; + doomDir = ./doomdir; doomLocalDir = "~/.local/share/nix-doom-unstraightened"; }).doomEmacs; - doom-example-without-loader = (doomFromPackages pkgs { + doom-emacs-without-loader = (doomFromPackages pkgs { # TODO: drop after NixOS 24.05 release. emacs = pkgs.emacs29; - doomDir = ./doomdirs/example; + doomDir = ./doomdir; doomLocalDir = "~/.local/share/nix-doom-unstraightened"; profileName = ""; }).doomEmacs;