diff --git a/flake.lock b/flake.lock index 8330077..102d39d 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1704884609, - "narHash": "sha256-ZSM15G7ZxVenkBJh5QJ2z6urSICwlBbl/aLeGEmULFo=", + "lastModified": 1704927784, + "narHash": "sha256-86pKPeR6yzu1IYs4WiziwxfNbtV/HR/1wlbJ9SaYu3k=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "37931f98fab3d8f2417485f524d4af3593896ead", + "rev": "652f31d220252036050b799713657a387b9b3cf3", "type": "github" }, "original": { @@ -63,10 +63,10 @@ "type": "github" } }, - "home-manager-unstable": { + "home-manager-edge": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs-edge" ] }, "locked": { @@ -153,11 +153,11 @@ }, "nixpkgs-2311": { "locked": { - "lastModified": 1704732714, - "narHash": "sha256-ABqK/HggMYA/jMUXgYyqVAcQ8QjeMyr1jcXfTpSHmps=", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6723fa4e4f1a30d42a633bef5eb01caeb281adc3", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { @@ -167,6 +167,22 @@ "type": "github" } }, + "nixpkgs-edge": { + "locked": { + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1704290814, @@ -215,36 +231,20 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "flake-programs-sqlite-2311": "flake-programs-sqlite-2311", "home-manager-2305": "home-manager-2305", "home-manager-2311": "home-manager-2311", - "home-manager-unstable": "home-manager-unstable", + "home-manager-edge": "home-manager-edge", "nixos-generators-2311": "nixos-generators-2311", "nixos-hardware": "nixos-hardware", "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2311": "nixpkgs-2311", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-edge": "nixpkgs-edge", "sops-nix-2305": "sops-nix-2305", "sops-nix-2311": "sops-nix-2311", - "sops-nix-unstable": "sops-nix-unstable" + "sops-nix-edge": "sops-nix-edge" } }, "sops-nix-2305": { @@ -289,10 +289,10 @@ "type": "github" } }, - "sops-nix-unstable": { + "sops-nix-edge": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs-edge" ], "nixpkgs-stable": "nixpkgs-stable_3" }, diff --git a/flake.nix b/flake.nix index 98cf009..d2f0e06 100644 --- a/flake.nix +++ b/flake.nix @@ -2,13 +2,14 @@ description = "pbsds' system/home flake"; inputs = { - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + # https://github.com/nixos/nixpkgs + nixpkgs-edge.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-2311.url = "github:NixOS/nixpkgs/nixos-23.11"; # gnome plugins broken nixpkgs-2305.url = "github:NixOS/nixpkgs/nixos-23.05"; # https://github.com/nix-community/home-manager - home-manager-unstable.url = "github:nix-community/home-manager/master"; - home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable"; + home-manager-edge.url = "github:nix-community/home-manager/master"; + home-manager-edge.inputs.nixpkgs.follows = "nixpkgs-edge"; home-manager-2311.url = "github:nix-community/home-manager/release-23.11"; home-manager-2311.inputs.nixpkgs.follows = "nixpkgs-2311"; home-manager-2305.url = "github:nix-community/home-manager/release-23.05"; @@ -26,8 +27,8 @@ nixos-generators-2311.inputs.nixpkgs.follows = "nixpkgs-2311"; # https://github.com/Mic92/sops-nix - sops-nix-unstable.url = "github:Mic92/sops-nix"; - sops-nix-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable"; + sops-nix-edge.url = "github:Mic92/sops-nix"; + sops-nix-edge.inputs.nixpkgs.follows = "nixpkgs-edge"; sops-nix-2311.url = "github:Mic92/sops-nix"; sops-nix-2311.inputs.nixpkgs.follows = "nixpkgs-2311"; sops-nix-2305.url = "github:Mic92/sops-nix"; @@ -77,14 +78,14 @@ } @ inputs': let inputs-edge = inputs' // { - nixpkgs = inputs'.nixpkgs-unstable; - unstable = inputs'.nixpkgs-unstable; - home-manager = inputs'.home-manager-unstable; - sops-nix = inputs'.sops-nix-unstable; + nixpkgs = inputs'.nixpkgs-edge; + unstable = inputs'.nixpkgs-edge; + home-manager = inputs'.home-manager-edge; + sops-nix = inputs'.sops-nix-edge; }; inputs-2311 = inputs' // { nixpkgs = inputs'.nixpkgs-2311; - unstable = inputs'.nixpkgs-unstable; + unstable = inputs'.nixpkgs-edge; home-manager = inputs'.home-manager-2311; sops-nix = inputs'.sops-nix-2311; };