From 44de66e57dbcc77dff2c1d6e212076eaf1c0895c Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sun, 14 Jul 2024 00:46:06 -0400 Subject: [PATCH] remove unstable follows --- flake.lock | 20 +++++++++++++++++--- flake.nix | 9 ++++----- lib/default.nix | 8 ++++---- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index c325852..686462e 100644 --- a/flake.lock +++ b/flake.lock @@ -898,9 +898,7 @@ "spicetify-nix": "spicetify-nix", "stable": "stable", "suckless": "suckless", - "unstable": [ - "stable" - ] + "unstable": "unstable" } }, "rust-overlay": { @@ -1054,6 +1052,22 @@ "repo": "default", "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", diff --git a/flake.nix b/flake.nix index 28e6ae6..ba5e559 100644 --- a/flake.nix +++ b/flake.nix @@ -8,11 +8,10 @@ ref = "master"; }; unstable = { - follows = "stable"; - #type = "github"; - #owner = "NixOS"; - #repo = "nixpkgs"; - #ref = "nixos-unstable"; + type = "github"; + owner = "NixOS"; + repo = "nixpkgs"; + ref = "nixos-unstable"; }; stable = { type = "github"; diff --git a/lib/default.nix b/lib/default.nix index 0c9de1a..8e3727e 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,11 +1,11 @@ inputs@{ - unstable, + stable, self, disko, ... }: let - inherit (unstable) lib; + inherit (stable) lib; in # Only good use case for rec rec { @@ -173,12 +173,12 @@ rec { hostName: # Whats lib.nixosSystem? never heard of her lib.evalModules { - specialArgs.modulesPath = "${unstable}/nixos/modules"; + specialArgs.modulesPath = "${stable}/nixos/modules"; modules = builtins.concatLists [ (builtins.attrValues self.nixosModules) (map addSchizophreniaToModule (listNixFilesRecursive "${self}/hosts/${hostName}")) - (import "${unstable}/nixos/modules/module-list.nix") + (import "${stable}/nixos/modules/module-list.nix") (lib.singleton { networking = { inherit hostName;