logistic-bot/nix-doom-emacs-unstraightened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename doomdirs/example and doom-example

Browse source 
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.
This commit is contained in:
Marien Zwart 2024-05-27 21:28:20 +10:00
parent 2fc58787da
commit 0f7eb10233
No known key found for this signature in database
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -39,9 +39,9 @@ Please report any issues.
> inputs are automatically updated daily as long as tests pass. Updating > inputs are automatically updated daily as long as tests pass. Updating
> manually may update to an incompatible version of Doom or Emacs packages. > manually may update to an incompatible version of Doom or Emacs packages.
3. Copy your Doom configuration into `doomdirs/example` (overwriting what's there) 3. Copy your Doom configuration into `doomdir` (overwriting what's there)
4. Make sure all files are added (`git add doomdirs/example`) 4. Make sure all files are added (`git add doomdir`)
5. Run `nix run .#doom-example`. 5. Run `nix run .#doom-emacs`.
If this does not work, the "with flakes" setup below is unlikely to work either. If this does not work, the "with flakes" setup below is unlikely to work either.
Please file an issue. Please file an issue.

4
checks.nix
View file

@ -69,9 +69,9 @@ in {
})).emacsWithDoom; })).emacsWithDoom;
allModules = mkDoom { doomDir = allModsDoomDir; }; allModules = mkDoom { doomDir = allModsDoomDir; };
allModulesAndFlags = mkDoom { doomDir = allFlagsDoomDir; }; allModulesAndFlags = mkDoom { doomDir = allFlagsDoomDir; };
example = mkDoom { doomDir = ./doomdirs/example; }; example = mkDoom { doomDir = ./doomdir; };
example-without-loader = mkDoom { example-without-loader = mkDoom {
doomDir = ./doomdirs/example; doomDir = ./doomdir;
profileName = ""; profileName = "";
}; };
interactive = doomTest "minimal" { config = [ "default" ]; } { }; interactive = doomTest "minimal" { config = [ "default" ]; } { };

0
doomdirs/example/init.el → doomdir/init.el
View file

0
doomdirs/example/packages.el → doomdir/packages.el
View file

8
flake.nix
View file

@ -80,16 +80,16 @@
makeDoomPackages = doomFromPackages pkgs; makeDoomPackages = doomFromPackages pkgs;
}); });
packages = perSystemPackages (pkgs: { packages = perSystemPackages (pkgs: {
doom-example = (doomFromPackages pkgs { doom-emacs = (doomFromPackages pkgs {
# TODO: drop after NixOS 24.05 release. # TODO: drop after NixOS 24.05 release.
emacs = pkgs.emacs29; emacs = pkgs.emacs29;
doomDir = ./doomdirs/example; doomDir = ./doomdir;
doomLocalDir = "~/.local/share/nix-doom-unstraightened"; doomLocalDir = "~/.local/share/nix-doom-unstraightened";
}).doomEmacs; }).doomEmacs;
doom-example-without-loader = (doomFromPackages pkgs { doom-emacs-without-loader = (doomFromPackages pkgs {
# TODO: drop after NixOS 24.05 release. # TODO: drop after NixOS 24.05 release.
emacs = pkgs.emacs29; emacs = pkgs.emacs29;
doomDir = ./doomdirs/example; doomDir = ./doomdir;
doomLocalDir = "~/.local/share/nix-doom-unstraightened"; doomLocalDir = "~/.local/share/nix-doom-unstraightened";
profileName = ""; profileName = "";
}).doomEmacs; }).doomEmacs;