diff --git a/flake.lock b/flake.lock index b405d1e..7673b1f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,29 +1,5 @@ { "nodes": { - "alejandra": { - "inputs": { - "fenix": "fenix", - "flakeCompat": "flakeCompat", - "nixpkgs": [ - "conduit", - "d2n", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658427149, - "narHash": "sha256-ToD/1z/q5VHsLMrS2h96vjJoLho59eNRtknOUd19ey8=", - "owner": "kamadorueda", - "repo": "alejandra", - "rev": "f5a22afd2adfb249b4e68e0b33aa1f0fb73fb1be", - "type": "github" - }, - "original": { - "owner": "kamadorueda", - "repo": "alejandra", - "type": "github" - } - }, "all-cabal-json": { "flake": false, "locked": { @@ -41,23 +17,6 @@ "type": "github" } }, - "all-cabal-json_2": { - "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": { "inputs": { "nixpkgs": [ @@ -108,11 +67,11 @@ }, "locked": { "dir": "blender", - "lastModified": 1672481321, - "narHash": "sha256-jEsTHCUtRxBgm5aAHg9itT3aBIvYf14LmXc5maX3b88=", + "lastModified": 1680119682, + "narHash": "sha256-Rh/TsMmvnMPVwBGxKnCba5NhBxFCj9IZTzzeCj5YM4c=", "owner": "edolstra", "repo": "nix-warez", - "rev": "048fb146cc637729bc7de7807f0fe4849876de23", + "rev": "62de96845e25cccd5ae8452252b9f570053b9a9e", "type": "github" }, "original": { @@ -124,22 +83,22 @@ }, "blog": { "inputs": { - "emanote": "emanote", - "flake-parts": [ - "blog", - "emanote", - "flake-parts" - ], + "html-nix": "html-nix", "nixpkgs": [ "nixpkgs" + ], + "parts": [ + "blog", + "html-nix", + "parts" ] }, "locked": { - "lastModified": 1667005626, - "narHash": "sha256-CMRHufOL5/Cum85ZzvIUjiL0OwfwbezoRuY71TlsrqE=", + "lastModified": 1680758458, + "narHash": "sha256-zLzDptw7e2CpGeIHYqfU4PrD3Eej5z2O5/Y+5mdxuNw=", "ref": "refs/heads/master", - "rev": "06c837f139a4bb30c71d9460256fc5a25b99170f", - "revCount": 72, + "rev": "e8c2808cc04380fd9bec53a62ffa477d1115e499", + "revCount": 76, "type": "git", "url": "https://git.gaze.systems/dusk/website.git" }, @@ -150,19 +109,19 @@ }, "conduit": { "inputs": { - "d2n": "d2n", + "crane": "crane_2", + "fenix": "fenix", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" - ], - "parts": "parts", - "rust-overlay": "rust-overlay_2" + ] }, "locked": { - "lastModified": 1678973562, - "narHash": "sha256-ta7YGwAd2qMBewnHf7WWErbR9CzfIWM+ORWlQ0T62gs=", + "lastModified": 1680688749, + "narHash": "sha256-j+jnjBbWMCbjxwIA0oh7Qwwg5e009kGWBqrCj9hQ9nY=", "owner": "famedly", "repo": "conduit", - "rev": "664ee7d89a7f9add52be519dcce1e2d333506ed1", + "rev": "1b9e63f4269988a957a2e376355b2dacd2295c08", "type": "gitlab" }, "original": { @@ -171,28 +130,6 @@ "type": "gitlab" } }, - "coricamu": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ], - "utils": "utils_2" - }, - "locked": { - "lastModified": 1677749800, - "narHash": "sha256-xIqxDr4fkOA5R4OudbQoUMS8xvPJNCyGfqugENutSP4=", - "owner": "danth", - "repo": "coricamu", - "rev": "40db414609dc6d72319987d3e9d7b56fe405c28f", - "type": "github" - }, - "original": { - "owner": "danth", - "repo": "coricamu", - "type": "github" - } - }, "crane": { "flake": false, "locked": { @@ -210,13 +147,24 @@ } }, "crane_2": { - "flake": false, + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": [ + "conduit", + "flake-utils" + ], + "nixpkgs": [ + "conduit", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2" + }, "locked": { - "lastModified": 1670900067, - "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", + "lastModified": 1680584903, + "narHash": "sha256-uraq+D3jcLzw/UVk0xMHcnfILfIMa0DLrtAEq2nNlxU=", "owner": "ipetkov", "repo": "crane", - "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", + "rev": "65d3f6a3970cd46bef5eedfd458300f72c56b3c5", "type": "github" }, "original": { @@ -241,39 +189,6 @@ "type": "github" } }, - "d2n": { - "inputs": { - "alejandra": "alejandra", - "all-cabal-json": "all-cabal-json_2", - "crane": "crane_2", - "devshell": "devshell_2", - "flake-parts": "flake-parts_2", - "flake-utils-pre-commit": "flake-utils-pre-commit", - "ghc-utils": "ghc-utils_2", - "gomod2nix": "gomod2nix", - "mach-nix": "mach-nix", - "nix-pypi-fetcher": "nix-pypi-fetcher", - "nixpkgs": [ - "conduit", - "nixpkgs" - ], - "poetry2nix": "poetry2nix", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1674848374, - "narHash": "sha256-1+xlsmUWzpptK8mLjznwqOLogeicLkxB8tV6XUZbobc=", - "owner": "nix-community", - "repo": "dream2nix", - "rev": "d91e7381fa303be02f70e472207e05b26ce35b41", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "dream2nix", - "type": "github" - } - }, "devshell": { "flake": false, "locked": { @@ -290,22 +205,6 @@ "type": "github" } }, - "devshell_2": { - "flake": false, - "locked": { - "lastModified": 1663445644, - "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", - "owner": "numtide", - "repo": "devshell", - "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dream2nix": { "inputs": { "alejandra": [ @@ -368,10 +267,6 @@ }, "dream2nix_2": { "inputs": { - "alejandra": [ - "helix", - "nci" - ], "all-cabal-json": [ "helix", "nci" @@ -381,6 +276,8 @@ "helix", "nci" ], + "drv-parts": "drv-parts", + "flake-compat": "flake-compat_2", "flake-parts": [ "helix", "nci", @@ -411,6 +308,7 @@ "nci", "nixpkgs" ], + "nixpkgsV1": "nixpkgsV1", "poetry2nix": [ "helix", "nci" @@ -425,11 +323,11 @@ ] }, "locked": { - "lastModified": 1677289985, - "narHash": "sha256-lUp06cTTlWubeBGMZqPl9jODM99LpWMcwxRiscFAUJg=", + "lastModified": 1680258209, + "narHash": "sha256-lEo50RXI/17/a9aCIun8Hz62ZJ5JM5RGeTgclIP+Lgc=", "owner": "nix-community", "repo": "dream2nix", - "rev": "28b973a8d4c30cc1cbb3377ea2023a76bc3fb889", + "rev": "6f512b5a220fdb26bd3c659f7b55e4f052ec8b35", "type": "github" }, "original": { @@ -438,43 +336,38 @@ "type": "github" } }, - "ema": { - "flake": false, - "locked": { - "lastModified": 1661699475, - "narHash": "sha256-2324LDzNNZGItJ4hI8SGUyZ8PZK0xHtRWnAFXlCX8UQ=", - "owner": "srid", - "repo": "ema", - "rev": "be89ffe306a15ab4a16494c8593d989fabcc4486", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "master", - "repo": "ema", - "type": "github" - } - }, - "emanote": { + "drv-parts": { "inputs": { - "ema": "ema", - "flake-parts": "flake-parts", - "haskell-flake": "haskell-flake", - "heist-extra": "heist-extra", - "nixpkgs": "nixpkgs_2", - "tailwind": "tailwind" + "flake-compat": [ + "helix", + "nci", + "dream2nix", + "flake-compat" + ], + "flake-parts": [ + "helix", + "nci", + "dream2nix", + "flake-parts" + ], + "nixpkgs": [ + "helix", + "nci", + "dream2nix", + "nixpkgs" + ] }, "locked": { - "lastModified": 1666637280, - "narHash": "sha256-cgSfsSPyxz2fSeQfOjHDhbn9nQ23wDV2SW31A4VnMVU=", - "owner": "srid", - "repo": "emanote", - "rev": "1d3f9f7572626b52e1fea723cf0a5fb634858d85", + "lastModified": 1680172861, + "narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=", + "owner": "davhau", + "repo": "drv-parts", + "rev": "ced8a52f62b0a94244713df2225c05c85b416110", "type": "github" }, "original": { - "owner": "srid", - "repo": "emanote", + "owner": "davhau", + "repo": "drv-parts", "type": "github" } }, @@ -482,18 +375,16 @@ "inputs": { "nixpkgs": [ "conduit", - "d2n", - "alejandra", "nixpkgs" ], "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1657607339, - "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", + "lastModified": 1680607374, + "narHash": "sha256-U5iiPqbAanr+sQCCZ7zxYhwCXdcDpish8Uy4ELZeXM0=", "owner": "nix-community", "repo": "fenix", - "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", + "rev": "e70d498e97017daa59363eafa054619d4fa160c3", "type": "github" }, "original": { @@ -518,64 +409,45 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs": "nixpkgs" - }, + "flake-compat_2": { + "flake": false, "locked": { - "lastModified": 1661009076, - "narHash": "sha256-phAE40gctVygRq3G3B6LhvD7u2qdQT21xsz8DdRDYFo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "850d8a76026127ef02f040fb0dcfdb8b749dd9d9", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "flake-parts", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, + "flake-compat_3": { + "flake": false, "locked": { - "lastModified": 1668450977, - "narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "flake-parts", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils-pre-commit": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -601,11 +473,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -614,22 +486,6 @@ "type": "github" } }, - "flakeCompat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "ghc-utils": { "flake": false, "locked": { @@ -646,82 +502,19 @@ "url": "https://gitlab.haskell.org/bgamari/ghc-utils" } }, - "ghc-utils_2": { - "flake": false, - "locked": { - "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": { - "type": "git", - "url": "https://gitlab.haskell.org/bgamari/ghc-utils" - } - }, - "gomod2nix": { - "flake": false, - "locked": { - "lastModified": 1627572165, - "narHash": "sha256-MFpwnkvQpauj799b4QTBJQFEddbD02+Ln5k92QyHOSk=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "67f22dd738d092c6ba88e420350ada0ed4992ae8", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, - "haskell-flake": { - "locked": { - "lastModified": 1661726764, - "narHash": "sha256-YzzOoff6m3W4g4B0E8xd3omvOhEVuRu/Rdvnmy2H6Jc=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "3c27b5ba2eafc52f4bed232a8ff74cf0a5a99375", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "haskell-flake", - "type": "github" - } - }, - "heist-extra": { - "flake": false, - "locked": { - "lastModified": 1663962912, - "narHash": "sha256-AxzbGM1/l4Sm6zI5aunMA3cbdlDNHBecROKTaAEawxU=", - "owner": "srid", - "repo": "heist-extra", - "rev": "29c719ded6606da19c21b182cf465b9620cda0b2", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "heist-extra", - "type": "github" - } - }, "helix": { "inputs": { "nci": "nci_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "parts": "parts_3", "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1678976063, - "narHash": "sha256-4qzR+6MaV30aR0R8i1XnaeZwfYUMl0u64WQthFjnd6A=", + "lastModified": 1680751757, + "narHash": "sha256-da6qOFIbmm8PBrW4JVSlXi15azHxw2SgidIx9jMmP8s=", "owner": "helix-editor", "repo": "helix", - "rev": "21a3fb8f29990a847adba369b0c3aaf3b592f456", + "rev": "fc4ca96c2986bc875f1fc6e2cb164dcaf4f4a09c", "type": "github" }, "original": { @@ -738,11 +531,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1678967335, - "narHash": "sha256-oFppZaAVRA0G/aVPvjtWaQI5EQ2dZ5LgbEKfsBmKQgA=", + "lastModified": 1680597706, + "narHash": "sha256-ZqJ3T+BxzjPH9TnmeUwS4Uu9ZQPeBXAFC9sUWlharT4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b832390db376fbbf44115904cfab6680fb42e076", + "rev": "ec06f419af79207b33d797064dfb3fc9dbe1df4a", "type": "github" }, "original": { @@ -752,19 +545,23 @@ "type": "github" } }, - "mach-nix": { - "flake": false, + "html-nix": { + "inputs": { + "nixpkgs": "nixpkgs", + "parts": "parts" + }, "locked": { - "lastModified": 1634711045, - "narHash": "sha256-m5A2Ty88NChLyFhXucECj6+AuiMZPHXNbw+9Kcs7F6Y=", - "owner": "DavHau", - "repo": "mach-nix", - "rev": "4433f74a97b94b596fa6cd9b9c0402104aceef5d", - "type": "github" + "lastModified": 1680758443, + "narHash": "sha256-MDokBU3VJbCHRDkgU2OzyuVlJcsaeIjVo7UTlFIBfHw=", + "ref": "refs/heads/master", + "rev": "3df7d11df595477a496df07086da693714cd7ffc", + "revCount": 70, + "type": "git", + "url": "https://git.gaze.systems/dusk/html.nix.git" }, "original": { - "id": "mach-nix", - "type": "indirect" + "type": "git", + "url": "https://git.gaze.systems/dusk/html.nix.git" } }, "mk-naked-shell": { @@ -822,11 +619,11 @@ ] }, "locked": { - "lastModified": 1677297103, - "narHash": "sha256-ArlJIbp9NGV9yvhZdV0SOUFfRlI/kHeKoCk30NbSiLc=", + "lastModified": 1680329418, + "narHash": "sha256-+KN0eQLSZvL1J0kDO8/fxv0UCHTyZCADLmpIfeeiSGo=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "a79272a2cb0942392bb3a5bf9a3ec6bc568795b2", + "rev": "98c1d2ff5155f0fee5d290f6b982cb990839d540", "type": "github" }, "original": { @@ -844,11 +641,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1678728829, - "narHash": "sha256-KbA8uakGfjfvRH+Td/VegiLdHrnqIZHkMTQ5XBjL2dE=", + "lastModified": 1680544266, + "narHash": "sha256-d/TusDXmIo8IT5DNRA21lN+nOVSER8atIx9TJteR6LQ=", "owner": "oxalica", "repo": "nil", - "rev": "e7045f1779fd202a3316f84b864c304f339cccea", + "rev": "56a1fa87b98a9508920f4b0ab8fe36d5b54b2362", "type": "github" }, "original": { @@ -857,22 +654,6 @@ "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" - } - }, "nixinate": { "inputs": { "nixpkgs": [ @@ -895,11 +676,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1678397099, - "narHash": "sha256-5xq8YJe+h19TlD+EI4AE/3H3jcCcQ2AWU6CWBVc5tRc=", + "lastModified": 1680070330, + "narHash": "sha256-aoT2YZCd9LEtiEULFLIF0ykKydgE72X8gw/k9/pRS5I=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "556101ff85bd6e20900ec73ee525b935154bc8ea", + "rev": "a6aa8174fa61e55bd7e62d35464d3092aefe0421", "type": "github" }, "original": { @@ -925,16 +706,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665848363, - "narHash": "sha256-3Jow1YxzPtQnck1bAAvbVxgRH4gNnkIdw871Vm6UtAU=", + "lastModified": 1680668850, + "narHash": "sha256-mQMg13yRsS0LXVzaeoSPwqgPO6yhkGzGewPgMSqXSv8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83b198a2083774844962c854f811538323f9f7b1", + "rev": "4a65e9f64e53fdca6eed31adba836717a11247d2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -942,11 +723,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1665349835, - "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", + "lastModified": 1680213900, + "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", + "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", "type": "github" }, "original": { @@ -960,29 +741,11 @@ "nixpkgs-lib_2": { "locked": { "dir": "lib", - "lastModified": 1672350804, - "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=", + "lastModified": 1678375444, + "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_3": { - "locked": { - "dir": "lib", - "lastModified": 1675183161, - "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", "type": "github" }, "original": { @@ -996,11 +759,11 @@ "nixpkgs-wayland": { "flake": false, "locked": { - "lastModified": 1678976019, - "narHash": "sha256-ClqWeHZAZGme3vSipaGEQzryVVCWay5HKPj54z+egJ4=", + "lastModified": 1680723078, + "narHash": "sha256-PJdW2c+7CSPebkr5wuNh1GjzYVlM97Aix3pipHBm+JY=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "27c43eede5d7f7f5e90b22df6da81d1a6d295fa5", + "rev": "1053de6c3ad791811087bc798ae2b0948184c24e", "type": "github" }, "original": { @@ -1009,29 +772,28 @@ "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_2": { "locked": { - "lastModified": 1662096612, - "narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=", + "lastModified": 1680213900, + "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "21de2b973f9fee595a7a1ac4693efff791245c34", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1677063315, - "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "988cc958c57ce4350ec248d2d53087777f9e1949", + "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", "type": "github" }, "original": { @@ -1041,13 +803,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1678898370, - "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=", + "lastModified": 1680669251, + "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ac718d02867a84b42522a0ece52d841188208f2c", + "rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e", "type": "github" }, "original": { @@ -1059,11 +821,11 @@ }, "nur": { "locked": { - "lastModified": 1678978081, - "narHash": "sha256-JCJQ1qAjl5L4R/7IhYEE0tr09tSftq1Ylt45AU7iPGg=", + "lastModified": 1680754279, + "narHash": "sha256-Fg87INxT7Z9FSqKUzz+s8Uj4OlbmoLV4jdgyVY4CTuk=", "owner": "nix-community", "repo": "NUR", - "rev": "8888f20e3047320731ad905be02418738b0319c9", + "rev": "67892cbc59ae24528f5a3bb3faa97c478290b76a", "type": "github" }, "original": { @@ -1074,14 +836,14 @@ }, "parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1674771137, - "narHash": "sha256-Zpk1GbEsYrqKmuIZkx+f+8pU0qcCYJoSUwNz1Zk+R00=", + "lastModified": 1680392223, + "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7c7a8bce3dffe71203dcd4276504d1cb49dfe05f", + "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", "type": "github" }, "original": { @@ -1099,11 +861,11 @@ ] }, "locked": { - "lastModified": 1675933616, - "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", + "lastModified": 1679737941, + "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", + "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", "type": "github" }, "original": { @@ -1114,14 +876,14 @@ }, "parts_3": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1675933616, - "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", + "lastModified": 1679737941, + "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", + "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", "type": "github" }, "original": { @@ -1130,50 +892,6 @@ "type": "github" } }, - "poetry2nix": { - "flake": false, - "locked": { - "lastModified": 1666918719, - "narHash": "sha256-BkK42fjAku+2WgCOv2/1NrPa754eQPV7gPBmoKQBWlc=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "289efb187123656a116b915206e66852f038720e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "1.36.0", - "repo": "poetry2nix", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-utils": [ - "conduit", - "d2n", - "flake-utils-pre-commit" - ], - "nixpkgs": [ - "conduit", - "d2n", - "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" - } - }, "root": { "inputs": { "bernbot": "bernbot", @@ -1186,7 +904,7 @@ "nixinate": "nixinate", "nixos-hardware": "nixos-hardware", "nixos-persistence": "nixos-persistence", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", "stylix": "stylix" @@ -1195,11 +913,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1657557289, - "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", + "lastModified": 1680435407, + "narHash": "sha256-IPBtZCOh3BdrR+V77cL7r6WQnclWcZ/85BDYnmq/GnQ=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "caf23f29144b371035b864a1017dbc32573ad56d", + "rev": "236576227a299fd19ba836b1834ab50c948af994", "type": "github" }, "original": { @@ -1227,18 +945,23 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": [ + "conduit", + "crane", + "flake-utils" + ], "nixpkgs": [ "conduit", + "crane", "nixpkgs" ] }, "locked": { - "lastModified": 1674786480, - "narHash": "sha256-n25V3Ug/dJewbJaxj1gL0cUMBdOonrVkIQCHd9yHHvw=", + "lastModified": 1680488274, + "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "296dd673b46aaebe1c8355f1848ceb7c905dda35", + "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8", "type": "github" }, "original": { @@ -1256,11 +979,11 @@ ] }, "locked": { - "lastModified": 1677292251, - "narHash": "sha256-D+6q5Z2MQn3UFJtqsM5/AvVHi3NXKZTIMZt1JGq/spA=", + "lastModified": 1680315536, + "narHash": "sha256-0AsBuKssJMbcRcw4HJQwJsUHhZxR5+gaf6xPQayhR44=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "34cdbf6ad480ce13a6a526f57d8b9e609f3d65dc", + "rev": "5c8c151bdd639074a0051325c16df1a64ee23497", "type": "github" }, "original": { @@ -1281,11 +1004,11 @@ ] }, "locked": { - "lastModified": 1678415622, - "narHash": "sha256-tems1jHETCYEen8QrW61yVVX0F4zOGy4ImB43iDc7bY=", + "lastModified": 1680488274, + "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9f687941160108f89dd8bd2c650d32c15a35c7c7", + "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8", "type": "github" }, "original": { @@ -1297,8 +1020,7 @@ "stylix": { "inputs": { "base16": "base16", - "coricamu": "coricamu", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_3", "home-manager": [ "home" ], @@ -1307,11 +1029,11 @@ ] }, "locked": { - "lastModified": 1679594819, - "narHash": "sha256-DQ36Qh6mTr8qGS1F4SSzsI0VEmaNspEO5BTy723m2Lo=", + "lastModified": 1680432579, + "narHash": "sha256-sIcl3DvrDdQZM5kBWY25ocxJsIQFPV4gm54l79ZysB0=", "owner": "danth", "repo": "stylix", - "rev": "5887b5381626d27f40d0ca4813388ac619913b87", + "rev": "4205a141bfcc0b9d1c04932ec7fdf0f86f99aaf6", "type": "github" }, "original": { @@ -1320,45 +1042,13 @@ "type": "github" } }, - "tailwind": { - "flake": false, - "locked": { - "lastModified": 1665932648, - "narHash": "sha256-YM/6pnBi8MymRHrPheiKrtL9FZPLeeTp/evd3O/0CkI=", - "owner": "srid", - "repo": "tailwind-haskell", - "rev": "7aaaf2282d02846890904f1c23610ddea98d91b6", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "master", - "repo": "tailwind-haskell", - "type": "github" - } - }, "utils": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { - "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { diff --git a/hosts/wolumonde/modules/blog.nix b/hosts/wolumonde/modules/blog.nix index f9b1954..3de46e3 100644 --- a/hosts/wolumonde/modules/blog.nix +++ b/hosts/wolumonde/modules/blog.nix @@ -6,7 +6,7 @@ services.nginx.virtualHosts."gaze.systems" = { enableACME = true; forceSSL = true; - root = "${inputs.blog.packages.${pkgs.system}.blog}"; + root = "${inputs.blog.packages.${pkgs.system}.site}"; locations."/".extraConfig = '' add_header cache-control max-age=1800; ''; diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 91c470a..1be2b55 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -54,6 +54,8 @@ in { }; }; programs = { + # cuz nixos complains + zsh.enable = true; # this is needed for impermanence fuse.userAllowOther = true; adb.enable = true;