diff --git a/flake.lock b/flake.lock index e9c93d2..e74d180 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,47 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1665512413, - "narHash": "sha256-IeuXVWD+VkmdVdC3d2i7mdEWhNSEvc2GUdui09zAGpE=", + "lastModified": 1666885127, + "narHash": "sha256-uXA/3lhLhwOTBMn9a5zJODKqaRT+SuL5cpEmOz2ULoo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "08ce9a42392cf8c7fdabf7c51069381ba5455dc7", + "rev": "0e101dbae756d35a376a5e1faea532608e4a4b9a", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1666885127, + "narHash": "sha256-uXA/3lhLhwOTBMn9a5zJODKqaRT+SuL5cpEmOz2ULoo=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "0e101dbae756d35a376a5e1faea532608e4a4b9a", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, + "locked": { + "lastModified": 1666885127, + "narHash": "sha256-uXA/3lhLhwOTBMn9a5zJODKqaRT+SuL5cpEmOz2ULoo=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "0e101dbae756d35a376a5e1faea532608e4a4b9a", "type": "github" }, "original": { @@ -79,11 +115,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", "type": "github" }, "original": { @@ -92,6 +128,22 @@ "type": "github" } }, + "hugo-coder": { + "flake": false, + "locked": { + "lastModified": 1666019037, + "narHash": "sha256-ID47G7AuL8xNkRGmzJhwzFGz4GvQ9hOQz+qLN+w5Wcs=", + "owner": "luizdepra", + "repo": "hugo-coder", + "rev": "5c4502ae75ad98ec90877eec0fe8f26331bdaaf3", + "type": "github" + }, + "original": { + "owner": "luizdepra", + "repo": "hugo-coder", + "type": "github" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -115,11 +167,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1665583830, - "narHash": "sha256-eqiWqvcKRgAhgGnZRC7fm2feLH5Hb6SaIDfVNA7Iplk=", + "lastModified": 1668102076, + "narHash": "sha256-xFamYc7KicL/KY9uKISOuCJOeoq/NG6AoeySzpZ83uc=", "owner": "NixOS", "repo": "nix", - "rev": "a6239eb5700ebb85b47bb5f12366404448361f8d", + "rev": "9550b1d51933a51fbb21563db0e3f53d0e8faea8", "type": "github" }, "original": { @@ -130,11 +182,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1665321371, - "narHash": "sha256-0SO6MTW0bX6lxZmz1AZW/Xmk+hnTd7/hp1vF7Tp7jg0=", + "lastModified": 1668084757, + "narHash": "sha256-/RRIVnNrg1EZkYMaPdQFuxCQ72LPWkVjvWEClR8FqvI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "236ba4df714131059945d7754c0aa3fbe9d2f74c", + "rev": "11a42a580de22355934ffd9235b81b64004a2e98", "type": "github" }, "original": { @@ -160,11 +212,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1665279158, - "narHash": "sha256-TpbWNzoJ5RaZ302dzvjY2o//WxtOJuYT3CnDj5N69Hs=", + "lastModified": 1667091951, + "narHash": "sha256-62sz0fn06Nq8OaeBYrYSR3Y6hUcp8/PC4dJ7HeGaOhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3783bcfb8ec54e0de26feccfc6cc36b8e202ed5", + "rev": "6440d13df2327d2db13d3b17e419784020b71d22", "type": "github" }, "original": { @@ -192,6 +244,42 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "dir": "lib", + "lastModified": 1665349835, + "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_3": { + "locked": { + "dir": "lib", + "lastModified": 1665349835, + "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -210,11 +298,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1665449268, - "narHash": "sha256-cw4xrQIAZUyJGj58Dp5VLICI0rscd+uap83afiFzlcA=", + "lastModified": 1667991831, + "narHash": "sha256-DHgEsLZI044B9T4AjA3K6+yB9/DqLr4dyA7OIx0FG7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "285e77efe87df64105ec14b204de6636fb0a7a27", + "rev": "872fceeed60ae6b7766cc0a4cd5bf5901b9098ec", "type": "github" }, "original": { @@ -241,11 +329,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1665466769, - "narHash": "sha256-L+qcHpb4Ac3PipMXJY/Ktbu1+KXy23WCZ8pXWmsf7zY=", + "lastModified": 1668016843, + "narHash": "sha256-ioBuF+IAhmJO7s4ewEij1LkMxJvCCNCKXxMto/DU02I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b20bf89e0035b6d62ad58f9db8fdbc99c2b01e8", + "rev": "fa842715565307b7e05cdb187b08c05f16ed08f1", "type": "github" }, "original": { @@ -256,11 +344,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1645655918, - "narHash": "sha256-ZfbEFRW7o237+A1P7eTKhXje435FCAoe0blj2n20Was=", - "owner": "nixos", + "lastModified": 1667292599, + "narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "77a7a4197740213879b9a1d2e1788c6c8ade4274", + "rev": "ef2f213d9659a274985778bff4ca322f3ef3ac68", "type": "github" }, "original": { @@ -268,17 +356,35 @@ "type": "indirect" } }, + "passworts": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667751909, + "narHash": "sha256-TMJ91x19M+mPtpcD2u9krW0yehlyF0OsY6OesIhs2BA=", + "type": "git", + "url": "file:///home/felix/code/python/passworts" + }, + "original": { + "type": "git", + "url": "file:///home/felix/code/python/passworts" + } + }, "pre-commit-hooks": { "inputs": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1665584211, - "narHash": "sha256-Qc9zn43UjLpP823BP416hAsoaXugwWw+nKPVqsNhqdY=", + "lastModified": 1667992213, + "narHash": "sha256-8Ens8ozllvlaFMCZBxg6S7oUyynYx2v7yleC5M0jJsE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "94b0f300dd9a23d4e851aa2a947a1511d3410e2d", + "rev": "ebcbfe09d2bd6d15f68de3a0ebb1e4dcb5cd324b", "type": "github" }, "original": { @@ -295,6 +401,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "passworts": "passworts", "pre-commit-hooks": "pre-commit-hooks", "sops-nix": "sops-nix", "stunkymonkey": "stunkymonkey" @@ -325,11 +432,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1665289655, - "narHash": "sha256-j1Q9mNBhbzeJykhObiXwEGres9qvP4vH7gxdJ+ihkLI=", + "lastModified": 1667767301, + "narHash": "sha256-+UDtEkw6pZ+sqkC0Um5ocJ9kjvuu0qffSCbl+jAA8K8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0ce0449e6404c4ff9d1b7bd657794ae5ca54deb3", + "rev": "4407353739ad74a3d9744cf2988ab10f3b83e288", "type": "github" }, "original": { @@ -339,13 +446,19 @@ } }, "stunkymonkey": { - "flake": false, + "inputs": { + "flake-parts": "flake-parts_3", + "hugo-coder": "hugo-coder", + "nixpkgs": [ + "nixpkgs" + ] + }, "locked": { - "lastModified": 1653819201, - "narHash": "sha256-AjAknv1Pjhc0xVJnd8kPbtpkamFLcSZYSijc26vhMxw=", + "lastModified": 1667316602, + "narHash": "sha256-V/P1+ag5qmBoLgkrKDOzZkuLCTgMtiuyNZ2OrU2k4HI=", "owner": "Stunkymonkey", "repo": "stunkymonkey.de", - "rev": "0cc4ef8757886c4b85e0d8e1bf4c0f6a58ac0dd8", + "rev": "1de6abe55ffa1d656588caed7ab24a9133199636", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index abcd0c0..87805ae 100644 --- a/flake.nix +++ b/flake.nix @@ -1,27 +1,38 @@ { description = "NixOS configuration"; inputs = { - flake-parts.url = "github:hercules-ci/flake-parts"; - flake-parts.inputs.nixpkgs.follows = "nixpkgs"; - nix.url = "github:NixOS/nix"; nixpkgs.url = "nixpkgs/nixos-22.05"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; + flake-parts = { + url = "github:hercules-ci/flake-parts"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; nixos-hardware.url = "github:NixOS/nixos-hardware"; deploy-rs.url = "github:input-output-hk/deploy-rs"; - sops-nix.url = "github:Mic92/sops-nix"; - sops-nix.inputs.nixpkgs.follows = "nixpkgs"; + sops-nix = { + url = "github:Mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; stunkymonkey = { url = "github:Stunkymonkey/stunkymonkey.de"; - flake = false; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + passworts = { + #url = "github:Stunkymonkey/passworts"; + url = "/home/felix/code/python/passworts"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; + outputs = { self, flake-parts, deploy-rs, ... } @ inputs: flake-parts.lib.mkFlake { inherit self; } { imports = [