motiejus
/
config
1
Fork 0
Code Packages Releases Activity

overlays: do not depend on the system

This commit is contained in:
Motiejus Jakštys 2024-02-02 15:39:22 +02:00
parent 8f79a933e7
commit 9002134724
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
flake.nix
View File

@ -89,23 +89,20 @@
} @ inputs: let } @ inputs: let
myData = import ./data.nix; myData = import ./data.nix;
mkDeployPkgs = system: mkDeployPkgs = system:
import nixpkgs { import nixpkgs {inherit system overlays;};
inherit system;
overlays = mkOverlays system;
};
deployPkgsIA64 = mkDeployPkgs "x86_64-linux"; deployPkgsIA64 = mkDeployPkgs "x86_64-linux";
deployPkgsArm64 = mkDeployPkgs "aarch64-linux"; deployPkgsArm64 = mkDeployPkgs "aarch64-linux";
# accepting "system" argument in case we need to construct # accepting "system" argument in case we need to construct
# nixpkgs-unstable. See git log around the switch from 23.05 to 23.11. # nixpkgs-unstable. See git log around the switch from 23.05 to 23.11.
mkOverlays = system: [ overlays = [
nur.overlay nur.overlay
e11sync.overlays.default e11sync.overlays.default
(_self: super: {deploy-rs-pkg = super.deploy-rs;})
deploy-rs.overlay deploy-rs.overlay
(_self: super: { (_self: super: {
deploy-rs = { deploy-rs = {
inherit (import nixpkgs {inherit system;}) deploy-rs; deploy-rs = super.deploy-rs-pkg;
inherit (super.deploy-rs) lib; inherit (super.deploy-rs) lib;
}; };
}) })
@ -126,7 +123,7 @@
vno1-oh2 = nixpkgs.lib.nixosSystem rec { vno1-oh2 = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{nixpkgs.overlays = mkOverlays system;} {nixpkgs.overlays = overlays;}
./hosts/vno1-oh2/configuration.nix ./hosts/vno1-oh2/configuration.nix
./modules ./modules
@ -161,7 +158,7 @@
fwminex = nixpkgs.lib.nixosSystem rec { fwminex = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{nixpkgs.overlays = mkOverlays system;} {nixpkgs.overlays = overlays;}
./hosts/fwminex/configuration.nix ./hosts/fwminex/configuration.nix
./modules ./modules
@ -188,7 +185,7 @@
vno3-rp3b = nixpkgs.lib.nixosSystem rec { vno3-rp3b = nixpkgs.lib.nixosSystem rec {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [ modules = [
{nixpkgs.overlays = mkOverlays system;} {nixpkgs.overlays = overlays;}
./hosts/vno3-rp3b/configuration.nix ./hosts/vno3-rp3b/configuration.nix
./modules ./modules
@ -213,7 +210,7 @@
fra1-a = nixpkgs.lib.nixosSystem rec { fra1-a = nixpkgs.lib.nixosSystem rec {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [ modules = [
{nixpkgs.overlays = mkOverlays system;} {nixpkgs.overlays = overlays;}
e11sync.nixosModules.e11sync e11sync.nixosModules.e11sync
agenix.nixosModules.default agenix.nixosModules.default
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager