diff --git a/flake.lock b/flake.lock index 5f9f859..092d952 100644 --- a/flake.lock +++ b/flake.lock @@ -192,22 +192,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1671459584, - "narHash": "sha256-6wRK7xmeHfClJ0ICOkax1avLZVGTDqBodQlkl/opccY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "87b58217c9a05edcf7630b9be32570f889217aef", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, "oldStable": { "locked": { "lastModified": 1671813978, @@ -276,6 +260,7 @@ "oldStable": "oldStable", "peerix": "peerix", "reform": "reform", + "sops-nix": "sops-nix", "sshKnownHosts": "sshKnownHosts", "stable": "stable", "talon": "talon", @@ -290,17 +275,18 @@ "sops-nix": { "inputs": { "nixpkgs": [ - "xin-secrets", - "stable" + "unstable" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": [ + "stable" + ] }, "locked": { - "lastModified": 1671472949, - "narHash": "sha256-9iHSGpljCX+RypahQssBXPwkru9onfKfceCTeVrMpH4=", + "lastModified": 1671937829, + "narHash": "sha256-YtaNB+mLw0d67JFYNjRWM+/AL3JCXuD/DGlnTlyX1tY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "32840f16ffa0856cdf9503a8658f2dd42bf70342", + "rev": "855b8d51fc3991bd817978f0f093aa6ae0fae738", "type": "github" }, "original": { @@ -466,7 +452,9 @@ }, "xin-secrets": { "inputs": { - "sops-nix": "sops-nix", + "sops-nix": [ + "sops-nix" + ], "stable": "stable_2" }, "locked": { diff --git a/flake.nix b/flake.nix index 9eb7548..44554ce 100644 --- a/flake.nix +++ b/flake.nix @@ -2,16 +2,23 @@ description = "bold.daemon"; inputs = { - xin-secrets = { - url = "git+ssh://xin-secrets-ro/qbit/xin-secrets.git?ref=main"; - }; - unstable.url = "github:NixOS/nixpkgs"; unstableSmall.url = "github:NixOS/nixpkgs/nixos-unstable-small"; oldStable.url = "github:NixOS/nixpkgs/nixos-22.05-small"; stable.url = "github:NixOS/nixpkgs/nixos-22.11-small"; + sops-nix = { + url = "github:Mic92/sops-nix"; + inputs.nixpkgs-stable.follows = "stable"; + inputs.nixpkgs.follows = "unstable"; + }; + + xin-secrets = { + url = "git+ssh://xin-secrets-ro/qbit/xin-secrets.git?ref=main"; + inputs.sops-nix.follows = "sops-nix"; + }; + nixos-hardware = { url = "github:NixOS/nixos-hardware/master"; }; reform = { url = "github:nix-community/hardware-mnt-reform"; };