diff --git a/flake.lock b/flake.lock index f4c1060..c95182a 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1755819240, - "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -60,28 +60,28 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1765809053, - "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "owner": "tomyun", "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", + "lastModified": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "type": "github" }, "original": { @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1776339486, - "narHash": "sha256-6V6fHUYCwM8SajDQVp9/X3AwLZGltve32mVqbin3awA=", + "lastModified": 1775866625, + "narHash": "sha256-NfzRZ5DZo8Mwb31ocimy3IMhr3kmYGQ3/ImfnEQkQLw=", "owner": "9001", "repo": "copyparty", - "rev": "a997455b5a3d937f53ad40f431534a0e3865e9f7", + "rev": "a5d859d2b18f53ccf236bc6229856f79139d531c", "type": "github" }, "original": { @@ -129,6 +129,21 @@ } }, "crane": { + "locked": { + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "owner": "ipetkov", + "repo": "crane", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { "locked": { "lastModified": 1751562746, "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", @@ -143,7 +158,7 @@ "type": "github" } }, - "crane_2": { + "crane_3": { "locked": { "lastModified": 1766774972, "narHash": "sha256-8qxEFpj4dVmIuPn9j9z6NTbU+hrcGjBOvaxTzre5HmM=", @@ -255,11 +270,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1776484970, - "narHash": "sha256-nx7CgawAdPzBHjve8pFv1K4nmlVpEF2wAe8ApkDcJwU=", + "lastModified": 1775880170, + "narHash": "sha256-63PLZ7lspPAqpV/+d0oNtDHLCWQf1MVFRG2DOeDK+nU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "d02b22b3511f25943c6e938b673626764b74b5b2", + "rev": "28b164d30b5ab6820ef7e17281ae55c539ae9ff5", "type": "gitlab" }, "original": { @@ -272,11 +287,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -301,6 +316,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1688025799, @@ -316,7 +347,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1751685974, @@ -332,7 +363,7 @@ "url": "https://git.lix.systems/lix-project/flake-compat.git" } }, - "flake-compat_4": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1747046372, @@ -369,6 +400,27 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -386,7 +438,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nvf", @@ -395,11 +447,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -408,7 +460,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "omnix", @@ -429,7 +481,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -437,11 +489,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -532,8 +584,8 @@ }, "git-hooks_2": { "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore_2", + "flake-compat": "flake-compat_5", + "gitignore": "gitignore_3", "nixpkgs": [ "scenics", "nixpkgs" @@ -556,7 +608,8 @@ "gitignore": { "inputs": { "nixpkgs": [ - "pre-commit-hooks", + "lanzaboote", + "pre-commit-hooks-nix", "nixpkgs" ] }, @@ -575,6 +628,27 @@ } }, "gitignore_2": { + "inputs": { + "nixpkgs": [ + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_3": { "inputs": { "nixpkgs": [ "scenics", @@ -599,20 +673,18 @@ "gnome-shell": { "flake": false, "locked": { - "host": "gitlab.gnome.org", - "lastModified": 1767737596, - "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "gitlab" + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", + "type": "github" }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", + "ref": "48.1", "repo": "gnome-shell", - "type": "gitlab" + "type": "github" } }, "home-manager": { @@ -643,16 +715,16 @@ ] }, "locked": { - "lastModified": 1775425411, - "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", + "lastModified": 1763992789, + "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", + "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -674,13 +746,39 @@ "type": "github" } }, + "lanzaboote": { + "inputs": { + "crane": "crane", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", + "owner": "nix-community", + "repo": "lanzaboote", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "v0.4.2", + "repo": "lanzaboote", + "type": "github" + } + }, "mnw": { "locked": { - "lastModified": 1770419553, - "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=", + "lastModified": 1768701608, + "narHash": "sha256-kSvWF3Xt2HW9hmV5V7i8PqeWJIBUKmuKoHhOgj3Znzs=", "owner": "Gerg-L", "repo": "mnw", - "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957", + "rev": "20d63a8a1ae400557c770052a46a9840e768926b", "type": "github" }, "original": { @@ -715,7 +813,7 @@ "nish": { "inputs": { "advisory-db": "advisory-db", - "crane": "crane", + "crane": "crane_2", "fenix": "fenix", "flake-parts": [ "flake-parts" @@ -734,11 +832,11 @@ ] }, "locked": { - "lastModified": 1776153266, - "narHash": "sha256-zQIU2Or1H/q3gGY/eqAPFWZScWGIg5QsBvQGArXbuTw=", + "lastModified": 1774860885, + "narHash": "sha256-usZrHHNrLK7wSEROHHgBvYvEvJSX8NuKcnjmtUaZ0tY=", "owner": "callumio", "repo": "nish", - "rev": "512135e90e5c9468ede6702a3f10766b55c7a72e", + "rev": "68b18356174ef3ec23dd98580032119616947f29", "type": "github" }, "original": { @@ -845,16 +943,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776434932, - "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -877,6 +975,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1737469691, @@ -911,11 +1025,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -999,14 +1113,15 @@ "nixpkgs": [ "stylix", "nixpkgs" - ] + ], + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1767886815, - "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=", + "lastModified": 1751320053, + "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", "owner": "nix-community", "repo": "NUR", - "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef", + "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", "type": "github" }, "original": { @@ -1023,11 +1138,11 @@ "nvf": "nvf_2" }, "locked": { - "lastModified": 1776183398, - "narHash": "sha256-LcvDdDvhNspLeO5hzywpo+g8O+hoMPpy/Tqtk9azELM=", + "lastModified": 1769700611, + "narHash": "sha256-IjacVmYweg4pL0TKH58emKENhySY3sVex9RfB19pTuk=", "owner": "callumio", "repo": "nvf", - "rev": "f39b69918059fecf09932fefacef8e3cd33e232d", + "rev": "542e39f94e9a989900c62a87c6e1e9e16a27a540", "type": "github" }, "original": { @@ -1038,19 +1153,19 @@ }, "nvf_2": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_3", + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_4", "mnw": "mnw", "ndg": "ndg", "nixpkgs": "nixpkgs_4", "systems": "systems_2" }, "locked": { - "lastModified": 1775892726, - "narHash": "sha256-1TK1pe33cEHNvGW41TP5xAzrbG1Gp7LfyFL6c3+xf+I=", + "lastModified": 1769673640, + "narHash": "sha256-5UuILObF93YTV+DlLmYP/lCrsX12S6dZBJgbNezrZ+M=", "owner": "notashelf", "repo": "nvf", - "rev": "5ab359ee7dfd3fa09a5c6f863efaf810bb9a9436", + "rev": "39813f03226d0c603a85458d2bdf27e947b593da", "type": "github" }, "original": { @@ -1063,7 +1178,7 @@ "inputs": { "devour-flake": "devour-flake_2", "false": "false", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "git-hooks": "git-hooks", "inspect": "inspect", "nix-systems-aarch64-darwin": "nix-systems-aarch64-darwin", @@ -1096,7 +1211,7 @@ "flake-compat": [ "flake-compat" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "nixpkgs" ] @@ -1115,6 +1230,33 @@ "type": "github" } }, + "pre-commit-hooks-nix": { + "inputs": { + "flake-compat": [ + "lanzaboote", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -1125,6 +1267,7 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "home-manager": "home-manager_2", + "lanzaboote": "lanzaboote", "nish": "nish", "nixinate": "nixinate", "nixpkgs": "nixpkgs", @@ -1136,7 +1279,7 @@ "scenics": "scenics", "stylix": "stylix", "systems": "systems_5", - "treefmt-nix": "treefmt-nix_2", + "treefmt-nix": "treefmt-nix_3", "unstable": "unstable" } }, @@ -1159,12 +1302,12 @@ }, "rust-flake": { "inputs": { - "crane": "crane_2", + "crane": "crane_3", "nixpkgs": [ "omnix", "nixpkgs" ], - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1767025855, @@ -1181,6 +1324,27 @@ } }, "rust-overlay": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "nixpkgs": [ "omnix", @@ -1204,8 +1368,8 @@ }, "sbomnix": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_3", "flake-root": "flake-root", "nix-visualize": "nix-visualize", "nixpkgs": "nixpkgs_3", @@ -1255,7 +1419,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" @@ -1269,16 +1433,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1775935110, - "narHash": "sha256-twTHKUFXjNNsaAvX0KoaIClt+923jXDRbfCd9PC/f0o=", + "lastModified": 1764695877, + "narHash": "sha256-lof6DgmEhRVt++kJPyJYdXBpwuz5clDzb773U8BIwC8=", "owner": "danth", "repo": "stylix", - "rev": "14f248ad1a7668e7858c6d9163608c208b7daf02", + "rev": "3756d1d62dbe7f9497d9fbb3d1a49c4e8676185a", "type": "github" }, "original": { "owner": "danth", - "ref": "release-25.11", + "ref": "release-25.05", "repo": "stylix", "type": "github" } @@ -1394,11 +1558,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767817087, - "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", + "lastModified": 1750770351, + "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "bd99656235aab343e3d597bf196df9bc67429507", + "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", "type": "github" }, "original": { @@ -1410,11 +1574,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1751159871, + "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "type": "github" }, "original": { @@ -1426,11 +1590,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1751158968, + "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", "type": "github" }, "original": { @@ -1462,6 +1626,28 @@ } }, "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -1498,11 +1684,11 @@ }, "unstable": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8fd892f..9ec84a4 100644 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,7 @@ inherit (mods) homeManagerModules nixosModules; # TODO: use ./hosts/ nixosConfigurations = { - artemis = mkLinuxSystem [./hosts/artemis] []; + artemis = mkLinuxSystem [./hosts/artemis inputs.lanzaboote.nixosModules.lanzaboote] []; hermes = mkLinuxSystem [./hosts/hermes inputs.nocodb.nixosModules.nocodb inputs.copyparty.nixosModules.default] [inputs.copyparty.overlays.default]; }; diskoConfigurations = {}; # maybe? @@ -88,7 +88,7 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; scenics.url = "github:callumio/scenics"; @@ -117,12 +117,12 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:danth/stylix/release-25.11"; + url = "github:danth/stylix/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -161,6 +161,11 @@ treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; + lanzaboote = { + url = "github:nix-community/lanzaboote/v0.4.2"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nish = { url = "github:callumio/nish"; inputs = { diff --git a/home/c/default.nix b/home/c/default.nix index 7755114..1ca5bcd 100644 --- a/home/c/default.nix +++ b/home/c/default.nix @@ -24,7 +24,7 @@ adwaita-icon-theme networkmanagerapplet libsecret - bitwarden-desktop + bitwarden #betterbird wl-clipboard discord diff --git a/home/c/programs/direnv/default.nix b/home/c/programs/direnv/default.nix index 479884f..6409914 100644 --- a/home/c/programs/direnv/default.nix +++ b/home/c/programs/direnv/default.nix @@ -1,4 +1,4 @@ -{...}: { +{config, ...}: { programs.direnv = { enable = true; nix-direnv.enable = true; diff --git a/home/c/programs/fish/default.nix b/home/c/programs/fish/default.nix index 69178c3..4268b18 100644 --- a/home/c/programs/fish/default.nix +++ b/home/c/programs/fish/default.nix @@ -13,7 +13,6 @@ in { enable = true; interactiveShellInit = '' - set sponge_purge_only_on_exit true set fish_greeting trap __trap_exit_tmux EXIT ''; @@ -32,6 +31,7 @@ in { }; plugins = with pkgs.fishPlugins; [ + (mkFishPlug z) (mkFishPlug hydro) (mkFishPlug sponge) (mkFishPlug grc) diff --git a/home/c/programs/git/default.nix b/home/c/programs/git/default.nix index 216b91e..8e5f9f5 100644 --- a/home/c/programs/git/default.nix +++ b/home/c/programs/git/default.nix @@ -1,41 +1,39 @@ {...}: { - programs = { - git = { - enable = true; + programs.git = { + enable = true; - userName = "Callum Leslie"; - userEmail = "git@cleslie.uk"; - signing.key = "03B01F427831BCFD!"; - signing.signByDefault = true; + userName = "Callum Leslie"; + userEmail = "git@cleslie.uk"; + signing.key = "03B01F427831BCFD!"; + signing.signByDefault = true; - ignores = [".direnv/"]; + ignores = [".direnv/"]; - includes = [ - { - condition = "gitdir:~/repos/projects.cs.nott.ac.uk/"; - contents = { - user = { - email = "psycl6@nottingham.ac.uk"; - signingKey = "14861F1282EFB5C8!"; - }; - credential = {helper = "store";}; + includes = [ + { + condition = "gitdir:~/repos/projects.cs.nott.ac.uk/"; + contents = { + user = { + email = "psycl6@nottingham.ac.uk"; + signingKey = "14861F1282EFB5C8!"; }; - } - ]; - - extraConfig = { - core = { - longpaths = true; - autocrlf = false; + credential = {helper = "store";}; }; + } + ]; - init = {defaultBranch = "main";}; - - push = {autoSetupRemote = true;}; - ghq = {root = "~/repos";}; + extraConfig = { + core = { + longpaths = true; + autocrlf = false; }; + + init = {defaultBranch = "main";}; + + push = {autoSetupRemote = true;}; + ghq = {root = "~/repos";}; }; + delta.enable = true; - delta.enableGitIntegration = true; }; } diff --git a/home/c/programs/hypr/default.nix b/home/c/programs/hypr/default.nix index ac0c57e..fccc19f 100644 --- a/home/c/programs/hypr/default.nix +++ b/home/c/programs/hypr/default.nix @@ -11,7 +11,7 @@ chat = getProgFor "discord"; media = getProgFor "spotify"; terminal = getProgFor "alacritty"; - runner = getProgFor "rofi"; + runner = getProgFor' "rofi-wayland" "rofi"; rofi-rbw = getProgFor' "rofi-rbw-wayland" "rofi-rbw"; tmux = getProgFor "tmux"; slurp = getProgFor "slurp"; diff --git a/home/c/programs/jj/default.nix b/home/c/programs/jj/default.nix index f0c5e57..3029dea 100644 --- a/home/c/programs/jj/default.nix +++ b/home/c/programs/jj/default.nix @@ -1,4 +1,4 @@ -{...}: { +{lib, ...}: { programs.jujutsu = { enable = true; settings = { diff --git a/home/c/programs/rofi/default.nix b/home/c/programs/rofi/default.nix index f4dffc6..71b92f8 100644 --- a/home/c/programs/rofi/default.nix +++ b/home/c/programs/rofi/default.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { programs.rofi = { enable = true; - package = pkgs.rofi; + package = pkgs.rofi-wayland; #theme = "Arc-Dark"; }; } diff --git a/hosts/artemis/configuration.nix b/hosts/artemis/configuration.nix index aa16d80..faffddd 100644 --- a/hosts/artemis/configuration.nix +++ b/hosts/artemis/configuration.nix @@ -32,7 +32,7 @@ adwaita-icon-theme apple-cursor wget - pinentry-gnome3 + pinentry fzf nil killall diff --git a/hosts/artemis/hardware-configuration.nix b/hosts/artemis/hardware-configuration.nix index 7f3ee67..e23395b 100644 --- a/hosts/artemis/hardware-configuration.nix +++ b/hosts/artemis/hardware-configuration.nix @@ -18,8 +18,11 @@ ]; #kernelPackages = pkgs.linuxPackages_latest; - # loader.systemd-boot.enable = lib.mkForce false; - loader.systemd-boot.enable = true; + loader.systemd-boot.enable = lib.mkForce false; + lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; }; hardware = { bluetooth = { @@ -36,7 +39,7 @@ #intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) intel-ocl libvdpau-va-gl - libva-vdpau-driver + vaapiVdpau intel-compute-runtime vpl-gpu-rt ]; diff --git a/hosts/hermes/copyparty.nix b/hosts/hermes/copyparty.nix index cd2e10b..345f198 100644 --- a/hosts/hermes/copyparty.nix +++ b/hosts/hermes/copyparty.nix @@ -20,7 +20,7 @@ in { }; }; "/paperless" = { - path = "/var/lib/paperless"; + path = "/var/lib/media/library"; access = { rw = ["c"]; }; diff --git a/hosts/hermes/headscale.nix b/hosts/hermes/headscale.nix index ddb4205..0160ead 100644 --- a/hosts/hermes/headscale.nix +++ b/hosts/hermes/headscale.nix @@ -8,10 +8,7 @@ in { port = 8080; settings = { server_url = "https://${domain}"; - dns = { - base_domain = "net.cleslie.uk"; - override_local_dns = false; - }; + dns = {base_domain = "net.cleslie.uk";}; ip_prefixes = "100.64.0.0/10"; }; diff --git a/hosts/hermes/media.nix b/hosts/hermes/media.nix index 177c503..b2745c2 100644 --- a/hosts/hermes/media.nix +++ b/hosts/hermes/media.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: let +{ + pkgs, + config, + ... +}: let mediaDir = "/var/lib/media"; in { users = { @@ -36,7 +40,7 @@ in { extraPackages = with pkgs; [ intel-media-driver intel-vaapi-driver # previously vaapiIntel - libva-vdpau-driver + vaapiVdpau libvdpau-va-gl intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in) unstable.vpl-gpu-rt # QSV on 11th gen or newer diff --git a/hosts/hermes/n8n.nix b/hosts/hermes/n8n.nix index 99cd512..5054b60 100644 --- a/hosts/hermes/n8n.nix +++ b/hosts/hermes/n8n.nix @@ -5,9 +5,9 @@ in { cloudflare-dyndns.domains = [domain]; n8n = { enable = true; - environment = { - PORT = "5678"; - WEBHOOK_URL = "https://" + domain + "/"; + webhookUrl = "https://" + domain + "/"; + settings = { + port = 5678; }; }; caddy.virtualHosts.${domain}.extraConfig = '' diff --git a/modules/tailscale.nix b/modules/tailscale.nix index c495029..cf915c6 100644 --- a/modules/tailscale.nix +++ b/modules/tailscale.nix @@ -1,5 +1,6 @@ { config, + options, lib, ... }: diff --git a/packages/default.nix b/packages/default.nix index 6ab2d74..ad6f316 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -7,7 +7,7 @@ om = inputs'.omnix.packages.default; nvf = inputs'.nvf.packages.default; agenix = inputs'.agenix.packages.default; - vaapiIntel = pkgs.intel-vaapi-driver.override {enableHybridCodec = true;}; + vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;}; devour-flake = pkgs.callPackage inputs.devour-flake {}; nish = inputs'.nish.packages.default; nsbm = inputs'.nsbm.packages.default; diff --git a/secrets/wg-conf.age b/secrets/wg-conf.age index 7a67aab..3ec2d79 100644 Binary files a/secrets/wg-conf.age and b/secrets/wg-conf.age differ