clerie/nixfiles
1
0
Fork 0
Code

pkgs/overlay.nix: Refactore overlay to a flake output attribute

Browse Source
This commit is contained in:
clerie 2023-12-08 09:06:43 +01:00
parent 0220dbbcdd
commit 9ca9ed3ef3
5 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configuration/common/default.nix
View File

@ -14,8 +14,4 @@
]; ];
services.fstrim.enable = true; services.fstrim.enable = true;
nixpkgs.overlays = [
(import ../../pkgs/overlay.nix)
];
} }

7
flake.nix
View File

@ -86,11 +86,16 @@
}; };
} // helper.mapToColmenaHosts self.nixosConfigurations; } // helper.mapToColmenaHosts self.nixosConfigurations;
overlays = {
clerie = import ./pkgs/overlay.nix;
default = self.overlays.clerie;
};
packages = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system: let packages = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system: let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ overlays = [
(import ./pkgs/overlay.nix) self.overlays.clerie
(_: _: { (_: _: {
inherit (agenix.packages.${system}) inherit (agenix.packages.${system})
agenix; agenix;

1
lib/flake-helper.nix
View File

@ -26,6 +26,7 @@ rec {
../users/clerie ../users/clerie
({ ... }: { ({ ... }: {
nixpkgs.overlays = [ nixpkgs.overlays = [
self.overlays.clerie
(_: _: { (_: _: {
inherit (agenix.packages."x86_64-linux") inherit (agenix.packages."x86_64-linux")
agenix; agenix;

5
pkgs/default.nix
View File

@ -1,5 +0,0 @@
import <nixpkgs> {
overlays = [
(import ./overlay.nix)
];
}

36
pkgs/overlay.nix
View File

@ -1,20 +1,20 @@
self: super: { final: prev: {
anycast_healthchecker = self.python3.pkgs.callPackage ./anycast_healthchecker {}; anycast_healthchecker = final.python3.pkgs.callPackage ./anycast_healthchecker {};
flask-excel = self.python3.pkgs.callPackage ./flask-excel {}; flask-excel = final.python3.pkgs.callPackage ./flask-excel {};
iot-data = self.python3.pkgs.callPackage ./iot-data {}; iot-data = final.python3.pkgs.callPackage ./iot-data {};
nixfiles-add-secret = self.callPackage ./nixfiles/nixfiles-add-secret.nix {}; nixfiles-add-secret = final.callPackage ./nixfiles/nixfiles-add-secret.nix {};
nixfiles-auto-install = self.callPackage ./nixfiles/nixfiles-auto-install.nix {}; nixfiles-auto-install = final.callPackage ./nixfiles/nixfiles-auto-install.nix {};
nixfiles-generate-backup-secrets = self.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {}; nixfiles-generate-backup-secrets = final.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {};
nixfiles-generate-config = self.callPackage ./nixfiles/nixfiles-generate-config.nix {}; nixfiles-generate-config = final.callPackage ./nixfiles/nixfiles-generate-config.nix {};
nixfiles-system-upgrade = self.callPackage ./nixfiles/nixfiles-system-upgrade.nix {}; nixfiles-system-upgrade = final.callPackage ./nixfiles/nixfiles-system-upgrade.nix {};
nixfiles-updated-inputs = self.callPackage ./nixfiles/nixfiles-updated-inputs.nix {}; nixfiles-updated-inputs = final.callPackage ./nixfiles/nixfiles-updated-inputs.nix {};
nixfiles-update-ssh-host-keys = self.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {}; nixfiles-update-ssh-host-keys = final.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {};
nixos-firewall-tool = self.callPackage ./nixos-firewall-tool {}; nixos-firewall-tool = final.callPackage ./nixos-firewall-tool {};
pyexcel-xlsx = self.python3.pkgs.callPackage ./pyexcel-xlsx {}; pyexcel-xlsx = final.python3.pkgs.callPackage ./pyexcel-xlsx {};
pyexcel-webio = self.python3.pkgs.callPackage ./pyexcel-webio {}; pyexcel-webio = final.python3.pkgs.callPackage ./pyexcel-webio {};
update-from-hydra = self.callPackage ./update-from-hydra {}; update-from-hydra = final.callPackage ./update-from-hydra {};
uptimestatus = self.python3.pkgs.callPackage ./uptimestatus {}; uptimestatus = final.python3.pkgs.callPackage ./uptimestatus {};
wetter = self.python3.pkgs.callPackage ./wetter { wetter = final.python3.pkgs.callPackage ./wetter {
inherit (self) pkg-config libsass; inherit (final) pkg-config libsass;
}; };
} }