diff --git a/flake.lock b/flake.lock index 698fc4a..2308d12 100644 --- a/flake.lock +++ b/flake.lock @@ -32,6 +32,23 @@ "type": "github" } }, + "all-cabal-json": { + "flake": false, + "locked": { + "lastModified": 1665552503, + "narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=", + "owner": "nix-community", + "repo": "all-cabal-json", + "rev": "d7c0434eebffb305071404edcf9d5cd99703878e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "hackage", + "repo": "all-cabal-json", + "type": "github" + } + }, "base16-schemes": { "flake": false, "locked": { @@ -88,9 +105,25 @@ } }, "crane": { + "flake": false, + "locked": { + "lastModified": 1670900067, + "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nickel", "nixpkgs" @@ -111,10 +144,10 @@ "type": "github" } }, - "crane_2": { + "crane_3": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_6", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nickel", "topiary", @@ -152,12 +185,16 @@ } }, "devshell": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1625086391, - "narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=", + "lastModified": 1678957337, + "narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=", "owner": "numtide", "repo": "devshell", - "rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7", + "rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47", "type": "github" }, "original": { @@ -167,12 +204,13 @@ } }, "devshell_2": { + "flake": false, "locked": { - "lastModified": 1625086391, - "narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=", + "lastModified": 1663445644, + "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", "owner": "numtide", "repo": "devshell", - "rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7", + "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", "type": "github" }, "original": { @@ -183,11 +221,11 @@ }, "devshell_3": { "locked": { - "lastModified": 1637098489, - "narHash": "sha256-IWBYLSNSENI/fTrXdYDhuCavxcgN9+RERrPM81f6DXY=", + "lastModified": 1625086391, + "narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=", "owner": "numtide", "repo": "devshell", - "rev": "e8c2d4967b5c498b12551d1bb49352dcf9efa3e4", + "rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7", "type": "github" }, "original": { @@ -211,28 +249,100 @@ "type": "github" } }, - "emulator-2a": { + "dream2nix": { "inputs": { - "nixCargoIntegration": "nixCargoIntegration" + "all-cabal-json": "all-cabal-json", + "crane": "crane", + "devshell": "devshell_2", + "drv-parts": "drv-parts", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", + "flake-utils-pre-commit": "flake-utils-pre-commit", + "ghc-utils": "ghc-utils", + "gomod2nix": "gomod2nix", + "mach-nix": "mach-nix", + "nix-pypi-fetcher": "nix-pypi-fetcher", + "nixpkgs": "nixpkgs_2", + "nixpkgsV1": "nixpkgsV1", + "poetry2nix": "poetry2nix", + "pre-commit-hooks": "pre-commit-hooks", + "pruned-racket-catalog": "pruned-racket-catalog" }, "locked": { - "lastModified": 1656257019, - "narHash": "sha256-wYvGfef35n7qRCECUjtffky2cr77TQicbeY8a5Beq18=", + "lastModified": 1680605243, + "narHash": "sha256-dUrxj653kcLvjNKRI7NoTJoj+Q7G+vOYsl4iuwtnIWo=", + "owner": "nix-community", + "repo": "dream2nix", + "rev": "34a80ab215f1f24068ea9c76f3a7e5bc19478653", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "dream2nix", + "type": "github" + } + }, + "drv-parts": { + "inputs": { + "flake-compat": [ + "emulator-2a", + "dream2nix", + "flake-compat" + ], + "flake-parts": [ + "emulator-2a", + "dream2nix", + "flake-parts" + ], + "nixpkgs": [ + "emulator-2a", + "dream2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1680172861, + "narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=", + "owner": "davhau", + "repo": "drv-parts", + "rev": "ced8a52f62b0a94244713df2225c05c85b416110", + "type": "github" + }, + "original": { + "owner": "davhau", + "repo": "drv-parts", + "type": "github" + } + }, + "emulator-2a": { + "inputs": { + "devshell": "devshell", + "dream2nix": "dream2nix", + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1681508451, + "narHash": "sha256-sTGs3uY93z46L2gKObCo+wPPN2cWUeZsNCy8pBqaVl4=", "owner": "MalteT", "repo": "2a-emulator", - "rev": "60052c33ce7ddccefa9b16d492c717afe356d205", + "rev": "bc9f1c7c29513e85bd8a2e32c91cef75a9c055b3", "type": "github" }, "original": { "owner": "MalteT", - "ref": "develop", + "ref": "main", "repo": "2a-emulator", "type": "github" } }, "fend": { "inputs": { - "nixCargoIntegration": "nixCargoIntegration_2" + "nixCargoIntegration": "nixCargoIntegration" }, "locked": { "lastModified": 1648671700, @@ -335,6 +445,38 @@ } }, "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_7": { "locked": { "lastModified": 1680531544, "narHash": "sha256-8qbiDTYb1kGaDADRXTItpcMKQ1TeQVkuof6oEwHUvVA=", @@ -350,6 +492,46 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "emulator-2a", + "dream2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1675933616, + "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1680392223, + "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixpkgs-wayland", @@ -386,13 +568,43 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils-pre-commit": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_10": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", "type": "github" }, "original": { @@ -403,11 +615,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -447,6 +659,36 @@ } }, "flake-utils_6": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "locked": { + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -461,7 +703,7 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_9": { "inputs": { "systems": "systems" }, @@ -479,22 +721,45 @@ "type": "github" } }, - "flake-utils_8": { + "ghc-utils": { + "flake": false, "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" + "lastModified": 1662774800, + "narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=", + "ref": "refs/heads/master", + "rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea", + "revCount": 1072, + "type": "git", + "url": "https://gitlab.haskell.org/bgamari/ghc-utils" }, "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" + "type": "git", + "url": "https://gitlab.haskell.org/bgamari/ghc-utils" } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "emulator-2a", + "pre-commit-hooks-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "nickel", @@ -516,23 +781,20 @@ "type": "github" } }, - "glados": { - "inputs": { - "nixCargoIntegration": "nixCargoIntegration_3" - }, + "gomod2nix": { + "flake": false, "locked": { - "lastModified": 1639140254, - "narHash": "sha256-gtjlmHwxMXZPj73A/h28/J2ANsToJnN7pIo4jruegs4=", - "ref": "main", - "rev": "2954e07ad5f94cf4812891c0fc0fbd9c159c1540", - "revCount": 15, - "type": "git", - "url": "http://git.home/megamanmalte/GLaDOS" + "lastModified": 1627572165, + "narHash": "sha256-MFpwnkvQpauj799b4QTBJQFEddbD02+Ln5k92QyHOSk=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "67f22dd738d092c6ba88e420350ada0ed4992ae8", + "type": "github" }, "original": { - "ref": "main", - "type": "git", - "url": "http://git.home/megamanmalte/GLaDOS" + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" } }, "home-manager": { @@ -583,7 +845,7 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "wlroots": "wlroots", "xdph": "xdph" }, @@ -661,8 +923,8 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs-lib": "nixpkgs-lib_2" + "flake-utils": "flake-utils_9", + "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { "lastModified": 1681214977, @@ -694,9 +956,24 @@ "type": "github" } }, + "mach-nix": { + "flake": false, + "locked": { + "lastModified": 1634711045, + "narHash": "sha256-m5A2Ty88NChLyFhXucECj6+AuiMZPHXNbw+9Kcs7F6Y=", + "owner": "DavHau", + "repo": "mach-nix", + "rev": "4433f74a97b94b596fa6cd9b9c0402104aceef5d", + "type": "github" + }, + "original": { + "id": "mach-nix", + "type": "indirect" + } + }, "mensa": { "inputs": { - "nixCargoIntegration": "nixCargoIntegration_4" + "nixCargoIntegration": "nixCargoIntegration_2" }, "locked": { "lastModified": 1656255112, @@ -715,12 +992,12 @@ }, "nickel": { "inputs": { - "crane": "crane", - "flake-utils": "flake-utils_3", + "crane": "crane_2", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks", + "pre-commit-hooks": "pre-commit-hooks_2", "rust-overlay": "rust-overlay_2", "topiary": "topiary" }, @@ -740,7 +1017,7 @@ "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1680875144, @@ -758,8 +1035,8 @@ }, "nix-eval-jobs": { "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_8" + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1681421147, @@ -790,10 +1067,26 @@ "type": "github" } }, + "nix-pypi-fetcher": { + "flake": false, + "locked": { + "lastModified": 1669065297, + "narHash": "sha256-UStjXjNIuIm7SzMOWvuYWIHBkPUKQ8Id63BMJjnIDoA=", + "owner": "DavHau", + "repo": "nix-pypi-fetcher", + "rev": "a9885ac6a091576b5195d547ac743d45a2a615ac", + "type": "github" + }, + "original": { + "owner": "DavHau", + "repo": "nix-pypi-fetcher", + "type": "github" + } + }, "nixCargoIntegration": { "inputs": { - "devshell": "devshell", - "nixpkgs": "nixpkgs", + "devshell": "devshell_3", + "nixpkgs": "nixpkgs_5", "rustOverlay": "rustOverlay" }, "locked": { @@ -812,51 +1105,10 @@ } }, "nixCargoIntegration_2": { - "inputs": { - "devshell": "devshell_2", - "nixpkgs": "nixpkgs_2", - "rustOverlay": "rustOverlay_2" - }, - "locked": { - "lastModified": 1648668486, - "narHash": "sha256-XuG24LJvz1gLJBrg6uVfnfxNoq9uTPZfoAhCaEUVVIM=", - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "rev": "15c34bac7a54d4519ba821a844f4a0867ffd0504", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "ref": "release-1.0", - "repo": "nix-cargo-integration", - "type": "github" - } - }, - "nixCargoIntegration_3": { - "inputs": { - "devshell": "devshell_3", - "nixpkgs": "nixpkgs_3", - "rustOverlay": "rustOverlay_3" - }, - "locked": { - "lastModified": 1637302206, - "narHash": "sha256-X82LW/R35vCxNSk9jcddZFbjO6ZMjsq+KhIGC/GMkJg=", - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "rev": "a25206065a3a19d3dbcb2192d9bd273eea5cd919", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "type": "github" - } - }, - "nixCargoIntegration_4": { "inputs": { "devshell": "devshell_4", - "nixpkgs": "nixpkgs_5", - "rustOverlay": "rustOverlay_4" + "nixpkgs": "nixpkgs_7", + "rustOverlay": "rustOverlay_2" }, "locked": { "lastModified": 1648668486, @@ -913,21 +1165,39 @@ }, "nixpkgs": { "locked": { - "lastModified": 1655983783, - "narHash": "sha256-0h1FzkYWei24IdKNpCX93onkF/FMiXQG8SdEbTc0r8A=", + "lastModified": 1677383253, + "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6141b8932a5cf376fe18fcd368cecd9ad946cb68", + "rev": "9952d6bc395f5841262b006fbace8dd7e143b634", "type": "github" }, "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1680213900, + "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", + "type": "github" + }, + "original": { + "dir": "lib", "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-lib": { + "nixpkgs-lib_2": { "locked": { "lastModified": 1680397293, "narHash": "sha256-wBpJ73+tJ8fZSWb4tzNbAVahC4HSo2QG3nICDy4ExBQ=", @@ -942,7 +1212,7 @@ "type": "github" } }, - "nixpkgs-lib_2": { + "nixpkgs-lib_3": { "locked": { "lastModified": 1681001314, "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", @@ -990,6 +1260,22 @@ } }, "nixpkgs-stable_2": { + "locked": { + "lastModified": 1678872516, + "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { "locked": { "lastModified": 1681005198, "narHash": "sha256-5LrnBeXR7Hv8OXh6eany7br4qBW+ZNl4LKf1CJu9zbg=", @@ -1007,10 +1293,10 @@ }, "nixpkgs-wayland": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_7", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1681461427, @@ -1042,7 +1328,54 @@ "type": "github" } }, + "nixpkgsV1": { + "locked": { + "lastModified": 1678500271, + "narHash": "sha256-tRBLElf6f02HJGG0ZR7znMNFv/Uf7b2fFInpTHiHaSE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5eb98948b66de29f899c7fe27ae112a47964baf8", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-22.11", + "type": "indirect" + } + }, "nixpkgs_10": { + "locked": { + "lastModified": 1681347147, + "narHash": "sha256-B+hTioRc3Jdf4SJyeCiO0fW5ShIznJk2OTiW2vOV+mc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1a9d9175ecc48ecd033062fa09b1834d13ae9c69", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1681303793, + "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { "locked": { "lastModified": 1680945546, "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", @@ -1059,6 +1392,53 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1665580254, + "narHash": "sha256-hO61XPkp1Hphl4HGNzj1VvDH5URt7LI6LaY/385Eul4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f634d427b0224a5f531ea5aa10c3960ba6ec5f0f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1681303793, + "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1680945546, + "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1628869426, "narHash": "sha256-7OetQdzAnml3+0b3pmr+reBKs9jn54IvVxbsncWzBn0=", @@ -1074,23 +1454,7 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1636976544, - "narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1680669251, "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", @@ -1106,7 +1470,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1655983783, "narHash": "sha256-0h1FzkYWei24IdKNpCX93onkF/FMiXQG8SdEbTc0r8A=", @@ -1122,7 +1486,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { "lastModified": 1665296151, "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", @@ -1138,7 +1502,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1681303793, "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", @@ -1153,51 +1517,85 @@ "type": "indirect" } }, - "nixpkgs_8": { + "poetry2nix": { + "flake": false, "locked": { - "lastModified": 1681347147, - "narHash": "sha256-B+hTioRc3Jdf4SJyeCiO0fW5ShIznJk2OTiW2vOV+mc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1a9d9175ecc48ecd033062fa09b1834d13ae9c69", + "lastModified": 1666918719, + "narHash": "sha256-BkK42fjAku+2WgCOv2/1NrPa754eQPV7gPBmoKQBWlc=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "289efb187123656a116b915206e66852f038720e", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1681303793, - "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "nix-community", + "ref": "1.36.0", + "repo": "poetry2nix", "type": "github" } }, "pre-commit-hooks": { + "inputs": { + "flake-utils": [ + "emulator-2a", + "dream2nix", + "flake-utils-pre-commit" + ], + "nixpkgs": [ + "emulator-2a", + "dream2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1646153636, + "narHash": "sha256-AlWHMzK+xJ1mG267FdT8dCq/HvLCA6jwmx2ZUy5O8tY=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "b6bc0b21e1617e2b07d8205e7fae7224036dfa4b", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks-nix": { "inputs": { "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_3", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1681413034, + "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_5", "flake-utils": [ "nickel", "flake-utils" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "nickel", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1678976941, @@ -1213,6 +1611,23 @@ "type": "github" } }, + "pruned-racket-catalog": { + "flake": false, + "locked": { + "lastModified": 1672537287, + "narHash": "sha256-SuOvXVcLfakw18oJB/PuRMyvGyGG1+CQD3R+TGHIv44=", + "owner": "nix-community", + "repo": "pruned-racket-catalog", + "rev": "c8b89557fb53b36efa2ee48a769c7364df0f6262", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "catalog", + "repo": "pruned-racket-catalog", + "type": "github" + } + }, "qmk-udev-rules": { "flake": false, "locked": { @@ -1270,7 +1685,6 @@ "emulator-2a": "emulator-2a", "fend": "fend", "fenix": "fenix", - "glados": "glados", "home-manager": "home-manager", "hydra": "hydra", "hyprland": "hyprland", @@ -1280,7 +1694,7 @@ "nix-colors": "nix-colors", "nixForHydra": "nixForHydra", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_9", "nixpkgs-wayland": "nixpkgs-wayland", "nixpkgsForNixForHydra": "nixpkgsForNixForHydra", "qmk-udev-rules": "qmk-udev-rules", @@ -1391,8 +1805,8 @@ }, "rust-overlay_4": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1679106165, @@ -1409,22 +1823,6 @@ } }, "rustOverlay": { - "flake": false, - "locked": { - "lastModified": 1656211780, - "narHash": "sha256-pKU6knP1wD7Co/mROj2DvnYqr92RGm0bWnsJu/rb/JQ=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "37ab3d00e8caaad1d1d3f78c9282d3d5435fc2ba", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rustOverlay_2": { "flake": false, "locked": { "lastModified": 1628993514, @@ -1440,23 +1838,7 @@ "type": "github" } }, - "rustOverlay_3": { - "flake": false, - "locked": { - "lastModified": 1637288133, - "narHash": "sha256-x5XWEK333KEhy2WL3TafE1vSa8/A1sGdbirTIV2bmSc=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ccc467eff80b2fbb8000cf425e999ef14fbe200c", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rustOverlay_4": { + "rustOverlay_2": { "flake": false, "locked": { "lastModified": 1656211780, @@ -1477,7 +1859,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1681209176, @@ -1527,8 +1909,8 @@ "topiary": { "inputs": { "advisory-db": "advisory-db", - "crane": "crane_2", - "flake-utils": "flake-utils_5", + "crane": "crane_3", + "flake-utils": "flake-utils_7", "nix-filter": "nix-filter", "nixpkgs": [ "nickel", @@ -1550,6 +1932,24 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1681486253, + "narHash": "sha256-EjiQZvXQH9tUPCyLC6lQpfGnoq4+kI9v59bDJWPicYo=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "b25d1a3c2c7554d0462ab1dfddf2f13128638b90", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1678901627, @@ -1567,7 +1967,7 @@ }, "utils_2": { "inputs": { - "flake-utils": "flake-utils_8" + "flake-utils": "flake-utils_10" }, "locked": { "lastModified": 1657226504, @@ -1604,7 +2004,7 @@ "xdg-desktop-portal-hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1681416853, diff --git a/flake.nix b/flake.nix index a7424fb..f800dd1 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ url = "github:nix-community/nixpkgs-wayland"; }; emulator-2a = { - url = "github:MalteT/2a-emulator/develop"; + url = "github:MalteT/2a-emulator/main"; inputs.nixpkgs.follows = "nixpkgs"; }; mensa = { @@ -34,10 +34,6 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - glados = { - url = "git+http://git.home/megamanmalte/GLaDOS?ref=main"; - inputs.nixpkgs.follows = "nixpkgs"; - }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -216,8 +212,6 @@ ./hosts/cornu-aspersum.nix ./hardware/netcup-rs-2000-g9.nix ./modules/nginx-reverse-proxy.nix - ./modules/ccqcraft.nix - inputs.glados.nixosModules.glados ]; }; granodomus-lima = {...}: { diff --git a/hosts/cornu-aspersum.nix b/hosts/cornu-aspersum.nix index 0f45e8d..bd2d856 100644 --- a/hosts/cornu-aspersum.nix +++ b/hosts/cornu-aspersum.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { boot.loader.grub.enable = true; boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sda"; @@ -22,36 +18,9 @@ sops.defaultSopsFile = ../secrets/hosts/cornu-aspersum/secrets.yaml; sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; - sops.secrets.gladosEnv = {}; - services.glados = { - enable = true; - dataCollector.enable = true; - envFile = config.sops.secrets.gladosEnv.path; - }; - - # === Run grafana, mainly for ccqcraft.de === - services.grafana = { - enable = true; - domain = "data.ccqcraft.de"; - port = 2342; - addr = "127.0.0.1"; - auth.anonymous.enable = false; - }; - services.nginx.virtualHosts.${config.services.grafana.settings.server.domain} = { - enableACME = true; - forceSSL = true; - serverAliases = ["data.tammena.rocks"]; - locations."/" = { - proxyPass = "http://127.0.0.1:${toString config.services.grafana.settings.server.http_port}"; - proxyWebsockets = true; - }; - }; - # Run radicale with infcloud interface for me and Marie services.radicaleWithInfcloud.enable = true; - systemd.services.glados.serviceConfig.SupplementaryGroups = [config.users.groups.keys.name]; - services.qemuGuest.enable = true; services.bind = { diff --git a/modules/ccqcraft-backups.nix b/modules/ccqcraft-backups.nix deleted file mode 100644 index 3fdc667..0000000 --- a/modules/ccqcraft-backups.nix +++ /dev/null @@ -1,66 +0,0 @@ -{pkgs, ...}: let - user = "ccqcraft"; - host = "ccqcraft.de"; - path = "~/server/mc/plugins/EasyBackup/backups"; - - fetchTime = "*-*-* 03:00:00"; - clearTime = "Mon *-*-* 04:00:00"; - - insertResetNoteCmd = with pkgs; - pkgs.writeScriptBin "insert-reset-note" '' - #!${stdenv.shell} - DATE=$(${coreutils}/bin/date +backup_%Y-%m-%d_%H:%M:%S%z.reset) - touch ./''${DATE} - ''; -in { - systemd.services = { - ccqcraft-pull-backups = { - unitConfig = { - Description = '' - Pull backups from CCQCraft Minecraft Server via rsync - ''; - After = ["network.target"]; - }; - serviceConfig = { - Type = "oneshot"; - ExecStart = [ - '' - ${pkgs.rsync}/bin/rsync -tr --partial --rsh=${pkgs.openssh}/bin/ssh "${user}@${host}:${path}/" .'' - ]; - WorkingDirectory = "/srv/hnd/ccqcraft-backups"; - }; - }; - - ccqcraft-restart-incremental-backups = { - unitConfig = { - Description = '' - Restart incremental backups for CCQCraft server - ''; - Requires = ["ccqcraft-pull-backups.service"]; - After = ["network.target" "ccqcraft-pull-backups.service"]; - }; - serviceConfig = { - Type = "oneshot"; - WorkingDirectory = "/srv/hnd/ccqcraft-backups"; - ExecStart = [''${pkgs.openssh}/bin/ssh "${user}@${host}" rm ${path}/*'']; - ExecStartPost = ["${insertResetNoteCmd}/bin/insert-reset-note"]; - }; - }; - }; - - systemd.timers = { - ccqcraft-pull-backups = { - wantedBy = ["timers.target"]; - unitConfig = {Description = "Run CCQCraft Backups every day";}; - timerConfig = {OnCalendar = fetchTime;}; - }; - - ccqcraft-restart-incremental-backups = { - wantedBy = ["timers.target"]; - unitConfig = { - Description = "Restart CCQCraft incremental backups weekly"; - }; - timerConfig = {OnCalendar = clearTime;}; - }; - }; -} diff --git a/modules/ccqcraft.nix b/modules/ccqcraft.nix deleted file mode 100644 index 99f4ea7..0000000 --- a/modules/ccqcraft.nix +++ /dev/null @@ -1,47 +0,0 @@ -{pkgs, ...}: let - ports = { - minecraft = 25565; - rcon = 24738; - voicechat = 24454; - dynmap = 8123; - }; -in { - virtualisation.docker.enable = true; - - users.users.ccqcraft = { - isNormalUser = true; - extraGroups = ["docker"]; - hashedPassword = "$6$D69mzkGZAitfCQOL$oL/7SmSqGwRhZgyiOEgp6N5NkZ/NpdzggomtPFa4XB33Kb3aZMBiLWQS3VSHZhRo2y9mPgXy3mFPSvtvCzoKz/"; - }; - - environment.systemPackages = with pkgs; [ - git - docker-compose - megatools - unzip - ]; - - networking.firewall = { - allowedTCPPorts = [ports.minecraft ports.rcon]; - allowedUDPPorts = [ - # Port used for Voicechat plugin - ports.voicechat - ]; - }; - - # Expose dynmap map through nginx - services.nginx.virtualHosts."map.ccqcraft.de" = { - serverAliases = ["ccqcraft.de"]; - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://[::1]:${builtins.toString ports.dynmap}"; - #proxyWebsockets = true; # needed if you need to use WebSocket - #extraConfig = - # required when the target is also TLS server with multiple hosts - #"proxy_ssl_server_name on;" + - # required when the server wants to use HTTP Authentication - #"proxy_pass_header Authorization;"; - }; - }; -} diff --git a/secrets/hosts/cornu-aspersum/secrets.yaml b/secrets/hosts/cornu-aspersum/secrets.yaml index 860e1cd..ff5e994 100644 --- a/secrets/hosts/cornu-aspersum/secrets.yaml +++ b/secrets/hosts/cornu-aspersum/secrets.yaml @@ -1,5 +1,4 @@ radicale-htpasswd: ENC[AES256_GCM,data:8AfEvYYvPjgthdxVGOQ4CzxhKtkRZHNFutWgmkXk9AMBfJi1DWr+dGj6ZqbnK7jteZ9Tnq6aZGEOkpKoVAV+tN/N,iv:6fCsTira+tiZagXPf+vqTr8lOqJmIKgRJ86RQHedReo=,tag:GHo/v9lGLmZtvm2311Qfqw==,type:str] -gladosEnv: ENC[AES256_GCM,data:EXUbwXX9fM4OcLoWaXAVgnpT8WDXJ5Fl8JjbXagL2ThsObsO0/v5s15X6XapIMRD1Tdf9pAkhzd8KgsxgljcaRCu1VlmI289rptys9u5Ajn6ZMFfoTdRcM8u5nM2VEKBrK+Zov4TQpNBZdU+W44KnIwnr/bH3GPHkzUvMJxT2qu/a20Cp+Kxp+FDPUp8FZDWVT7iuLEtwwqy9oCQG2vFCUTbgMo9lyh40bG6eObkiKZ2UhaAo1p0shH/SgHMIWY++psynH4HtJX6sqR37sa7PTsa2SQZ6+WYWrbx55ud1fIVuHhFoAhny1GT7DOavGmd856xIF53XqSnbTiUJwdUoL568rhsUGGMg+LZTfSNUMhxIKLELsGBX86HNQHWjyQPq6oUS0JSHBBPx+Qyd9ie1whVC+PwxVMatD8Ull7S9LyFtJzU+buG4Ey+Uk7XRNU0hE0hGVysHFu7TqzIHNLvaVnYIonL349vsUUv8cO+k9VVVyBcist6YZV1nOB5InXoVe6Kh0XyWs9BtCKBPcKRGCwGybi3/EPQEWhMYZF/paKFl0/DIw93QUDbOnxJOHvebVy02iWVqGA=,iv:JmNRE6CBHOROyUSJ0h0XlXJ6aW/3mOj7IHgbTDAsS30=,tag:EcQ23XGYPjDDNxIAYUL33w==,type:str] sops: kms: [] gcp_kms: [] @@ -15,8 +14,8 @@ sops: WlMwS0J4WGhIL2tDcW5HMWhIdU1jVVEKEYC4OhrpqzyGiGvjkk61wY36T+AP9RjY 5Y64AY9c1cq23np0uUUoSdYL91gV1XmNX+0bwTZpiXASHJx0uZQwHA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2022-01-14T13:47:25Z" - mac: ENC[AES256_GCM,data:sZdNGaK/yO4Q9rEa+8U5U/mWKXU+/dHlvFpur0LvCtiVbQ79QEOcnJu3BAbiBj+Jda8j2ClI6HaivP12MVh0a0KpaaaE+tAO6WMhoF6TXLCCmR/1h8o8NoUwp21hzaLjCt0y8ckWXWAU9NMPc2siKA74sGEP9ORbOjnBvLGHLJM=,iv:OwbN3OsSunJib11bZN6CQ/vej75j4bPGxQtzasv9Y78=,tag:RZvr0JbTDdfESPR8XyJIHQ==,type:str] + lastmodified: "2023-04-14T21:46:27Z" + mac: ENC[AES256_GCM,data:Jzp3GqzYYFbHa6k+lx0NQ5iTBp3tiS8COb5tdXsPgw1btpbYb9KEEKriZBJr/RUaAHNcmF6lH4MRFhQzD0zBHK9uzEaUJAXD5z9XjXy9UZB2kOtBEMDA5pcbzhm8dy89cvfC1bwMK9bF1ZcqgnAPRWnML76y9xPy8+vME2J3wP8=,iv:kg6nYxsEAaQizR1/ihst8dRxTNwzDIHawsOh9PNW2OE=,tag:go8g1llvlfZONQr5cq6YbA==,type:str] pgp: - created_at: "2022-01-14T13:38:22Z" enc: | @@ -39,4 +38,4 @@ sops: -----END PGP MESSAGE----- fp: 71E08E591553F5EA4CB98745BCE9E4BF632E7CED unencrypted_suffix: _unencrypted - version: 3.7.1 + version: 3.7.3