From 3c7d6111975cc46089731b45361fcd2e7534eed7 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Mon, 1 Jul 2024 14:31:02 +0200 Subject: [PATCH] flake: use nixos-*-small by default --- flake.lock | 23 ++++++++++++++++++++--- flake.nix | 3 ++- nixos/configurations.nix | 10 +++++++--- outputs.nix | 1 + 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 94e1fb2..05a5355 100644 --- a/flake.lock +++ b/flake.lock @@ -232,11 +232,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718086528, - "narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=", + "lastModified": 1719792669, + "narHash": "sha256-VtQjQGdRt6MzowlxEeub86i9Z/M7DNTNwFgZqLiZQVA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47b604b07d1e8146d5398b42d3306fdebd343986", + "rev": "e980b1051c444c81afcf2fee7e4a4c78489f1863", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-full": { + "locked": { + "lastModified": 1719707984, + "narHash": "sha256-RoxIr/fbndtuKqulGvNCcuzC6KdAib85Q8gXnjzA1dw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7dca15289a1c2990efbe4680f0923ce14139b042", "type": "github" }, "original": { @@ -257,6 +273,7 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "nixpkgs-full": "nixpkgs-full", "systems": "systems_2", "treefmt-nix": "treefmt-nix" } diff --git a/flake.nix b/flake.nix index fb8c468..ccc986c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,8 @@ description = "dadada's nix flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05-small"; + nixpkgs-full.url = "github:NixOS/nixpkgs/nixos-24.05"; flake-utils = { url = "github:numtide/flake-utils"; inputs.systems.follows = "systems"; diff --git a/nixos/configurations.nix b/nixos/configurations.nix index d587829..41aabe8 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -1,6 +1,7 @@ { self , agenix , nixpkgs +, nixpkgs-full , home-manager , homepage , nixos-hardware @@ -8,17 +9,19 @@ , ... }@inputs: let - nixosSystem = { system ? "x86_64-linux", extraModules ? [ ] }: nixpkgs.lib.nixosSystem { + nixosSystem = { n_nixpkgs ? nixpkgs, system ? "x86_64-linux", extraModules ? [ ] }: n_nixpkgs.lib.nixosSystem { inherit system; modules = [{ - nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays; - }] ++ (nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules; + nixpkgs.overlays = n_nixpkgs.lib.attrValues self.overlays; + }] ++ (n_nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules; }; in { gorgon = nixosSystem rec { + n_nixpkgs = nixpkgs-full; + system = "x86_64-linux"; extraModules = [ @@ -83,6 +86,7 @@ in }; ninurta = nixosSystem { + n_nixpkgs = nixpkgs-full; extraModules = [ ./ninurta/configuration.nix ]; diff --git a/outputs.nix b/outputs.nix index 8199211..b96b7bb 100644 --- a/outputs.nix +++ b/outputs.nix @@ -6,6 +6,7 @@ , nixpkgs , home-manager , nixos-hardware +, nixpkgs-full , agenix , devshell , ...