mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 00:43:56 -05:00
switched from a package overlay to having packages as an output
This commit is contained in:
parent
eb9ad6a73a
commit
f727e15f2c
3 changed files with 18 additions and 16 deletions
21
flake.nix
21
flake.nix
|
|
@ -65,7 +65,6 @@
|
||||||
(import ./systems/gerg-desktop inputs)
|
(import ./systems/gerg-desktop inputs)
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(import ./pkgs)
|
|
||||||
nvim-flake.overlays.default
|
nvim-flake.overlays.default
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
@ -115,15 +114,17 @@
|
||||||
};
|
};
|
||||||
default = nix;
|
default = nix;
|
||||||
};
|
};
|
||||||
packages = {
|
packages =
|
||||||
nixos-iso = nixos-generators.nixosGenerate {
|
{
|
||||||
inherit system;
|
nixos-iso = nixos-generators.nixosGenerate {
|
||||||
format = "install-iso";
|
inherit system;
|
||||||
modules = [
|
format = "install-iso";
|
||||||
(import ./iso inputs)
|
modules = [
|
||||||
];
|
(import ./iso inputs)
|
||||||
};
|
];
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
// (import ./pkgs pkgs);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
(final: _: {
|
pkgs: {
|
||||||
t-rex-miner = final.callPackage ./t-rex-miner {};
|
t-rex-miner = pkgs.callPackage ./t-rex-miner {};
|
||||||
afk-cmds = final.callPackage ./afk-cmds {};
|
afk-cmds = pkgs.callPackage ./afk-cmds {};
|
||||||
parrot = final.callPackage ./parrot {};
|
parrot = pkgs.callPackage ./parrot {};
|
||||||
})
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
_: {
|
_: {
|
||||||
pkgs,
|
pkgs,
|
||||||
config,
|
config,
|
||||||
|
self,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
#discord bot stuff
|
#discord bot stuff
|
||||||
|
|
@ -9,7 +10,7 @@ _: {
|
||||||
wantedBy = ["multi-user.target"];
|
wantedBy = ["multi-user.target"];
|
||||||
wants = ["network-online.target"];
|
wants = ["network-online.target"];
|
||||||
after = ["network-online.target"];
|
after = ["network-online.target"];
|
||||||
script = "${pkgs.parrot}/bin/parrot";
|
script = "${self.packages.${pkgs.system}.parrot}/bin/parrot";
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
EnvironmentFile = config.sops.secrets.discordenv.path;
|
EnvironmentFile = config.sops.secrets.discordenv.path;
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue