diff --git a/flake.lock b/flake.lock index 770a9692..675516d1 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761806975, - "narHash": "sha256-GLGdVJSPH0LnsO64Biw0WFJaj1PlltYxgH13f+FGWgQ=", + "lastModified": 1763733122, + "narHash": "sha256-Bbu6t8mwnkxB7OPX30T/Tuj0Wdyt0zX2Dk1u+m4KdZk=", "owner": "anyrun-org", "repo": "anyrun", - "rev": "329d31af9ba038ef65db9914eb94de695c738377", + "rev": "a247ac381c630eb6a5980920648c114e7474140c", "type": "github" }, "original": { @@ -494,11 +494,11 @@ }, "crane_4": { "locked": { - "lastModified": 1754269165, - "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", + "lastModified": 1762538466, + "narHash": "sha256-8zrIPl6J+wLm9MH5ksHcW7BUHo7jSNOu0/hA0ohOOaM=", "owner": "ipetkov", "repo": "crane", - "rev": "444e81206df3f7d92780680e45858e31d2f07a08", + "rev": "0cea393fffb39575c46b7a0318386467272182fe", "type": "github" }, "original": { @@ -1005,27 +1005,6 @@ "type": "github" } }, - "flake-parts_10": { - "inputs": { - "nixpkgs-lib": [ - "stylix-stable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -1084,27 +1063,6 @@ } }, "flake-parts_5": { - "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754091436, - "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_6": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_3" }, @@ -1122,7 +1080,7 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -1143,7 +1101,7 @@ "type": "github" } }, - "flake-parts_8": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": [ "nur", @@ -1164,7 +1122,7 @@ "type": "github" } }, - "flake-parts_9": { + "flake-parts_8": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -1185,6 +1143,27 @@ "type": "github" } }, + "flake-parts_9": { + "inputs": { + "nixpkgs-lib": [ + "stylix-stable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -1601,11 +1580,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1762983699, - "narHash": "sha256-S8UHWCOKxKb8LHLJDk8X8ktahV8zLw6qC4O3+IdwQts=", + "lastModified": 1763704826, + "narHash": "sha256-Q2ArFuRzdNqR8gK0g2eBfnwwPWmiIIU4TPWa+xNHtqc=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "0f64b9a8e86e10a76fb78a595531b04e9b62995c", + "rev": "5f3645433c0ba5910c7da1f25aaa07efc2c84b64", "type": "github" }, "original": { @@ -1640,7 +1619,7 @@ "inputs": { "nixpkgs": [ "lanzaboote", - "pre-commit-hooks-nix", + "pre-commit", "nixpkgs" ] }, @@ -1751,11 +1730,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1763748372, + "narHash": "sha256-AUc78Qv3sWir0hvbmfXoZ7Jzq9VVL97l+sP9Jgms+JU=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "d10a9b16b2a3ee28433f3d1c603f4e9f1fecb8e1", "type": "github" }, "original": { @@ -1793,11 +1772,11 @@ ] }, "locked": { - "lastModified": 1762351818, - "narHash": "sha256-0ptUDbYwxv1kk/uzEX4+NJjY2e16MaAhtzAOJ6K0TG0=", + "lastModified": 1762964643, + "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", "owner": "nix-community", "repo": "home-manager", - "rev": "b959c67241cae17fc9e4ee7eaf13dfa8512477ea", + "rev": "827f2a23373a774a8805f84ca5344654c31f354b", "type": "github" }, "original": { @@ -1911,11 +1890,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1763071594, - "narHash": "sha256-s5FF0rQE6UIBAUfqk5ZqGedU3bhW0OvXfmz5lzJGurY=", + "lastModified": 1763750925, + "narHash": "sha256-Q5IO8VKW2fFHb6Ix6auy6SEMA6NS6pNeuefBai4+PHY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "43527d363472b52f17dd9f9f4f87ec25cbf8a399", + "rev": "abb2f7ee6fc99c31b6fac05568f29c92b59565df", "type": "github" }, "original": { @@ -2011,11 +1990,11 @@ ] }, "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "lastModified": 1763254292, + "narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b", "type": "github" }, "original": { @@ -2164,11 +2143,11 @@ ] }, "locked": { - "lastModified": 1762387740, - "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=", + "lastModified": 1763323331, + "narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7", + "rev": "0c6411851cc779d551edc89b83966696201611aa", "type": "github" }, "original": { @@ -2260,11 +2239,11 @@ ] }, "locked": { - "lastModified": 1763111338, - "narHash": "sha256-+cvm3TK2J7RNXW3W4dw93NXu+IXe5G0BsDe9Xu70tmU=", + "lastModified": 1763635809, + "narHash": "sha256-nTWzx902duln3sOq6gCbwz2KBYnhQqwFvU5jg2X6lDg=", "owner": "ikawrakow", "repo": "ik_llama.cpp", - "rev": "2642f48921aaa14b075cde91924a4999320716d8", + "rev": "912c98f60bcae76fb5ba6edd187d4fc6d3d4fb08", "type": "github" }, "original": { @@ -2300,11 +2279,11 @@ ] }, "locked": { - "lastModified": 1763031506, - "narHash": "sha256-ru4/nR8DYV81kIHdC1pVLbo9Xe9oRxN+NvKz6Y01BsU=", + "lastModified": 1763744684, + "narHash": "sha256-s0BsfMQCB7wrBGd32imXjI9V3/BmsTV9HrSmbBHcorQ=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "9964103856e84e580d1de735257adc87c4f90a97", + "rev": "caaa97c1162e8ba5ef1f8d5bd4dee9a1b51b969a", "type": "github" }, "original": { @@ -2344,20 +2323,18 @@ "lanzaboote": { "inputs": { "crane": "crane_4", - "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_5", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "pre-commit": "pre-commit", "rust-overlay": "rust-overlay_6" }, "locked": { - "lastModified": 1762205063, - "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", + "lastModified": 1763563389, + "narHash": "sha256-ATuiSBINBTjVXiGOYJAX6ttiDElV9MmjkqG4A8a/J8g=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", + "rev": "b2f781751764ff57d54f7cf1910ae1bbf268ed1c", "type": "github" }, "original": { @@ -2389,7 +2366,7 @@ }, "llama-cpp": { "inputs": { - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_5", "nixpkgs": [ "nixpkgs" ] @@ -2440,11 +2417,11 @@ ] }, "locked": { - "lastModified": 1756852730, - "narHash": "sha256-qPere4RBHoZxiEGl8zXU8gjroZg4gkYGEwaAbKmL4vE=", + "lastModified": 1763506376, + "narHash": "sha256-ujnlIzFgK/Xkn5J9MEhjc9x0Bz18DoeDJ0JDp3oERmo=", "owner": "musnix", "repo": "musnix", - "rev": "7ccc92050e43dc92309396c6f2fe1f542214a242", + "rev": "74e212f6dc0e5330c3cf3caa53df5985b5566936", "type": "github" }, "original": { @@ -2568,11 +2545,11 @@ ] }, "locked": { - "lastModified": 1762627886, - "narHash": "sha256-/QLk1bzmbcqJt9sU43+y/3tHtXhAy0l8Ck0MoO2+evQ=", + "lastModified": 1763505477, + "narHash": "sha256-nJRd4LY2kT3OELfHqdgWjvToNZ4w+zKCMzS2R6z4sXE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "5125a3cd414dc98bbe2c528227aa6b62ee61f733", + "rev": "3bda9f6b14161becbd07b3c56411f1670e19b9b5", "type": "github" }, "original": { @@ -2691,11 +2668,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1762660502, - "narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=", + "lastModified": 1763265660, + "narHash": "sha256-Ad9Rd3ZAidrH01xP73S3CjPiyXo7ywZs3uCESjPwUdc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "15c5451c63f4c612874a43846bfe3fa828b03eee", + "rev": "469ef53571ea80890c9497952787920c79c1ee6e", "type": "github" }, "original": { @@ -2711,11 +2688,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1763085759, - "narHash": "sha256-nuw3iMywcsIpt39KNylc7ZA+GfJTyfIr6MWfbTeOlPw=", + "lastModified": 1763776632, + "narHash": "sha256-mvumw4Djwi6BgMKVKw5cpNt8a80+h/LvPy2AHOtzBzE=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "166af74b5bb283a9b567416aa6ed62bdbef95b32", + "rev": "e6d3b589d9f1f869e68142f44654e59fcb47390c", "type": "github" }, "original": { @@ -2843,11 +2820,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1763130074, - "narHash": "sha256-R99GRLmMYYR8yScYJ+zCrpY8/r1vq0NF7fu1DGS4V0A=", + "lastModified": 1763808687, + "narHash": "sha256-ayfmU9qzspiYMy9p5i0btEte1A7PzeqI3g96wyqNUvc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf7ee62ae1c0e18492bdae52b36deb5d6083a16c", + "rev": "242fe64f9ec6dbb41bb3413a0613f4de6b8dcf8f", "type": "github" }, "original": { @@ -2859,11 +2836,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "lastModified": 1763622513, + "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", "type": "github" }, "original": { @@ -2884,11 +2861,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1763115001, - "narHash": "sha256-oJsZSNnGOFE9kyuGILkHSCRXGThyEsC16nbuu98/H+Y=", + "lastModified": 1763774726, + "narHash": "sha256-eE05tLXZQ3a8sgF6FghxFc5mzhtaxmjX5MSxzxZCueE=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "8b6fa12dba953aa3656bfb64eabbdc000914aa7d", + "rev": "79444abf87659bad68568ab435e4609793377d53", "type": "github" }, "original": { @@ -2915,11 +2892,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -2973,11 +2950,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -3021,11 +2998,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -3053,7 +3030,7 @@ }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_6", "nixpkgs": [ "nixpkgs" ], @@ -3061,11 +3038,11 @@ "systems": "systems_20" }, "locked": { - "lastModified": 1763109970, - "narHash": "sha256-3azi7sNWVxHiUGMPcEwsd3ErYoMEdLRX/JmgoYEe+os=", + "lastModified": 1763804171, + "narHash": "sha256-Xu9FXXDHBD2yJRAbeZIiivZXumjgEoWEeUN+XqYnz/o=", "owner": "nix-community", "repo": "nixvim", - "rev": "6c2ac251d7cfc2416f23257df13c86d84d3eee34", + "rev": "85939e8768af58c57e609febfedb40a20ffc16a3", "type": "github" }, "original": { @@ -3086,11 +3063,11 @@ "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1763007877, - "narHash": "sha256-rXBxrfWXGKtombplLvbNJmn4ntikvGIhxcGpcIYH0Yg=", + "lastModified": 1763670107, + "narHash": "sha256-PW4jnzSIfuo3sY2TL04hvnKgA2b7jYz/SxI43h+Rvl8=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "39e1660cc7085ee24e60255b54449a91bd69ae90", + "rev": "cf3399de53f0de48053a9db8a048613b1d65e272", "type": "github" }, "original": { @@ -3142,15 +3119,15 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_8", + "flake-parts": "flake-parts_7", "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1763128233, - "narHash": "sha256-Ki9VltG0f8RNLiSChnsca9pFQG9NlygzYexnx8FPCcU=", + "lastModified": 1763807492, + "narHash": "sha256-SbyhrUADWSTJ68Ze+7m6sYvUpKX3dvw4KOhuVOnDi3c=", "owner": "nix-community", "repo": "nur", - "rev": "916aec490f2f4273c5c606cf6485a62c3b503c98", + "rev": "878f45c5a9e3b97bf60b3e5284186409d53594fe", "type": "github" }, "original": { @@ -3286,6 +3263,29 @@ "type": "github" } }, + "pre-commit": { + "inputs": { + "flake-compat": "flake-compat_5", + "gitignore": "gitignore_2", + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1763319842, + "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_3", @@ -3296,11 +3296,11 @@ ] }, "locked": { - "lastModified": 1762441963, - "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", + "lastModified": 1763319842, + "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", + "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", "type": "github" }, "original": { @@ -3309,32 +3309,6 @@ "type": "github" } }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "rest-nvim": { "flake": false, "locked": { @@ -3586,11 +3560,11 @@ ] }, "locked": { - "lastModified": 1761791894, - "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", + "lastModified": 1763347184, + "narHash": "sha256-6QH8hpCYJxifvyHEYg+Da0BotUn03BwLIvYo3JAxuqQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "59c45eb69d9222a4362673141e00ff77842cd219", + "rev": "08895cce80433978d5bfd668efa41c5e24578cbd", "type": "github" }, "original": { @@ -3633,11 +3607,11 @@ ] }, "locked": { - "lastModified": 1763087910, - "narHash": "sha256-eB9Z1mWd1U6N61+F8qwDggX0ihM55s4E0CluwNukJRU=", + "lastModified": 1763778964, + "narHash": "sha256-qeOBcixYtZ4yUsBWO6kcjr7ylkrBib4kGDImHNKba9I=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cf4a68749733d45c0420726596367acd708eb2e8", + "rev": "7f3aa46dfa230ec2a4ca9281186a24771650ccd1", "type": "github" }, "original": { @@ -3674,11 +3648,11 @@ ] }, "locked": { - "lastModified": 1763069729, - "narHash": "sha256-A91a+K0Q9wfdPLwL06e/kbHeAWSzPYy2EGdTDsyfb+s=", + "lastModified": 1763607916, + "narHash": "sha256-VefBA1JWRXM929mBAFohFUtQJLUnEwZ2vmYUNkFnSjE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a2bcd1c25c1d29e22756ccae094032ab4ada2268", + "rev": "877bb495a6f8faf0d89fc10bd142c4b7ed2bcc0b", "type": "github" }, "original": { @@ -3694,7 +3668,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_9", + "flake-parts": "flake-parts_8", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" @@ -3708,11 +3682,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1763245881, - "narHash": "sha256-0q+4x1Gx3AMIRV8MIN2/WOJOAVMtfqnkY1m3k0iIDkI=", + "lastModified": 1763767967, + "narHash": "sha256-BMiqCHUxp2zoAjWCpvj5Scf0J+yTiXpkBlFuRo2nFIg=", "owner": "nix-community", "repo": "stylix", - "rev": "29dc3dd858c507bfd1038716197f84f40e41f28d", + "rev": "cd11c057b054609b8463c20e6065de424b30b89d", "type": "github" }, "original": { @@ -3728,7 +3702,7 @@ "base16-helix": "base16-helix_2", "base16-vim": "base16-vim_2", "firefox-gnome-theme": "firefox-gnome-theme_2", - "flake-parts": "flake-parts_10", + "flake-parts": "flake-parts_9", "gnome-shell": "gnome-shell_2", "nixpkgs": [ "nixpkgs-stable" @@ -3742,11 +3716,11 @@ "tinted-zed": "tinted-zed_2" }, "locked": { - "lastModified": 1762295027, - "narHash": "sha256-5z5cGrp9F8g8iyQrM8WkB6pAwP4AaicljKZ15gx+X9Y=", + "lastModified": 1763740035, + "narHash": "sha256-h33/8bTP5ww1oKwrXgK2fuJPsNlWPzdG4jsvUlr6qqM=", "owner": "nix-community", "repo": "stylix", - "rev": "91b9a270523361268ba6a8772152fde31103869f", + "rev": "206e6ee4d11adcc80d8cbe612e14e08641474fc8", "type": "github" }, "original": { @@ -4603,11 +4577,11 @@ ] }, "locked": { - "lastModified": 1763097615, - "narHash": "sha256-qxpsf2FVzXrN0WDWRgeBz7RJ5vjHNFDy8oLqbC6gU3Y=", + "lastModified": 1763780714, + "narHash": "sha256-n2T7r5HkxofkT3mIbb2bNkzacBdhP/bVeph/yGNnBek=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "479ca480bf531285e88006aa1c70fd3bb5529f3d", + "rev": "ef951ed2d976bcd1f57a09f358fdda9fa9425018", "type": "github" }, "original": { diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix index 0dfc220a..db0f67e2 100644 --- a/home/programs/neovim.nix +++ b/home/programs/neovim.nix @@ -1,13 +1,20 @@ -{pkgs, ...}: { +{ + pkgs, + device, + lib, + ... +}: { stylix.targets.nixvim.enable = false; - programs.nixvim = - { - enable = true; - nixpkgs = { - config = { - allowUnfree = true; + programs = lib.optionalAttrs (device.is "ryu" || device.is "kuro" || device.is "mirai") { + nixvim = + { + enable = true; + nixpkgs = { + config = { + allowUnfree = true; + }; }; - }; - } - // (import ./../../neovim {inherit pkgs;}); + } + // (import ./../../neovim {inherit pkgs;}); + }; } diff --git a/home/programs/opencode.nix b/home/programs/opencode.nix index f898008a..618a9345 100644 --- a/home/programs/opencode.nix +++ b/home/programs/opencode.nix @@ -1,4 +1,9 @@ -{...}: { +{ + device, + lib, + ... +}: +lib.optionalAttrs (device.is "ryu") { programs.opencode = { enable = true; }; diff --git a/nixos/default.nix b/nixos/default.nix index 647bc1d4..8e12062a 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -11,6 +11,7 @@ specialArgs = { inherit device inputs; stablePkgs = inputs.nixpkgs-stable.legacyPackages.${device.system}; + masterPkgs = inputs.nixpkgs-master.legacyPackages.${device.system}; lanzaboote = inputs.lanzaboote; cratesNix = inputs.crates-nix.mkLib {pkgs = nixpkgs.legacyPackages.${device.system};}; }; diff --git a/nixos/mirai/services/tailscale.nix b/nixos/mirai/services/tailscale.nix index 0f0fcf31..a4c03225 100644 --- a/nixos/mirai/services/tailscale.nix +++ b/nixos/mirai/services/tailscale.nix @@ -1,8 +1,9 @@ -{...}: { +{masterPkgs, ...}: { services.tailscale = { enable = true; useRoutingFeatures = "server"; extraUpFlags = "--advertise-exit-node"; + package = masterPkgs.tailscale; }; networking.firewall.trustedInterfaces = [ "tailscale0" diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix index 0bee28e7..5f181eab 100644 --- a/nixos/ryu/configuration.nix +++ b/nixos/ryu/configuration.nix @@ -10,7 +10,7 @@ ./programs ./containers ./apps - ./vms + # ./vms ]; security.tpm2 = { diff --git a/nixos/ryu/services/tailscale.nix b/nixos/ryu/services/tailscale.nix index 3ce346d7..86c587fa 100644 --- a/nixos/ryu/services/tailscale.nix +++ b/nixos/ryu/services/tailscale.nix @@ -1,22 +1,8 @@ -{ - pkgs, - lib, - ... -}: { +{masterPkgs, ...}: { services = { tailscale = { enable = true; - # useRoutingFeatures = "both"; - # extraUpFlags = ["--advertise-routes=192.168.0.0/24"]; + package = masterPkgs.tailscale; }; - # networkd-dispatcher = { - # enable = true; - # rules."50-tailscale" = { - # onState = ["routable"]; - # script = '' - # ${lib.getExe pkgs.ethtool} -K en01 rx-udp-gro-forwarding on rg-xgro-list off - # ''; - # }; - # }; }; } diff --git a/nixos/ryu/vms/default.nix b/nixos/ryu/vms/default.nix index aa369bba..bca656ef 100644 --- a/nixos/ryu/vms/default.nix +++ b/nixos/ryu/vms/default.nix @@ -5,9 +5,9 @@ qemu = { runAsRoot = true; swtpm.enable = true; - ovmf = { - enable = true; - }; + # ovmf = { + # enable = true; + # }; }; }; }; diff --git a/nixos/tsuba/default.nix b/nixos/tsuba/default.nix index a5248e30..f451c332 100644 --- a/nixos/tsuba/default.nix +++ b/nixos/tsuba/default.nix @@ -15,6 +15,7 @@ // { inherit device; unstablePkgs = inputs.nixpkgs.legacyPackages.${device.system}; + masterPkgs = inputs.nixpkgs-master.legacyPackages.${device.system}; }; system = device.system; modules = [ diff --git a/nixos/tsuba/services/tailscale.nix b/nixos/tsuba/services/tailscale.nix index 8ea4652c..e63061eb 100644 --- a/nixos/tsuba/services/tailscale.nix +++ b/nixos/tsuba/services/tailscale.nix @@ -1,10 +1,10 @@ -{unstablePkgs, ...}: { +{masterPkgs, ...}: { services = { tailscale = { enable = true; + package = masterPkgs.tailscale; # useRoutingFeatures = "both"; # extraUpFlags = ["--advertise-routes=192.168.0.0/24"]; - package = unstablePkgs.tailscale; }; }; }