dadada/nix-config
dadada/nix-config
1
0
Fork 0
Code Issues 2 Pull requests 5 Projects Releases Packages Wiki Activity Actions 1

flake: use nixos-*-small by default

Browse source
This commit is contained in:
Tim Schubert 2024-07-01 14:31:02 +02:00
parent 116468e4af
commit 3c7d611197
Signed by: dadada
SSH key fingerprint: SHA256:bFAjFH3hR8zRBaJjzQDjc3o4jqoq5EZ87l+KXEjxIz0
4 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
flake.lock generated
View file

@ -232,11 +232,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1718086528, "lastModified": 1719792669,
"narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=", "narHash": "sha256-VtQjQGdRt6MzowlxEeub86i9Z/M7DNTNwFgZqLiZQVA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "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" "type": "github"
}, },
"original": { "original": {
@ -257,6 +273,7 @@
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-full": "nixpkgs-full",
"systems": "systems_2", "systems": "systems_2",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
} }

3
flake.nix
View file

@ -2,7 +2,8 @@
description = "dadada's nix flake"; description = "dadada's nix flake";
inputs = { 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 = { flake-utils = {
url = "github:numtide/flake-utils"; url = "github:numtide/flake-utils";
inputs.systems.follows = "systems"; inputs.systems.follows = "systems";

10
nixos/configurations.nix
View file

@ -1,6 +1,7 @@
{ self { self
, agenix , agenix
, nixpkgs , nixpkgs
, nixpkgs-full
, home-manager , home-manager
, homepage , homepage
, nixos-hardware , nixos-hardware
@ -8,17 +9,19 @@
, ... , ...
}@inputs: }@inputs:
let 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; inherit system;
modules = [{ modules = [{
nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays; nixpkgs.overlays = n_nixpkgs.lib.attrValues self.overlays;
}] ++ (nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules; }] ++ (n_nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules;
}; };
in in
{ {
gorgon = nixosSystem rec { gorgon = nixosSystem rec {
n_nixpkgs = nixpkgs-full;
system = "x86_64-linux"; system = "x86_64-linux";
extraModules = [ extraModules = [
@ -83,6 +86,7 @@ in
}; };
ninurta = nixosSystem { ninurta = nixosSystem {
n_nixpkgs = nixpkgs-full;
extraModules = [ extraModules = [
./ninurta/configuration.nix ./ninurta/configuration.nix
]; ];

1
outputs.nix
View file

@ -6,6 +6,7 @@
, nixpkgs , nixpkgs
, home-manager , home-manager
, nixos-hardware , nixos-hardware
, nixpkgs-full
, agenix , agenix
, devshell , devshell
, ... , ...