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

Drop flake-parts

Browse source 
It's not really doing much for me, and it might be getting in the way of
my attempt at exposing a non-package in the `packages` flake output.
This commit is contained in:
Marien Zwart 2024-04-06 23:41:35 +11:00
parent dbeda09006
commit 03769febeb
No known key found for this signature in database
2 changed files with 12 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

28
flake.nix
View file

@ -1,6 +1,5 @@
{
inputs = {
flake-parts.url = "flake-parts";
nixpkgs.url = "nixpkgs";
doomemacs = {
url = "github:doomemacs/doomemacs";
@ -14,25 +13,22 @@
};
};
outputs = inputs@{ self, doomemacs, nixpkgs, emacs-overlay, ... }:
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ "x86_64-linux" ];
perSystem = { self', inputs', system, pkgs, lib, ... }:
outputs = { doomemacs, nixpkgs, emacs-overlay, ... }: let
systems = [ "x86_64-linux" ];
perSystemPackages = f: nixpkgs.lib.genAttrs systems (system: f nixpkgs.legacyPackages.${system});
in {
packages = perSystemPackages (pkgs:
let
common = { doomSource = doomemacs; emacs = pkgs.emacs29-pgtk; };
in
{
pkgsWithEmacsOverlay = pkgs.extend emacs-overlay.overlays.package;
in {
# 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.
_module.args.pkgs = import nixpkgs {
inherit system;
overlays = [ emacs-overlay.overlays.package ];
};
packages.doom-minimal = pkgs.callPackage ./doom.nix common;
packages.doom-full = pkgs.callPackage ./doom.nix (common // { full = true; });
packages.doom-example = pkgs.callPackage ./doom.nix (common // { doomDir = ./example; });
packages.doomEmacs = args: pkgs.callPackage ./doom.nix args;
};
doom-minimal = pkgsWithEmacsOverlay.callPackage ./doom.nix common;
doom-full = pkgsWithEmacsOverlay.callPackage ./doom.nix (common // { full = true; });
doom-example = pkgsWithEmacsOverlay.callPackage ./doom.nix (common // { doomDir = ./example; });
doomEmacs = args: pkgsWithEmacsOverlay.callPackage ./doom.nix args;
});
};
}