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

Rename doom.nix to default.nix

Browse source
This commit is contained in:
Marien Zwart 2024-05-07 23:02:59 +10:00
parent badafb50f6
commit c12417c362
No known key found for this signature in database
5 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -106,8 +106,9 @@ The overlay adds two packages:
### Without flakes ### Without flakes
This is currently not explicitly supported, but should be possible (use This is currently not explicitly supported, but should be possible (use
`pkgs.callPackages doom.nix`). PRs extending this part of the documentation are `pkgs.callPackages ./nix-doom-emacs-unstraightened`). PRs extending this part of
welcome, as are (within reason) changes necessary to support use without flakes. the documentation are welcome, as are (within reason) changes necessary to
support use without flakes.
### Options ### Options

0
doom.nix → default.nix
View file

2
fetch-overrides.nix
View file

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Data loaded by doom.nix. # Data loaded by default.nix.
{ {
extraUrls = { extraUrls = {
# Straight recipe from el-get # Straight recipe from el-get

12
flake.nix
View file

@ -30,7 +30,7 @@
}; };
}; };
outputs = { systems, doomemacs, nixpkgs, emacs-overlay, ... }: let outputs = { self, systems, doomemacs, nixpkgs, emacs-overlay, ... }: let
perSystemPackages = let perSystemPackages = let
eachSystem = nixpkgs.lib.genAttrs (import systems); eachSystem = nixpkgs.lib.genAttrs (import systems);
in in
@ -56,17 +56,17 @@
# Current Doom + NixOS 23.11 requires emacs-overlay: Doom pins # Current Doom + NixOS 23.11 requires emacs-overlay: Doom pins
# emacs-fish-completion, which moved from gitlab to github recently # emacs-fish-completion, which moved from gitlab to github recently
# enough stable nixpkgs pulls it from the wrong source. # enough stable nixpkgs pulls it from the wrong source.
doom-minimal = (pkgs.callPackages ./doom.nix (common // { doomDir = ./doomdirs/minimal; })).doomEmacs; doom-minimal = (pkgs.callPackages self (common // { doomDir = ./doomdirs/minimal; })).doomEmacs;
doom-full = (pkgs.callPackages ./doom.nix (common // { full = true; doomDir = ./doomdirs/minimal; })).doomEmacs; doom-full = (pkgs.callPackages self (common // { full = true; doomDir = ./doomdirs/minimal; })).doomEmacs;
doom-example = (pkgs.callPackages ./doom.nix (common // { doomDir = ./doomdirs/example; })).doomEmacs; doom-example = (pkgs.callPackages self (common // { doomDir = ./doomdirs/example; })).doomEmacs;
doom-example-without-loader = (pkgs.callPackages ./doom.nix (common // { doom-example-without-loader = (pkgs.callPackages self (common // {
doomDir = ./doomdirs/example; doomDir = ./doomdirs/example;
profileName = ""; profileName = "";
})).doomEmacs; })).doomEmacs;
}); });
overlays.default = final: prev: overlays.default = final: prev:
let let
callPackages = args: (final.callPackages ./doom.nix ({ callPackages = args: (final.callPackages self ({
doomSource = doomemacs; doomSource = doomemacs;
emacsPackagesFor = emacsPackagesForFromOverlay final; emacsPackagesFor = emacsPackagesForFromOverlay final;
} // args)); } // args));

2
home-manager.nix
View file

@ -101,7 +101,7 @@ in {
(let (let
# Hack to avoid pkgs.extend (see flake.nix). # Hack to avoid pkgs.extend (see flake.nix).
inherit (emacsOverlay {} pkgs) emacsPackagesFor; inherit (emacsOverlay {} pkgs) emacsPackagesFor;
doomPackages = pkgs.callPackages ./doom.nix { doomPackages = pkgs.callPackages ./. {
inherit doomSource emacsPackagesFor; inherit doomSource emacsPackagesFor;
inherit (cfg) emacs doomDir doomLocalDir profileName noProfileHack; inherit (cfg) emacs doomDir doomLocalDir profileName noProfileHack;
}; };