switched from a package overlay to having packages as an output

This commit is contained in:
Gerg-L 2023-03-08 20:49:31 -05:00
parent eb9ad6a73a
commit f727e15f2c
3 changed files with 18 additions and 16 deletions

View file

@ -65,7 +65,6 @@
(import ./systems/gerg-desktop inputs)
{
nixpkgs.overlays = [
(import ./pkgs)
nvim-flake.overlays.default
];
}
@ -115,15 +114,17 @@
};
default = nix;
};
packages = {
nixos-iso = nixos-generators.nixosGenerate {
inherit system;
format = "install-iso";
modules = [
(import ./iso inputs)
];
};
};
packages =
{
nixos-iso = nixos-generators.nixosGenerate {
inherit system;
format = "install-iso";
modules = [
(import ./iso inputs)
];
};
}
// (import ./pkgs pkgs);
}
);
}

View file

@ -1,5 +1,5 @@
(final: _: {
t-rex-miner = final.callPackage ./t-rex-miner {};
afk-cmds = final.callPackage ./afk-cmds {};
parrot = final.callPackage ./parrot {};
})
pkgs: {
t-rex-miner = pkgs.callPackage ./t-rex-miner {};
afk-cmds = pkgs.callPackage ./afk-cmds {};
parrot = pkgs.callPackage ./parrot {};
}

View file

@ -1,6 +1,7 @@
_: {
pkgs,
config,
self,
...
}: {
#discord bot stuff
@ -9,7 +10,7 @@ _: {
wantedBy = ["multi-user.target"];
wants = ["network-online.target"];
after = ["network-online.target"];
script = "${pkgs.parrot}/bin/parrot";
script = "${self.packages.${pkgs.system}.parrot}/bin/parrot";
serviceConfig = {
EnvironmentFile = config.sops.secrets.discordenv.path;
Restart = "on-failure";