diff --git a/flake.lock b/flake.lock index baa0e2f..b096493 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,17 @@ "agenix": { "inputs": { "darwin": "darwin", + "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1682101079, - "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", + "lastModified": 1690228878, + "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", "owner": "ryantm", "repo": "agenix", - "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", + "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", "type": "github" }, "original": { @@ -21,23 +22,6 @@ "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": { "inputs": { "nixpkgs": [ @@ -64,14 +48,15 @@ "nci": "nci", "nixpkgs": [ "nixpkgs" - ] + ], + "parts": "parts_2" }, "locked": { - "lastModified": 1667003080, - "narHash": "sha256-TO9XNsDBINTvi8p1zvFnKH4G0BjxXqCETOQYqc6eZrA=", + "lastModified": 1690542463, + "narHash": "sha256-qA7+5YUx9Ch2t94+3D+QDpLobjr/N0Ipod/ehX4lgBA=", "owner": "yusdacra", "repo": "bernbot", - "rev": "9acec0c01c821fc38cc7985a31bf28912baf835c", + "rev": "5f56237f819dc962e5b0bf9625c54060205ad01e", "type": "github" }, "original": { @@ -80,28 +65,6 @@ "type": "github" } }, - "blender-bin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "dir": "blender", - "lastModified": 1680119682, - "narHash": "sha256-Rh/TsMmvnMPVwBGxKnCba5NhBxFCj9IZTzzeCj5YM4c=", - "owner": "edolstra", - "repo": "nix-warez", - "rev": "62de96845e25cccd5ae8452252b9f570053b9a9e", - "type": "github" - }, - "original": { - "dir": "blender", - "owner": "edolstra", - "repo": "nix-warez", - "type": "github" - } - }, "blog": { "inputs": { "html-nix": "html-nix", @@ -138,15 +101,16 @@ ] }, "locked": { - "lastModified": 1688999735, - "narHash": "sha256-pJNcfOVM9TBDblSRIviXmuLLm+w/gtjhxWfLYPK0beI=", + "lastModified": 1690438351, + "narHash": "sha256-4JkLV9p3TbtXi0DoBx4Jj5NNoG5X03oiSQhC80BrxqY=", "owner": "famedly", "repo": "conduit", - "rev": "ad06d475debc9657d36414bebb5a28f1ba3efcc7", + "rev": "2a100412faee33df3c3b05c673f23060251340b0", "type": "gitlab" }, "original": { "owner": "famedly", + "ref": "next", "repo": "conduit", "type": "gitlab" } @@ -154,22 +118,23 @@ "crane": { "flake": false, "locked": { - "lastModified": 1661875961, - "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=", + "lastModified": 1681175776, + "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=", "owner": "ipetkov", "repo": "crane", - "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24", + "rev": "445a3d222947632b5593112bb817850e8a9cf737", "type": "github" }, "original": { "owner": "ipetkov", + "ref": "v0.12.1", "repo": "crane", "type": "github" } }, "crane_2": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-utils": [ "conduit", "flake-utils" @@ -181,11 +146,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1686621798, - "narHash": "sha256-FUwWszmSiDzUdTk8f69xwMoYlhdPaLvDaIYOE/y6VXc=", + "lastModified": 1688772518, + "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", "owner": "ipetkov", "repo": "crane", - "rev": "75f7d715f8088f741be9981405f6444e2d49efdd", + "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", "type": "github" }, "original": { @@ -195,13 +160,27 @@ } }, "crane_3": { - "flake": false, + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": [ + "helix", + "flake-utils" + ], + "nixpkgs": [ + "helix", + "nixpkgs" + ], + "rust-overlay": [ + "helix", + "rust-overlay" + ] + }, "locked": { - "lastModified": 1670900067, - "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", + "lastModified": 1688772518, + "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", "owner": "ipetkov", "repo": "crane", - "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", + "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", "type": "github" }, "original": { @@ -212,7 +191,7 @@ }, "crane_4": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_3", "nixpkgs": [ "limbusart", @@ -237,15 +216,16 @@ "crane_5": { "flake": false, "locked": { - "lastModified": 1670900067, - "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", + "lastModified": 1681175776, + "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=", "owner": "ipetkov", "repo": "crane", - "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", + "rev": "445a3d222947632b5593112bb817850e8a9cf737", "type": "github" }, "original": { "owner": "ipetkov", + "ref": "v0.12.1", "repo": "crane", "type": "github" } @@ -272,154 +252,79 @@ "type": "github" } }, - "devshell": { - "flake": false, - "locked": { - "lastModified": 1666548262, - "narHash": "sha256-4DyN4KXqQQsCw0vCXkMThw4b5Q4/q87ZZgRb4st8COc=", - "owner": "numtide", - "repo": "devshell", - "rev": "c8ce8ed81726079c398f5f29c4b68a7d6a3c2fa2", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dream2nix": { "inputs": { - "alejandra": [ + "all-cabal-json": [ "bernbot", - "nci", - "nixpkgs" + "nci" ], - "all-cabal-json": "all-cabal-json", "crane": "crane", "devshell": [ "bernbot", - "nci", - "devshell" - ], - "flake-utils-pre-commit": [ - "bernbot", - "nci", - "nixpkgs" - ], - "ghc-utils": "ghc-utils", - "gomod2nix": [ - "bernbot", - "nci", - "nixpkgs" - ], - "mach-nix": [ - "bernbot", - "nci", - "nixpkgs" - ], - "nixpkgs": [ - "bernbot", - "nci", - "nixpkgs" - ], - "poetry2nix": [ - "bernbot", - "nci", - "nixpkgs" - ], - "pre-commit-hooks": [ - "bernbot", - "nci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1666729255, - "narHash": "sha256-0bN0ndY6zua1IqtEkgy3HtII0bSlFPAcPx6B9PRqCyo=", - "owner": "nix-community", - "repo": "dream2nix", - "rev": "8e230e08fc54a15e6512e7283f02d7d447316c1e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "dream2nix", - "type": "github" - } - }, - "dream2nix_2": { - "inputs": { - "all-cabal-json": [ - "helix", - "nci" - ], - "crane": "crane_3", - "devshell": [ - "helix", "nci" ], "drv-parts": "drv-parts", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": [ - "helix", + "bernbot", "nci", "parts" ], "flake-utils-pre-commit": [ - "helix", + "bernbot", "nci" ], "ghc-utils": [ - "helix", + "bernbot", "nci" ], "gomod2nix": [ - "helix", + "bernbot", "nci" ], "mach-nix": [ - "helix", + "bernbot", "nci" ], "nix-pypi-fetcher": [ - "helix", + "bernbot", "nci" ], "nixpkgs": [ - "helix", + "bernbot", "nci", "nixpkgs" ], "nixpkgsV1": "nixpkgsV1", "poetry2nix": [ - "helix", + "bernbot", "nci" ], "pre-commit-hooks": [ - "helix", + "bernbot", "nci" ], "pruned-racket-catalog": [ - "helix", + "bernbot", "nci" ] }, "locked": { - "lastModified": 1680258209, - "narHash": "sha256-lEo50RXI/17/a9aCIun8Hz62ZJ5JM5RGeTgclIP+Lgc=", + "lastModified": 1688815683, + "narHash": "sha256-mGeQgTcAltpQlr3KUBA1WoGBQadq6OAhuF864ci4+vI=", "owner": "nix-community", "repo": "dream2nix", - "rev": "6f512b5a220fdb26bd3c659f7b55e4f052ec8b35", + "rev": "99373e29568de05287d391a745947154ddbf4e3e", "type": "github" }, "original": { "owner": "nix-community", + "ref": "legacy", "repo": "dream2nix", "type": "github" } }, - "dream2nix_3": { + "dream2nix_2": { "inputs": { "all-cabal-json": [ "musikquad", @@ -431,7 +336,7 @@ "nci" ], "drv-parts": "drv-parts_2", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "flake-parts": [ "musikquad", "nci", @@ -477,15 +382,16 @@ ] }, "locked": { - "lastModified": 1680605243, - "narHash": "sha256-dUrxj653kcLvjNKRI7NoTJoj+Q7G+vOYsl4iuwtnIWo=", + "lastModified": 1688815683, + "narHash": "sha256-mGeQgTcAltpQlr3KUBA1WoGBQadq6OAhuF864ci4+vI=", "owner": "nix-community", "repo": "dream2nix", - "rev": "34a80ab215f1f24068ea9c76f3a7e5bc19478653", + "rev": "99373e29568de05287d391a745947154ddbf4e3e", "type": "github" }, "original": { "owner": "nix-community", + "ref": "legacy", "repo": "dream2nix", "type": "github" } @@ -493,30 +399,30 @@ "drv-parts": { "inputs": { "flake-compat": [ - "helix", + "bernbot", "nci", "dream2nix", "flake-compat" ], "flake-parts": [ - "helix", + "bernbot", "nci", "dream2nix", "flake-parts" ], "nixpkgs": [ - "helix", + "bernbot", "nci", "dream2nix", "nixpkgs" ] }, "locked": { - "lastModified": 1680172861, - "narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=", + "lastModified": 1680698112, + "narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=", "owner": "davhau", "repo": "drv-parts", - "rev": "ced8a52f62b0a94244713df2225c05c85b416110", + "rev": "e8c2ec1157dc1edb002989669a0dbd935f430201", "type": "github" }, "original": { @@ -547,11 +453,11 @@ ] }, "locked": { - "lastModified": 1680172861, - "narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=", + "lastModified": 1680698112, + "narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=", "owner": "davhau", "repo": "drv-parts", - "rev": "ced8a52f62b0a94244713df2225c05c85b416110", + "rev": "e8c2ec1157dc1edb002989669a0dbd935f430201", "type": "github" }, "original": { @@ -569,11 +475,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1687004852, - "narHash": "sha256-wRSUs+v8xtIJaFlWO5NLFQjkq5+eYhxHHXnZKsZ9DpQ=", + "lastModified": 1689488573, + "narHash": "sha256-diVASflKCCryTYv0djvMnP2444mFsIG0ge5pa7ahauQ=", "owner": "nix-community", "repo": "fenix", - "rev": "df0a6e4ec44b4a276acfa5a96d2a83cb2dfdc791", + "rev": "39096fe3f379036ff4a5fa198950b8e79defe939", "type": "github" }, "original": { @@ -678,16 +584,50 @@ "type": "github" } }, + "flake-compat_7": { + "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-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, + "locked": { + "lastModified": 1685662779, + "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -697,12 +637,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -713,7 +656,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1687709756, @@ -731,7 +674,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1689068808, @@ -749,11 +692,11 @@ }, "flake-utils_5": { "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", "type": "github" }, "original": { @@ -763,12 +706,15 @@ } }, "flake-utils_6": { + "inputs": { + "systems": "systems_6" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -777,35 +723,19 @@ "type": "github" } }, - "ghc-utils": { - "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" - } - }, "helix": { "inputs": { - "nci": "nci_2", + "crane": "crane_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2", - "parts": "parts_3", "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1681141923, - "narHash": "sha256-PNHLOW1AQRd6PU2BoiGw8w1LWvCp5842sE4w1hfcAao=", + "lastModified": 1690518626, + "narHash": "sha256-iJd9X7kKPeGAiNYGlhSNU1H4vWRVNvDnpfHZGqfJ5HA=", "owner": "helix-editor", "repo": "helix", - "rev": "686a1e2f311932c2fcfeee6e8384ab8ce959d618", + "rev": "d6856cfeec14305b3405a6aee90c73c80b41e48f", "type": "github" }, "original": { @@ -818,15 +748,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1681127522, - "narHash": "sha256-Eo4dd0AmKshM+A6msQRMwT42QvWGNxa8RjmZ4tY7g9E=", + "lastModified": 1690476848, + "narHash": "sha256-PSmzyuEbMxEn2uwwLYUN2l1psoJXb7jm/kfHD12Sq0k=", "owner": "nix-community", "repo": "home-manager", - "rev": "93f5cb2482dd20e57eb8ca6c819cdad9738f98a0", + "rev": "8d243f7da13d6ee32f722a3f1afeced150b6d4da", "type": "github" }, "original": { @@ -836,10 +765,31 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1682203081, + "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "html-nix": { "inputs": { "nixpkgs": "nixpkgs", - "parts": "parts" + "parts": "parts_3" }, "locked": { "lastModified": 1689376761, @@ -880,11 +830,11 @@ "mk-naked-shell": { "flake": false, "locked": { - "lastModified": 1676572903, - "narHash": "sha256-oQoDHHUTxNVSURfkFcYLuAK+btjs30T4rbEUtCUyKy8=", + "lastModified": 1681286841, + "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", "owner": "yusdacra", "repo": "mk-naked-shell", - "rev": "aeca9f8aa592f5e8f71f407d081cb26fd30c5a57", + "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", "type": "github" }, "original": { @@ -911,18 +861,18 @@ }, "musikquad": { "inputs": { - "nci": "nci_3", + "nci": "nci_2", "nixpkgs": [ "nixpkgs" ], "parts": "parts_5" }, "locked": { - "lastModified": 1683618968, - "narHash": "sha256-OkxkRYNKv0nR37YxrNC/3SW6wGBFMA0MzUWnV4nW5eU=", + "lastModified": 1690542028, + "narHash": "sha256-UiF/Qqrb/KptNvNqaA396CmdlWFqcn1uO15zINJhUC8=", "owner": "yusdacra", "repo": "musikquadrupled", - "rev": "792efb0c9f2e76eb125e654ee1495c071e57e02f", + "rev": "423fc5685ddbdb6cd132d577bdcf57580610397b", "type": "github" }, "original": { @@ -938,14 +888,14 @@ "nixpkgs" ], "parts": "parts_6", - "systems": "systems_4" + "systems": "systems_5" }, "locked": { - "lastModified": 1683646918, - "narHash": "sha256-DKD5gN4mj4mDd81xo6kSmtmnMrX/Ue+nQxuVGC4JbuY=", + "lastModified": 1683653023, + "narHash": "sha256-NTT/YCx+BeZQN5dZkMI+jE9aFk+a0QjWFqO/48YYoF8=", "owner": "yusdacra", "repo": "musikspider", - "rev": "77ed4a6de6970ec1846d04fd1da8c3fd2a31feac", + "rev": "409163319ed07d96477f09cc7dcf53264f4296c6", "type": "github" }, "original": { @@ -971,20 +921,22 @@ }, "nci": { "inputs": { - "devshell": "devshell", "dream2nix": "dream2nix", + "mk-naked-shell": "mk-naked-shell", "nixpkgs": [ "bernbot", "nixpkgs" ], - "rust-overlay": "rust-overlay" + "parts": "parts", + "rust-overlay": "rust-overlay", + "treefmt": "treefmt" }, "locked": { - "lastModified": 1666937647, - "narHash": "sha256-lU2o1KlC6UHfSzya+aQfcw+8PuCQv8Ffoa0D0+CpFNw=", + "lastModified": 1690537257, + "narHash": "sha256-wosBxxp6U2YZ4iFOOknK0Ybv8NGJs/6V4/9o/6TmAfw=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "4af92958747f48d1db02e6c813ef5baf7eec1b42", + "rev": "b46c8aa9e612b9b9dfa1f3e9b27a7756756e877d", "type": "github" }, "original": { @@ -996,48 +948,21 @@ "nci_2": { "inputs": { "dream2nix": "dream2nix_2", - "mk-naked-shell": "mk-naked-shell", - "nixpkgs": [ - "helix", - "nixpkgs" - ], - "parts": "parts_2", - "rust-overlay": [ - "helix", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1680329418, - "narHash": "sha256-+KN0eQLSZvL1J0kDO8/fxv0UCHTyZCADLmpIfeeiSGo=", - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "rev": "98c1d2ff5155f0fee5d290f6b982cb990839d540", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "type": "github" - } - }, - "nci_3": { - "inputs": { - "dream2nix": "dream2nix_3", "mk-naked-shell": "mk-naked-shell_2", "nixpkgs": [ "musikquad", "nixpkgs" ], "parts": "parts_4", - "rust-overlay": "rust-overlay_5" + "rust-overlay": "rust-overlay_5", + "treefmt": "treefmt_2" }, "locked": { - "lastModified": 1681711895, - "narHash": "sha256-/EeP+RRIw68/0C7CaOAElYQ2pXZAQCWnnU/qjO8OKKM=", + "lastModified": 1690537257, + "narHash": "sha256-wosBxxp6U2YZ4iFOOknK0Ybv8NGJs/6V4/9o/6TmAfw=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "cee5dba8ca34ccb0829ae3812d23afbea1fd9d5d", + "rev": "b46c8aa9e612b9b9dfa1f3e9b27a7756756e877d", "type": "github" }, "original": { @@ -1046,25 +971,24 @@ "type": "github" } }, - "nil": { + "nixd": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" - ], - "rust-overlay": "rust-overlay_6" + ] }, "locked": { - "lastModified": 1680544266, - "narHash": "sha256-d/TusDXmIo8IT5DNRA21lN+nOVSER8atIx9TJteR6LQ=", - "owner": "oxalica", - "repo": "nil", - "rev": "56a1fa87b98a9508920f4b0ab8fe36d5b54b2362", + "lastModified": 1690702450, + "narHash": "sha256-XM/3Pn9cbyWf8yDy1M0fpQIUr9qkyLWlXHoQqGYhRzQ=", + "owner": "nix-community", + "repo": "nixd", + "rev": "64d47cae6b5036b6fc79976a5cdef096b21eaf7c", "type": "github" }, "original": { - "owner": "oxalica", - "repo": "nil", + "owner": "nix-community", + "repo": "nixd", "type": "github" } }, @@ -1075,11 +999,11 @@ ] }, "locked": { - "lastModified": 1671116920, - "narHash": "sha256-QmDGsUUmAGn77UTR7eQJmebl8f3IIUCtmbbAdJqKA3s=", + "lastModified": 1688141737, + "narHash": "sha256-qHrNMYWukOKmKVf6wXOGKj1xxUnOGjvTRbt/PLLXuBE=", "owner": "matthewcroughan", "repo": "nixinate", - "rev": "b4d17b8e2a4abc47e93e1a1c466e0286a63640d8", + "rev": "7902ae845e6cc5bd450e510cdf5e009a6e4a44d9", "type": "github" }, "original": { @@ -1090,11 +1014,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1680876084, - "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", + "lastModified": 1690200740, + "narHash": "sha256-aRkEXGmCbAGcvDcdh/HB3YN+EvoPoxmJMOaqRZmf6vM=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", + "rev": "ba9650b14e83b365fb9e731f7d7c803f22d2aecf", "type": "github" }, "original": { @@ -1105,11 +1029,11 @@ }, "nixos-persistence": { "locked": { - "lastModified": 1675359654, - "narHash": "sha256-FPxzuvJkcO49g4zkWLSeuZkln54bLoTtrggZDJBH90I=", + "lastModified": 1684264534, + "narHash": "sha256-K0zr+ry3FwIo3rN2U/VWAkCJSgBslBisvfRIPwMbuCQ=", "owner": "nix-community", "repo": "impermanence", - "rev": "6138eb8e737bffabd4c8fc78ae015d4fd6a7e2fd", + "rev": "89253fb1518063556edd5e54509c30ac3089d5e6", "type": "github" }, "original": { @@ -1155,11 +1079,11 @@ "nixpkgs-lib_2": { "locked": { "dir": "lib", - "lastModified": 1678375444, - "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", + "lastModified": 1680213900, + "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", + "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", "type": "github" }, "original": { @@ -1173,11 +1097,11 @@ "nixpkgs-lib_3": { "locked": { "dir": "lib", - "lastModified": 1680213900, - "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", + "lastModified": 1685564631, + "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", + "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", "type": "github" }, "original": { @@ -1190,11 +1114,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1683296009, - "narHash": "sha256-qc9IVP773bE1mEygZx70OGQQ23loAOwgiED86mRVfMk=", + "lastModified": 1690541724, + "narHash": "sha256-1PLFGtEz2HwhfGu+DNowxLyClcHJCQgRLVGpRE/T2pQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00c0a2333ff02d1f4a7dbf2080648c9d969e0236", + "rev": "0eb4b967daa8b14cd1bfc86e47327b442b5f5044", "type": "github" }, "original": { @@ -1207,11 +1131,11 @@ "nixpkgs-wayland": { "flake": false, "locked": { - "lastModified": 1681139493, - "narHash": "sha256-vNoib7DtiVLeMrn2Pu3YyH0IHesR6z9lT52313BO8iA=", + "lastModified": 1690532329, + "narHash": "sha256-zEFSbgv5120HlG0bZVzr2A9a6oezGbFp9HWWJ9FCdxc=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "38c71d36f86f8410a5d4e191b196ed6ec09504c7", + "rev": "7295c87386c303cf068c623395b30cc45ba7046d", "type": "github" }, "original": { @@ -1222,41 +1146,41 @@ }, "nixpkgsV1": { "locked": { - "lastModified": 1678500271, - "narHash": "sha256-tRBLElf6f02HJGG0ZR7znMNFv/Uf7b2fFInpTHiHaSE=", + "lastModified": 1686501370, + "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5eb98948b66de29f899c7fe27ae112a47964baf8", + "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.11", + "ref": "nixos-unstable", "type": "indirect" } }, "nixpkgsV1_2": { "locked": { - "lastModified": 1678500271, - "narHash": "sha256-tRBLElf6f02HJGG0ZR7znMNFv/Uf7b2fFInpTHiHaSE=", + "lastModified": 1686501370, + "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5eb98948b66de29f899c7fe27ae112a47964baf8", + "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.11", + "ref": "nixos-unstable", "type": "indirect" } }, "nixpkgs_2": { "locked": { - "lastModified": 1680213900, - "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", + "lastModified": 1690272529, + "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", + "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", "type": "github" }, "original": { @@ -1268,11 +1192,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1681036984, - "narHash": "sha256-AbScJXshYzbeUKHh+Y3OICc3iAtr+NqJ3Xb81GW+ptU=", + "lastModified": 1690367991, + "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd531dee22c9a3d4336cc2da39e8dd905e8f3de4", + "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703", "type": "github" }, "original": { @@ -1284,11 +1208,11 @@ }, "nur": { "locked": { - "lastModified": 1681151175, - "narHash": "sha256-3RmW7n3KniHutKLah1MrqzEfSWJZkyN+nTq1U+oZn8U=", + "lastModified": 1690541304, + "narHash": "sha256-EypV1o52D9SdHWyH3Wf6RLdDiDnKIqqXiUROrtN2KyQ=", "owner": "nix-community", "repo": "NUR", - "rev": "2e608fa1d533ac085adb44169ab14c9da5e98893", + "rev": "03f02d6f7b5c284fe6ed12f86debb21429ca124c", "type": "github" }, "original": { @@ -1298,6 +1222,49 @@ } }, "parts": { + "inputs": { + "nixpkgs-lib": [ + "bernbot", + "nci", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688466019, + "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "parts_2": { + "inputs": { + "nixpkgs-lib": [ + "bernbot", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688466019, + "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -1315,46 +1282,6 @@ "type": "github" } }, - "parts_2": { - "inputs": { - "nixpkgs-lib": [ - "helix", - "nci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1679737941, - "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1679737941, - "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "parts_4": { "inputs": { "nixpkgs-lib": [ @@ -1364,11 +1291,11 @@ ] }, "locked": { - "lastModified": 1680392223, - "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "lastModified": 1688466019, + "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", + "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", "type": "github" }, "original": { @@ -1385,11 +1312,11 @@ ] }, "locked": { - "lastModified": 1680392223, - "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "lastModified": 1688466019, + "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", + "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", "type": "github" }, "original": { @@ -1400,7 +1327,7 @@ }, "parts_6": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1680392223, @@ -1420,7 +1347,6 @@ "inputs": { "agenix": "agenix", "bernbot": "bernbot", - "blender-bin": "blender-bin", "blog": "blog", "conduit": "conduit", "helix": "helix", @@ -1428,7 +1354,7 @@ "limbusart": "limbusart", "musikquad": "musikquad", "musikspider": "musikspider", - "nil": "nil", + "nixd": "nixd", "nixinate": "nixinate", "nixos-hardware": "nixos-hardware", "nixos-persistence": "nixos-persistence", @@ -1436,6 +1362,7 @@ "nixpkgs-master": "nixpkgs-master", "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", + "steam-tui": "steam-tui", "stylix": "stylix", "vscode-extensions": "vscode-extensions" } @@ -1443,11 +1370,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1686936697, - "narHash": "sha256-mCoPr1nNWKpsoGMBFaK/sswkLloRCZuoWi2a+OKs3vk=", + "lastModified": 1689441253, + "narHash": "sha256-4MSDZaFI4DOfsLIZYPMBl0snzWhX1/OqR/QHir382CY=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "a5a71c75e62a0eaa1b42a376f7cf3d348cb5dec6", + "rev": "996e054f1eb1dbfc8455ecabff0f6ff22ba7f7c8", "type": "github" }, "original": { @@ -1460,11 +1387,11 @@ "rust-overlay": { "flake": false, "locked": { - "lastModified": 1666925689, - "narHash": "sha256-X2n+i2efiXcniDPDbvMsJVrPd7epu3+6pS/Pwu3OkHg=", + "lastModified": 1690510705, + "narHash": "sha256-6mjs3Gl9/xrseFh9iNcNq1u5yJ/MIoAmjoaG7SXZDIE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4b1fcd5766db910c07c871d1454b1fe296e4547c", + "rev": "851ae4c128905a62834d53ce7704ebc1ba481bea", "type": "github" }, "original": { @@ -1487,11 +1414,11 @@ ] }, "locked": { - "lastModified": 1685759304, - "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=", + "lastModified": 1688351637, + "narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c535b4f3327910c96dcf21851bbdd074d0760290", + "rev": "f9b92316727af9e6c7fee4a761242f7f46880329", "type": "github" }, "original": { @@ -1502,18 +1429,21 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": [ + "helix", + "flake-utils" + ], "nixpkgs": [ "helix", "nixpkgs" ] }, "locked": { - "lastModified": 1680315536, - "narHash": "sha256-0AsBuKssJMbcRcw4HJQwJsUHhZxR5+gaf6xPQayhR44=", + "lastModified": 1690424156, + "narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5c8c151bdd639074a0051325c16df1a64ee23497", + "rev": "f335a0213504c7e6481c359dc1009be9cf34432c", "type": "github" }, "original": { @@ -1552,11 +1482,11 @@ "rust-overlay_5": { "flake": false, "locked": { - "lastModified": 1681697975, - "narHash": "sha256-47DFtN5PX05eD8ObImkSu2W0hyyZ5cK1Tl9EvmW2NnU=", + "lastModified": 1690510705, + "narHash": "sha256-6mjs3Gl9/xrseFh9iNcNq1u5yJ/MIoAmjoaG7SXZDIE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ffe47b90076067ad5dc25fe739d95a463bdf3c59", + "rev": "851ae4c128905a62834d53ce7704ebc1ba481bea", "type": "github" }, "original": { @@ -1565,35 +1495,31 @@ "type": "github" } }, - "rust-overlay_6": { + "steam-tui": { "inputs": { - "flake-utils": [ - "nil", - "flake-utils" - ], + "flake-utils": "flake-utils_5", "nixpkgs": [ - "nil", "nixpkgs" ] }, "locked": { - "lastModified": 1680488274, - "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8", + "lastModified": 1671886820, + "narHash": "sha256-czNId8LBaI8T6ot/1xG/xfS34DMwpAC47WglGNLJF+8=", + "owner": "dmadisetti", + "repo": "steam-tui", + "rev": "236a3b592c23d576730f6c168db33affb7dbff5a", "type": "github" }, "original": { - "owner": "oxalica", - "repo": "rust-overlay", + "owner": "dmadisetti", + "repo": "steam-tui", "type": "github" } }, "stylix": { "inputs": { "base16": "base16", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "home-manager": [ "home" ], @@ -1662,6 +1588,21 @@ } }, "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1680978846, "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", @@ -1676,35 +1617,79 @@ "type": "github" } }, - "utils": { + "systems_6": { "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt": { + "inputs": { + "nixpkgs": [ + "bernbot", + "nci", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1689620039, + "narHash": "sha256-BtNwghr05z7k5YMdq+6nbue+nEalvDepuA7qdQMAKoQ=", "owner": "numtide", - "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "repo": "treefmt-nix", + "rev": "719c2977f958c41fa60a928e2fbc50af14844114", "type": "github" }, "original": { "owner": "numtide", - "repo": "flake-utils", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt_2": { + "inputs": { + "nixpkgs": [ + "musikquad", + "nci", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1689620039, + "narHash": "sha256-BtNwghr05z7k5YMdq+6nbue+nEalvDepuA7qdQMAKoQ=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "719c2977f958c41fa60a928e2fbc50af14844114", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", "type": "github" } }, "vscode-extensions": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_7", "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1681693872, - "narHash": "sha256-gEy7sfcRiJypI0irVBWZ1xxyc+4MZPb5RqcC8krQi9s=", + "lastModified": 1690507807, + "narHash": "sha256-B6SGiKX+7J76zAvUPbKABlYaxhb5sBBjjyHyStVzuXc=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "1c784113bfb7f0f0d82b32832fdf739f083e8d3a", + "rev": "9ca8239be3719292cd3fb566f4fc8dc8299f380d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 153abef..bea9e67 100644 --- a/flake.nix +++ b/flake.nix @@ -26,14 +26,13 @@ bernbot.url = "github:yusdacra/bernbot"; bernbot.inputs.nixpkgs.follows = "nixpkgs"; - blender-bin.url = "github:edolstra/nix-warez?dir=blender"; - blender-bin.inputs.nixpkgs.follows = "nixpkgs"; - - conduit.url = "gitlab:famedly/conduit"; + conduit.url = "gitlab:famedly/conduit/next"; conduit.inputs.nixpkgs.follows = "nixpkgs"; - nil.url = "github:oxalica/nil"; - nil.inputs.nixpkgs.follows = "nixpkgs"; + # nil.url = "github:oxalica/nil"; + # nil.inputs.nixpkgs.follows = "nixpkgs"; + nixd.url = "github:nix-community/nixd"; + nixd.inputs.nixpkgs.follows = "nixpkgs"; stylix.url = "github:yusdacra/stylix/fixed"; stylix.inputs.nixpkgs.follows = "nixpkgs"; @@ -54,6 +53,9 @@ limbusart.url = "git+https://git.gaze.systems/dusk/limbusart.git"; limbusart.inputs.nixpkgs.follows = "nixpkgs"; + steam-tui.url = "github:dmadisetti/steam-tui"; + steam-tui.inputs.nixpkgs.follows = "nixpkgs"; + # needed for hyprland setup # hyprland.url = "github:hyprwm/Hyprland"; # hyprland.inputs.nixpkgs.follows = "nixpkgs"; @@ -82,16 +84,28 @@ miscApps = lib.mapAttrs ( - _: pkgs: { - generate-firefox-addons = { + _: cmds: + lib.mapAttrs + (_: cmd: { type = "app"; - program = + program = cmd; + }) + cmds + ) + ( + lib.mapAttrs + ( + _: pkgs: { + generate-firefox-addons = toString "${pkgs.generate-firefox-addons}/bin/generate-firefox-addons"; - }; - } - ) - allPkgs; + # buildHost = { + # type = "app"; + # }; + } + ) + allPkgs + ); in { lib = tlib; nixosConfigurations = import ./hosts {inherit lib tlib inputs;}; diff --git a/hosts/lungmen/default.nix b/hosts/lungmen/default.nix index a7eec34..e5dfb92 100644 --- a/hosts/lungmen/default.nix +++ b/hosts/lungmen/default.nix @@ -159,11 +159,5 @@ in { xserver.videoDrivers = ["amdgpu"]; }; - virtualisation = { - waydroid.enable = false; - podman.enable = false; - libvirtd.enable = false; - }; - system.stateVersion = "22.05"; } diff --git a/hosts/tkaronto/modules/waydroid.nix b/hosts/tkaronto/modules/waydroid.nix.disabled similarity index 100% rename from hosts/tkaronto/modules/waydroid.nix rename to hosts/tkaronto/modules/waydroid.nix.disabled diff --git a/hosts/wolumonde/modules/bernbot.nix b/hosts/wolumonde/modules/bernbot.nix index 1f9e3c0..dff0da0 100644 --- a/hosts/wolumonde/modules/bernbot.nix +++ b/hosts/wolumonde/modules/bernbot.nix @@ -5,7 +5,7 @@ lib, ... }: let - bernbotPkg = inputs.bernbot.packages.${pkgs.system}.bernbot; + bernbotPkg = inputs.bernbot.packages.${pkgs.system}.bernbot-release; in { systemd.services.bernbot = { description = "bernbot"; diff --git a/modules/ananicy/default.nix b/modules/ananicy/default.nix index 42ec28c..1289b0e 100644 --- a/modules/ananicy/default.nix +++ b/modules/ananicy/default.nix @@ -1,17 +1,12 @@ -{ - pkgs, - lib, - ... -}: let +{lib, ...}: let l = lib // builtins; - mkRule = name: type: - l.toJSON { - inherit name type; - }; + mkRule = name: type: { + inherit name type; + }; in { services.ananicy = { enable = true; - extraRules = l.concatStringsSep "\n" [ + extraRules = [ # coompilers (mkRule "g++" "BG_CPUIO") (mkRule "gcc" "BG_CPUIO") diff --git a/pkgs-set/overlays/chromium.nix b/pkgs-set/overlays/chromium.nix deleted file mode 100644 index bbe4f37..0000000 --- a/pkgs-set/overlays/chromium.nix +++ /dev/null @@ -1,15 +0,0 @@ -_: prev: let - flags = [ - "--ignore-gpu-blocklist" - "--disable-gpu-driver-bug-workarounds" - "--enable-features=WebUIDarkMode" - "--enable-gpu-rasterization" - "--enable-zero-copy" - "--force-dark-mode" - "--enable-webrtc-pipewire-capturer" - "--ozone-platform-hint=auto" - ]; - mkCliArgs = flags: prev.lib.concatStringsSep " " flags; -in { - chromium = prev.chromium.override {commandLineArgs = mkCliArgs flags;}; -} diff --git a/pkgs-set/overlays/steam-tui.nix b/pkgs-set/overlays/steam-tui.nix new file mode 100644 index 0000000..83c51df --- /dev/null +++ b/pkgs-set/overlays/steam-tui.nix @@ -0,0 +1,3 @@ +{inputs}: final: prev: { + steam-tui = inputs.steam-tui.packages.${final.system}.default; +} diff --git a/users/modules/chromium/default.nix b/users/modules/chromium/default.nix index c018a94..d0573c4 100644 --- a/users/modules/chromium/default.nix +++ b/users/modules/chromium/default.nix @@ -7,20 +7,17 @@ enable = true; commandLineArgs = [ "--ozone-platform-hint=auto" - "--enable-features=WaylandWindowDecorations" - "--enable-crashpad" "--flag-switches-begin" - "--enable-gpu-rasterization" - "--enable-unsafe-webgpu" - "--enable-zero-copy" - "--ignore-gpu-blocklist" - "--disable-gpu-driver-bug-workarounds" + "--enable-webrtc-pipewire-capturer" + # "--force-dark-mode" + # "--enable-gpu-rasterization" + # "--enable-zero-copy" + # "--ignore-gpu-blocklist" + # "--disable-gpu-driver-bug-workarounds" "--ozone-platform-hint=wayland" - "--enable-features=SystemNotifications,WaylandWindowDecorations,CanvasOopRasterization,EnableDrDc,RawDraw,WebRTCPipeWireCapturer" - "--disable-features=Vulkan" + "--enable-features=SystemNotifications,WaylandWindowDecorations,WebRTCPipeWireCapturer" "--flag-switches-end" "--disk-cache-dir=\"$XDG_RUNTIME_DIR/chromium-cache\"" - "--process-per-site" ]; extensions = [ "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin diff --git a/users/modules/discord/default.nix b/users/modules/discord/default.nix index 5bceba1..e1597dc 100644 --- a/users/modules/discord/default.nix +++ b/users/modules/discord/default.nix @@ -9,12 +9,12 @@ ".config/discordcanary" ]; xdg.configFile."discordcanary/settings.json".text = builtins.toJSON { - openasar = { - setup = true; - noTyping = true; - quickstart = true; - theme = builtins.readFile inputs.catppuccin-discord; - }; + # openasar = { + # setup = true; + # noTyping = true; + # quickstart = true; + # # theme = builtins.readFile inputs.catppuccin-discord; + # }; SKIP_HOST_UPDATE = true; IS_MAXIMIZED = true; IS_MINIMIZED = false; @@ -38,7 +38,7 @@ pkg = (pkgs.discord-canary.override { nss = pkgs.nss_latest; - withOpenASAR = true; + # withOpenASAR = true; }) .overrideAttrs (old: { preInstall = '' diff --git a/users/modules/helix/default.nix b/users/modules/helix/default.nix index e6f6c47..ef47e18 100644 --- a/users/modules/helix/default.nix +++ b/users/modules/helix/default.nix @@ -6,7 +6,7 @@ stylix.targets.helix.enable = false; programs.helix = { enable = true; - languages = [ + languages.language = [ { name = "dockerfile"; roots = ["Dockerfile" "Containerfile"]; @@ -14,9 +14,12 @@ } { name = "nix"; - language-server = {command = "${inputs.nil.packages.${pkgs.system}.default}/bin/nil";}; + language-servers = ["nixd-lsp"]; } ]; + languages.language-server = { + nixd-lsp = {command = "${inputs.nixd.packages.${pkgs.system}.default}/bin/nixd";}; + }; settings = { theme = "ferra"; editor = { diff --git a/users/modules/ripcord/default.nix b/users/modules/ripcord/default.nix new file mode 100644 index 0000000..be6ec6c --- /dev/null +++ b/users/modules/ripcord/default.nix @@ -0,0 +1,6 @@ +{config, pkgs, ...}: { + home.packages = [pkgs.ripcord]; + home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [ + ".local/share/Ripcord" + ]; +} diff --git a/users/modules/swaylock/default.nix b/users/modules/swaylock/default.nix index 9d47982..e506e36 100644 --- a/users/modules/swaylock/default.nix +++ b/users/modules/swaylock/default.nix @@ -1,12 +1,13 @@ {pkgs, ...}: { - home.packages = [pkgs.swaylock-effects]; - - programs.swaylock.settings = { - screenshot = true; - ignore-empty-password = true; - clock = true; - effect-scale = "0.5"; - effect-greyscale = true; - effect-blur = "20x3"; + programs.swaylock = { + package = pkgs.swaylock-effects; + settings = { + screenshot = true; + ignore-empty-password = true; + clock = true; + effect-scale = "0.5"; + effect-greyscale = true; + effect-blur = "20x3"; + }; }; } diff --git a/users/modules/zsh/default.nix b/users/modules/zsh/default.nix index 817de45..703b00f 100644 --- a/users/modules/zsh/default.nix +++ b/users/modules/zsh/default.nix @@ -24,9 +24,17 @@ in { }; } ]; + # configure history + history = { + extended = true; + ignorePatterns = ["rm *" "mv *" "l" "ls" "ll" "g s" "git status"]; + save = 1000000; + size = 1000000; + }; # xdg compliant dotDir = ".config/zsh"; history.path = "${config.home.homeDirectory}/.local/share/zsh/history"; + # extra stuff for fixing gpg-agent ssh and some random commands initExtra = '' ${ lib.optionalString diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 78a1c82..50591bd 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -108,11 +108,11 @@ in { ["sway" "foot"] # desktop stuff ["wayland"] - ["chromium"] + ["ripcord" "discord" "chromium"] # cli stuff ["zoxide" "zsh" "fzf" "starship" "direnv"] # dev stuff - ["helix" "code" "git" "ssh"] + ["helix" "git" "ssh"] ["musikcube" "musikcubed"] ]; in @@ -182,7 +182,7 @@ in { font-awesome dejavu_fonts # Programs - inputs.blender-bin.packages.x86_64-linux.default + pixelorama krita gnupg imv @@ -198,7 +198,8 @@ in { helvum nix-output-monitor # prismlauncher - godot_4 + steamPackages.steamcmd + steam-tui ]; }; programs = { diff --git a/users/patriot/wallpaper.png b/users/patriot/wallpaper.png index 2d427fb..aab3244 100644 Binary files a/users/patriot/wallpaper.png and b/users/patriot/wallpaper.png differ