nix: refactored combinator

This commit is contained in:
Primrose 2024-07-26 15:15:54 +02:00
parent 2ceff90f81
commit c25bfbed5f
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
3 changed files with 167 additions and 195 deletions

View file

@ -1,14 +1,10 @@
{ self, inputs, ... }:
{ self, ... }:
{
flake.lib.mkNerdFont = ./mkNerdFont.nix;
perSystem =
{
pkgs,
system,
lib,
...
}:
{ pkgs, lib, ... }:
let
inherit (pkgs) alt-ergo-pin;
mkNerdFont = pkgs.callPackage self.lib.mkNerdFont { };
@ -42,27 +38,7 @@
maeel = pkgs.callPackage ./maeel.nix { };
tokei = pkgs.callPackage ./tokei { }; # alpha tokei with typst, skel, hledger
carbon-installer = inputs.nixos-generators.nixosGenerate {
inherit system;
specialArgs = {
inherit pkgs;
hostname = "carbon";
};
format = "install-iso";
modules = [
self.nixosModules.layouts
self.nixosModules.system-nixconf
{
environment.systemPackages = [
pkgs.disko
pkgs.git
];
nix.package = lib.mkForce pkgs.nixVersions.latest;
users.users.nixos.shell = pkgs.fish;
programs.fish.enable = true;
}
];
};
posy-cursor = pkgs.callPackage ./posy-cursor.nix { };
};
};
}