Skip to content

Commit

Permalink
Rename doomdirs/example and doom-example
Browse files Browse the repository at this point in the history
Move `doomdirs/example/` to just `doomdir/`, and rename the package
using it from `doom-example` to `doom-emacs`.

I do not expect to need multiple doomdirs checked in again, and I can
unclutter the packages provided by the flake a bit now that most of them
are checks.
  • Loading branch information
marienz committed May 28, 2024
1 parent 2fc5878 commit 0f7eb10
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions checks.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]; } { };
Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 0f7eb10

Please sign in to comment.