colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

move the custom packages overlay into pkgs/overlay.nix

Browse Source
This commit is contained in:
colin
2022-06-23 15:47:35 -07:00
parent f0857181c0
commit 6801e934af
2 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
flake.nix
View File

@@ -60,11 +60,13 @@
./modules ./modules
./machines/${name} ./machines/${name}
(import ./helpers/set-hostname.nix name) (import ./helpers/set-hostname.nix name)
(self.overlaysModule system)
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
{ {
nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ nixpkgs.overlays = [
nurpkgs.overlay
(import "${mobile-nixos}/overlay/overlay.nix") (import "${mobile-nixos}/overlay/overlay.nix")
(import ./pkgs/overlay.nix)
]; ];
} }
] ++ extraModules; ] ++ extraModules;
@@ -86,42 +88,6 @@
nixosConfiguration = self.decl-machine { inherit name system; }; nixosConfiguration = self.decl-machine { inherit name system; };
img = self.decl-img { inherit name system; }; img = self.decl-img { inherit name system; };
}; };
# TODO: move this into pkgs/ dir
overlaysModule = system: { config, pkgs, ...}: {
nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [
#mobile-nixos.overlay
nurpkgs.overlay
(next: prev: {
#### my own, non-upstreamable packages:
sane-scripts = prev.callPackage ./pkgs/sane-scripts { };
#### customized packages
# nixos-unstable pleroma is too far out-of-date for our db
pleroma = prev.callPackage ./pkgs/pleroma { };
# jackett doesn't allow customization of the bind address: this will probably always be here.
jackett = next.callPackage ./pkgs/jackett { pkgs = prev; };
# fix abrupt HDD poweroffs as during reboot. patching systemd requires rebuilding nearly every package.
# systemd = import ./pkgs/systemd { pkgs = prev; };
# patch rpi uboot with something that fixes USB HDD boot
ubootRaspberryPi4_64bit = next.callPackage ./pkgs/ubootRaspberryPi4_64bit { pkgs = prev; };
#### TEMPORARY NIXOS-UNSTABLE PACKAGES
# stable telegram doesn't build, so explicitly use the stable one.
# TODO: apply this specifically to the moby build?
# TODO: all systems are using stable nixos. remove this?
# tdesktop = pkgs-telegram.legacyPackages.${system}.tdesktop;
tdesktop = nixpkgs.legacyPackages.${system}.tdesktop;
#### TEMPORARY: PACKAGES WAITING TO BE UPSTREAMED
# whalebird = prev.callPackage ./pkgs/whalebird { };
kaiteki = prev.callPackage ./pkgs/kaiteki { };
})
];
};
}; };
} }

18
pkgs/overlay.nix Normal file
View File

@@ -0,0 +1,18 @@
(next: prev: {
#### my own, non-upstreamable packages:
sane-scripts = prev.callPackage ./sane-scripts { };
#### customized packages
# nixos-unstable pleroma is too far out-of-date for our db
pleroma = prev.callPackage ./pleroma { };
# jackett doesn't allow customization of the bind address: this will probably always be here.
jackett = next.callPackage ./jackett { pkgs = prev; };
# fix abrupt HDD poweroffs as during reboot. patching systemd requires rebuilding nearly every package.
# systemd = import ./pkgs/systemd { pkgs = prev; };
# patch rpi uboot with something that fixes USB HDD boot
ubootRaspberryPi4_64bit = next.callPackage ./ubootRaspberryPi4_64bit { pkgs = prev; };
#### TEMPORARY: PACKAGES WAITING TO BE UPSTREAMED
kaiteki = prev.callPackage ./kaiteki { };
})