diff --git a/flake.lock b/flake.lock index e9deadf9..85248add 100644 --- a/flake.lock +++ b/flake.lock @@ -116,11 +116,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1693813440, - "narHash": "sha256-d0hP+zKx/h/HxeczMa+U2pKc/uSvO/YQU/EzjXHge+o=", + "lastModified": 1694468995, + "narHash": "sha256-9aTw6oP0dgBb7Y+Yav/bWJDJ+BvRPKxruKIerAnaZfs=", "owner": "rycee", "repo": "nur-expressions", - "rev": "4bd2a31b478e28d1cfac87b6a90ac30f019d8c33", + "rev": "e9fcff30e85945573480de9ad004a5552185898c", "type": "gitlab" }, "original": { @@ -233,11 +233,11 @@ }, "hardware": { "locked": { - "lastModified": 1693718952, - "narHash": "sha256-+nGdJlgTk0MPN7NygopipmyylVuAVi7OItIwTlwtGnw=", + "lastModified": 1694432324, + "narHash": "sha256-bo3Gv6Cp40vAXDBPi2XiDejzp/kyz65wZg4AnEWxAcY=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "793de77d9f83418b428e8ba70d1e42c6507d0d35", + "rev": "ca41b8a227dd235b1b308217f116c7e6e84ad779", "type": "github" }, "original": { @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1693859358, - "narHash": "sha256-r3Pak/ao3p8weTzR+Ry3qQrfRsmSOwWW5sAe73mrYKs=", + "lastModified": 1694469544, + "narHash": "sha256-eqZng5dZnAUyb7xXyFk5z871GY/++KVv3Gyld5mVh20=", "owner": "nix-community", "repo": "home-manager", - "rev": "886ea1d213efd1082f419d066e89ef37635dc970", + "rev": "5171f5ef654425e09d9c2100f856d887da595437", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1694385887, - "narHash": "sha256-0KEPpP+fERPPlnaQk12QSUDmwUAmj9FG1apa8MOP6Fk=", + "lastModified": 1694554628, + "narHash": "sha256-ZqTV9cyrlGWLPl/fEEN1iaQ6ioSSTOiMCshgIpRSfuM=", "owner": "hyprwm", "repo": "hyprland", - "rev": "3859607b6cf26ead21f4a23ee11458b7b67fe542", + "rev": "b0d5e4008b96f2cdbb6f6c2449c790d921d1546b", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1693839821, - "narHash": "sha256-ha9Cxqb81Yni217SoM/zFxE0nNz8IMtreTw4SlXw/D4=", + "lastModified": 1693997747, + "narHash": "sha256-W23nMGmDnyBgxO8O/9jcZtiSpa0taMNcRAD1das/ttw=", "owner": "hyprwm", "repo": "contrib", - "rev": "74aa6b02ff4bd48aaee4da461a16c4cbaaa0ca7e", + "rev": "5b67181fced4fb06d26afcf9614b35765c576168", "type": "github" }, "original": { @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1693529589, - "narHash": "sha256-L9dU+Uva6X7kbW8mTgmrQluG8RL06HXen4jPmekVxaI=", + "lastModified": 1694479600, + "narHash": "sha256-0q2bxR3R8vEfPAC0a4UjF3XvWw2wZLrUQLsHrmJ1p0w=", "owner": "misterio77", "repo": "nix-minecraft", - "rev": "7fc21853134354531dffb6619be4ffb76f6fb96c", + "rev": "487c93de477712117dbb8ee90d4f6c20e1e32a38", "type": "github" }, "original": { @@ -435,8 +435,12 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_11": "nixpkgs-22_11", - "nixpkgs-23_05": "nixpkgs-23_05", + "nixpkgs-22_11": [ + "nixpkgs" + ], + "nixpkgs-23_05": [ + "nixpkgs" + ], "utils": "utils" }, "locked": { @@ -469,36 +473,6 @@ "type": "github" } }, - "nixpkgs-22_11": { - "locked": { - "lastModified": 1669558522, - "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" - } - }, - "nixpkgs-23_05": { - "locked": { - "lastModified": 1684782344, - "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, "nixpkgs-lib": { "locked": { "dir": "lib", @@ -532,29 +506,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1693097136, - "narHash": "sha256-fBZSMdBaoZ0INFbyZ5s0DOF7zDNcLsLxgkwdDh3l9Pc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9117c4e9dc117a6cd0319cca40f2349ed333669d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1693663421, - "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=", + "lastModified": 1694422566, + "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e56990880811a451abd32515698c712788be5720", + "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", "type": "github" }, "original": { @@ -581,22 +539,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1693060755, - "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1693771906, "narHash": "sha256-32EnPCaVjOiEERZ+o/2Ir7JH9pkfwJZJ27SKHNvt4yk=", @@ -612,7 +554,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1670543317, "narHash": "sha256-4mMR56rtxKr+Gwz399jFr4i76SQZxsLWxxyfQlPXRm0=", @@ -691,15 +633,19 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1693404499, - "narHash": "sha256-cx/7yvM/AP+o/3wPJmA9W9F+WHemJk5t+Xcr+Qwkqhg=", + "lastModified": 1694495315, + "narHash": "sha256-sZEYXs9T1NVHZSSbMqBEtEm2PGa7dEDcx0ttQkArORc=", "owner": "mic92", "repo": "sops-nix", - "rev": "d9c5dc41c4b1f74c77f0dbffd0f3a4ebde447b7a", + "rev": "ea208e55f8742fdcc0986b256bdfa8986f5e4415", "type": "github" }, "original": { @@ -785,7 +731,7 @@ }, "website": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "systems": "systems_4" }, "locked": { @@ -852,7 +798,7 @@ }, "yrmos": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1690053285, diff --git a/flake.nix b/flake.nix index 2d0145b6..b0f14c9c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,12 @@ hardware.url = "github:nixos/nixos-hardware"; impermanence.url = "github:nix-community/impermanence"; nix-colors.url = "github:misterio77/nix-colors"; - sops-nix.url = "github:mic92/sops-nix"; + sops-nix = { + url = "github:mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-stable.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -25,6 +29,8 @@ nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-22_11.follows = "nixpkgs"; + inputs.nixpkgs-23_05.follows = "nixpkgs"; }; nix-minecraft = { url = "github:misterio77/nix-minecraft";