remove unstable follows

This commit is contained in:
Gerg-L 2024-07-14 00:46:06 -04:00
parent 550831f4d9
commit 44de66e57d
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
3 changed files with 25 additions and 12 deletions

20
flake.lock generated
View file

@ -898,9 +898,7 @@
"spicetify-nix": "spicetify-nix", "spicetify-nix": "spicetify-nix",
"stable": "stable", "stable": "stable",
"suckless": "suckless", "suckless": "suckless",
"unstable": [ "unstable": "unstable"
"stable"
]
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -1054,6 +1052,22 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"unstable": {
"locked": {
"lastModified": 1720768451,
"narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -8,11 +8,10 @@
ref = "master"; ref = "master";
}; };
unstable = { unstable = {
follows = "stable"; type = "github";
#type = "github"; owner = "NixOS";
#owner = "NixOS"; repo = "nixpkgs";
#repo = "nixpkgs"; ref = "nixos-unstable";
#ref = "nixos-unstable";
}; };
stable = { stable = {
type = "github"; type = "github";

View file

@ -1,11 +1,11 @@
inputs@{ inputs@{
unstable, stable,
self, self,
disko, disko,
... ...
}: }:
let let
inherit (unstable) lib; inherit (stable) lib;
in in
# Only good use case for rec # Only good use case for rec
rec { rec {
@ -173,12 +173,12 @@ rec {
hostName: hostName:
# Whats lib.nixosSystem? never heard of her # Whats lib.nixosSystem? never heard of her
lib.evalModules { lib.evalModules {
specialArgs.modulesPath = "${unstable}/nixos/modules"; specialArgs.modulesPath = "${stable}/nixos/modules";
modules = builtins.concatLists [ modules = builtins.concatLists [
(builtins.attrValues self.nixosModules) (builtins.attrValues self.nixosModules)
(map addSchizophreniaToModule (listNixFilesRecursive "${self}/hosts/${hostName}")) (map addSchizophreniaToModule (listNixFilesRecursive "${self}/hosts/${hostName}"))
(import "${unstable}/nixos/modules/module-list.nix") (import "${stable}/nixos/modules/module-list.nix")
(lib.singleton { (lib.singleton {
networking = { networking = {
inherit hostName; inherit hostName;