From ca0b96d147e6778edd5a15262a0feb6ca1734685 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 16 Apr 2025 12:36:14 -0500 Subject: [PATCH 1/4] chore: lock n load --- flake.lock | 282 +++++++++++++++++++++++++++++------------------------ 1 file changed, 152 insertions(+), 130 deletions(-) diff --git a/flake.lock b/flake.lock index ed5e69f..e6cdb33 100755 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1741282631, - "narHash": "sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho=", + "lastModified": 1743265529, + "narHash": "sha256-QbjP15/2N+VJl0b5jxrrTc+VOt39aU4XrDvtP0Lz5ik=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "81498562d0f53e613d30368bb5b076784fa86f80", + "rev": "1d2dbd72c2bbaceab031c592d4810f744741d203", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740474275, - "narHash": "sha256-E1ztdEjkfFOpm6Hu3ZjKbyJyE+vt78ZFmuLcGOxdEqc=", + "lastModified": 1743168893, + "narHash": "sha256-FuZP30GlJ87Hac8q48OHyctllXRFKEjsCtAPnYJQW1U=", "owner": "nix-community", "repo": "buildbot-nix", - "rev": "e09b4c0588ce95fd72993adb5af198d5ba32e752", + "rev": "474d5e49962363ea69d6388dd308292a13874068", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "crane": { "locked": { - "lastModified": 1741481578, - "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", + "lastModified": 1742394900, + "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=", "owner": "ipetkov", "repo": "crane", - "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", + "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd", "type": "github" }, "original": { @@ -229,11 +229,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -251,11 +251,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -400,14 +400,14 @@ "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "zig": "zig", - "zig2nix": "zig2nix" + "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1741594465, - "narHash": "sha256-8a/QIgNwV8VGn8JIiACmVVEdue+U3juiMSAO1DEUTC4=", + "lastModified": 1744406261, + "narHash": "sha256-Wh7pdOAZk0aQnA9agLjf+NUaXQrwLCFNT9Ai/YtQpAo=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "95daca616db5c24d7bb37fd5a3ac2f8762bb4ead", + "rev": "66636195f18d21bd65f8e7ced461f6b6770be189", "type": "github" }, "original": { @@ -490,11 +490,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741815977, - "narHash": "sha256-zRPJMgKBvLBNVlPEMpkjEYtd2jKbHE6AlqT9bL5m/yQ=", + "lastModified": 1744385517, + "narHash": "sha256-pqiSmtbquoBM3cVHELcXHl8CLT8moXVkwbtc5xd5Br0=", "owner": "helix-editor", "repo": "helix", - "rev": "1bd7a3901cf73a9219470dafc65f3c7119e96cc0", + "rev": "340934db92aea902a61b9f79b9e6f4bd15111044", "type": "github" }, "original": { @@ -517,11 +517,11 @@ ] }, "locked": { - "lastModified": 1738237977, - "narHash": "sha256-oJN/yvRL7G0WlR/hTkQIjFbPkzCV+sFnNB/38Tb9RL4=", + "lastModified": 1742014779, + "narHash": "sha256-I6fG1zrfdLFcp/imGZElig0BJO3YU0QEXLgvwWoOpJ8=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "6d1b6d5d59758b4f5f05745f774fc13cdc59da43", + "rev": "524637ef84c177661690b924bf64a1ce18072a2c", "type": "github" }, "original": { @@ -537,11 +537,11 @@ ] }, "locked": { - "lastModified": 1741791118, - "narHash": "sha256-4Y427uj0eql4yRU5rely3EcOlB9q457UDbG9omPtXiA=", + "lastModified": 1744498625, + "narHash": "sha256-pL52uCt9CUoTTmysGG91c2FeU7XUvpB7Cep6yon2vDk=", "owner": "nix-community", "repo": "home-manager", - "rev": "18780912345970e5b546b1b085385789b6935a83", + "rev": "db56335ca8942d86f2200664acdbd5b9212b26ad", "type": "github" }, "original": { @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1738664950, - "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", + "lastModified": 1742215578, + "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", + "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", "type": "github" }, "original": { @@ -626,11 +626,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1741788549, - "narHash": "sha256-Ot/AuQGw5KJwHjyTMHWmyaduNkcE58bOCmyitZ4VxEQ=", + "lastModified": 1744498983, + "narHash": "sha256-YeyqAoHATHUhAz3OXytN0K/mFxpgTyYzPEnV7fjD5kc=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e86d3a14e46d19d8a47f8ceb6410546715d45f10", + "rev": "303a10d27c7d9147b6c2256c0da4d4941051f66b", "type": "github" }, "original": { @@ -651,11 +651,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "lastModified": 1741934139, + "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", "type": "github" }, "original": { @@ -676,11 +676,11 @@ ] }, "locked": { - "lastModified": 1738422629, - "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", + "lastModified": 1743714874, + "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", + "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", "type": "github" }, "original": { @@ -852,11 +852,11 @@ ] }, "locked": { - "lastModified": 1741123584, - "narHash": "sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ=", + "lastModified": 1743950287, + "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "6b0154b183f9539097f13af9b5da78ca24da6df2", + "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", "type": "github" }, "original": { @@ -944,14 +944,14 @@ "flake": false, "locked": { "lastModified": 1737234286, - "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", - "rev": "2837da71ec1588c1187d2e554719b15904a46c8b", + "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", + "rev": "079528098f5998ba13c88821a2eca1005c1695de", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" } }, "lix-module": { @@ -964,15 +964,15 @@ ] }, "locked": { - "lastModified": 1737237494, - "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", - "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", + "lastModified": 1742943028, + "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", + "rev": "868d97695bab9d21f6070b03957bcace249fbe3c", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz?rev=868d97695bab9d21f6070b03957bcace249fbe3c" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz" } }, "ngipkgs": { @@ -988,11 +988,11 @@ "yants": "yants" }, "locked": { - "lastModified": 1741798076, - "narHash": "sha256-zQh8FysFtZ0QVGNxDkpO50be9N+8lvkUgwpkMua1kK8=", + "lastModified": 1744452851, + "narHash": "sha256-/poAkPhf/hUwowkCiz8DNRuaqMdE2mOaC5MmyZ1fMWg=", "owner": "ngi-nix", "repo": "ngipkgs", - "rev": "ed15bd021f36f9396e4d60664599de187f267b2f", + "rev": "c44e6908cad99f06855ef24b224c2111b4d626ce", "type": "github" }, "original": { @@ -1005,14 +1005,15 @@ "inputs": { "flake-compat": "flake-compat_5", "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_3", + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1741691385, - "narHash": "sha256-Zjs3cBTVm4GLjjLgdi9XS/7nEdjjciKPj2EFOLOrNcE=", + "lastModified": 1744456153, + "narHash": "sha256-xTaAboh9p0Mz0UEgcKe+B1zVKoRFG7RQR+gf7ypMQVA=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "5af413f4e97073783ed2dc11fd134ffc7771414d", + "rev": "a76a451a2c97aa37a7741bdf8244ad91205776b8", "type": "github" }, "original": { @@ -1023,11 +1024,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "lastModified": 1743814133, + "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b", "type": "github" }, "original": { @@ -1039,11 +1040,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738255539, - "narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=", + "lastModified": 1741992157, + "narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5", + "rev": "da4b122f63095ca1199bd4d526f9e26426697689", "type": "github" }, "original": { @@ -1055,11 +1056,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1741048562, - "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", + "lastModified": 1743813633, + "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", + "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6", "type": "github" }, "original": { @@ -1071,11 +1072,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1741600792, - "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", + "lastModified": 1744309437, + "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", + "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", "type": "github" }, "original": { @@ -1087,11 +1088,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1738136902, - "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { @@ -1103,11 +1104,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1744232761, + "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", "type": "github" }, "original": { @@ -1119,11 +1120,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -1158,11 +1159,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1741827850, - "narHash": "sha256-wTZexZxoIi8pvEvYaE0xfDfvq1KQgzk0/BipXumYv8M=", + "lastModified": 1744516183, + "narHash": "sha256-OQI/x3aqwpXWhtxtHS0Uv1ZPy8Bn6ysrcS1PNbjoOqM=", "owner": "nix-community", "repo": "NUR", - "rev": "8a38b29f38afb374c33123fd0d0128cab36a1ea4", + "rev": "b58c82b0cb43d59b9e1307727657356a7f4630d3", "type": "github" }, "original": { @@ -1181,11 +1182,11 @@ ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -1203,11 +1204,11 @@ ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -1226,11 +1227,11 @@ ] }, "locked": { - "lastModified": 1740915799, - "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -1323,6 +1324,27 @@ } }, "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1744425163, + "narHash": "sha256-iFcqIbyY25uhtRrQal5vFTxt0q59vDf++nY8du5hof4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "4bb0b6dfc5bafa8b4e8dbe1170f051c437b2cb79", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { "inputs": { "nixpkgs": [ "yazi", @@ -1343,7 +1365,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_4": { "inputs": { "nixpkgs": [ "zed-editor", @@ -1351,11 +1373,11 @@ ] }, "locked": { - "lastModified": 1741573199, - "narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=", + "lastModified": 1743215516, + "narHash": "sha256-52qbrkG65U1hyrQWltgHTgH4nm0SJL+9TWv2UDCEPNI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a", + "rev": "524463199fdee49338006b049bc376b965a2cfed", "type": "github" }, "original": { @@ -1395,11 +1417,11 @@ ] }, "locked": { - "lastModified": 1741043164, - "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", + "lastModified": 1743910657, + "narHash": "sha256-zr2jmWeWyhCD8WmO2aWov2g0WPPuZfcJDKzMJZYGq3Y=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", + "rev": "523f58a4faff6c67f5f685bed33a7721e984c304", "type": "github" }, "original": { @@ -1415,11 +1437,11 @@ ] }, "locked": { - "lastModified": 1741644481, - "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=", + "lastModified": 1744518500, + "narHash": "sha256-lv52pnfiRGp5+xkZEgWr56DWiRgkMFXpiGba3eJ3krE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e653d71e82575a43fe9d228def8eddb73887b866", + "rev": "7e147a1ae90f0d4a374938cdc3df3cdaecb9d388", "type": "github" }, "original": { @@ -1557,11 +1579,11 @@ ] }, "locked": { - "lastModified": 1738953846, - "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", + "lastModified": 1743081648, + "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", + "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7", "type": "github" }, "original": { @@ -1599,11 +1621,11 @@ ] }, "locked": { - "lastModified": 1740125099, - "narHash": "sha256-VpT3ePqmo75Ni6/02KFGV6ltnpiV70/ovG/p1f2wKkU=", + "lastModified": 1743754816, + "narHash": "sha256-UsDvxfAwR0qXSrCV3UOZLB6r6l08lfdvg9OoFWNVxSM=", "owner": "Alexays", "repo": "Waybar", - "rev": "8490a1d9b9a5c8770dd63e9faca0a5e01acedcae", + "rev": "056295cbc6d6b8efccae51251483c6f92b3b15b2", "type": "github" }, "original": { @@ -1640,11 +1662,11 @@ ] }, "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "lastModified": 1741934139, + "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", "type": "github" }, "original": { @@ -1673,14 +1695,14 @@ "inputs": { "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_4", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1741760227, - "narHash": "sha256-5yZ3FQZFG0DSssr8NRa+JWGOojHLDFG2L+icNVnj+tw=", + "lastModified": 1744451963, + "narHash": "sha256-WCl0rIeud8mC8SLiO1yrxNcZXTI7S40c70nmpD9ca20=", "owner": "sxyazi", "repo": "yazi", - "rev": "abfbd1cd9f0dd428d134f257ec89c25dac842b65", + "rev": "af92b92da81addab089e0f490f79f09a6f63857f", "type": "github" }, "original": { @@ -1696,14 +1718,14 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1741823056, - "narHash": "sha256-/NUosorAbmRSwufdk/cY+8h//43gTNxk2W9cSulJ3pc=", + "lastModified": 1744484575, + "narHash": "sha256-Pi+EsJvJKu1HCIHYyl8l6wL9oVk/e+RFzJdjv+vNb94=", "owner": "zed-industries", "repo": "zed", - "rev": "0081b816fecf59ae7351a14eb7249e600389d508", + "rev": "b864a9b0ae633006a44c02b723fe6fad07e84b93", "type": "github" }, "original": { @@ -1727,11 +1749,11 @@ ] }, "locked": { - "lastModified": 1738239110, - "narHash": "sha256-Y5i9mQ++dyIQr+zEPNy+KIbc5wjPmfllBrag3cHZgcE=", + "lastModified": 1741825901, + "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "1a8fb6f3a04724519436355564b95fce5e272504", + "rev": "0b14285e283f5a747f372fb2931835dd937c4383", "type": "github" }, "original": { @@ -1740,7 +1762,7 @@ "type": "github" } }, - "zig2nix": { + "zon2nix": { "inputs": { "flake-utils": [ "ghostty", @@ -1748,21 +1770,21 @@ ], "nixpkgs": [ "ghostty", - "nixpkgs-stable" + "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1741368279, - "narHash": "sha256-WTaC8HmnIq6O71iK0g9as404BbmS+YyEP5qS85m2JBY=", + "lastModified": 1742104771, + "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=", "owner": "jcollie", - "repo": "zig2nix", - "rev": "672971b5b6911de21446ad4fc76dee677922eda0", + "repo": "zon2nix", + "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", "type": "github" }, "original": { "owner": "jcollie", - "repo": "zig2nix", - "rev": "672971b5b6911de21446ad4fc76dee677922eda0", + "repo": "zon2nix", + "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", "type": "github" } } From 8549ffce2eaa9a03f11f6f245d1dd1d30cc5ee0e Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 18 Apr 2025 01:06:30 -0500 Subject: [PATCH 2/4] feat: added phobos --- flake.nix | 12 ++++++ modules/config/devices/config/phobos.nix | 20 +++++++++ modules/config/devices/default.nix | 1 + modules/home/default.nix | 30 +++++++++++++ .../config/bookmarks/config/academic.nix | 27 +++++++++++- modules/nixos/default.nix | 11 +++++ systems/phobos/config/boot.nix | 43 +++++++++++++++++++ systems/phobos/config/filesystem.nix | 38 ++++++++++++++++ systems/phobos/config/graphics.nix | 24 +++++++++++ systems/phobos/config/hardware.nix | 15 +++++++ systems/phobos/config/networking.nix | 37 ++++++++++++++++ systems/phobos/config/sops.nix | 16 +++++++ systems/phobos/default.nix | 17 ++++++++ 13 files changed, 290 insertions(+), 1 deletion(-) create mode 100644 modules/config/devices/config/phobos.nix create mode 100755 systems/phobos/config/boot.nix create mode 100755 systems/phobos/config/filesystem.nix create mode 100755 systems/phobos/config/graphics.nix create mode 100755 systems/phobos/config/hardware.nix create mode 100755 systems/phobos/config/networking.nix create mode 100755 systems/phobos/config/sops.nix create mode 100755 systems/phobos/default.nix diff --git a/flake.nix b/flake.nix index 20fae74..98ed683 100755 --- a/flake.nix +++ b/flake.nix @@ -110,6 +110,18 @@ inputs.nur.modules.nixos.default inputs.sops-nix.nixosModules.sops ]; + phobos = inputs.self.lib.mkLinuxSystem [ + ./systems/phobos + ./profiles/user0 + config.nixosModules.phobos + config.nixosModules.core + config.nixosModules.mantle + config.nixosModules.crust + inputs.home-manager.nixosModules.home-manager + inputs.lix-module.nixosModules.default + inputs.nur.modules.nixos.default + inputs.sops-nix.nixosModules.sops + ]; charon = inputs.self.lib.mkLinuxSystem [ ./systems/charon ./profiles/user1 diff --git a/modules/config/devices/config/phobos.nix b/modules/config/devices/config/phobos.nix new file mode 100644 index 0000000..95468a3 --- /dev/null +++ b/modules/config/devices/config/phobos.nix @@ -0,0 +1,20 @@ +{ devicesFunctions }: +let + inherit (devicesFunctions) + ownerWriteOthersReadMask + phobosIP + ; +in +{ + label = "Phobos"; + name = "phobos"; + sync = { + address0 = phobosIP; + }; + ip = { + address0 = phobosIP; + }; + boot = { + options = ownerWriteOthersReadMask; + }; +} diff --git a/modules/config/devices/default.nix b/modules/config/devices/default.nix index b1bdf85..78640ad 100755 --- a/modules/config/devices/default.nix +++ b/modules/config/devices/default.nix @@ -41,6 +41,7 @@ let deimosIP = "192.168.50.142"; marsIP = "192.168.50.196"; phoneIP = "192.168.50.243"; + phobosIP = "192.168.50.180"; synologyIP = "192.168.50.209"; venusIP = "192.168.58.104"; brotherIP = "192.168.50.195"; diff --git a/modules/home/default.nix b/modules/home/default.nix index 17dd1dc..d601e8f 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -12,6 +12,7 @@ in venus deimos ceres + phobos ; inherit (config.people) user0 @@ -237,6 +238,35 @@ in ; }; }; + "${phobos.name}-${user0}" = { + imports = builtins.attrValues { + inherit (modules) + cli + floorp + tor + ghostty + zed + feishin + obsidian + libreOffice + okular + imageViewing + mpv + vesktop + element + signal + bitwarden + emote + flameshot + gnomeCalculator + systemMonitor + usbImager + virtManager + theming + espanso + ; + }; + }; "${charon.name}-${user1}" = { imports = builtins.attrValues { inherit (modules) diff --git a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/academic.nix b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/academic.nix index d7ab060..199f62d 100755 --- a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/academic.nix +++ b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/academic.nix @@ -14,6 +14,19 @@ ]; keyword = "Pub"; } + { + name = "Cochrane"; + url = "https://www.cochranelibrary.com/"; + tags = [ + "cochrane" + "collaboration" + "library" + "science" + "research" + "academic" + ]; + keyword = "Coch"; + } { name = "Sci-Hub"; url = "https://sci-hub.ee"; @@ -43,12 +56,24 @@ name = "Zotero Bibliography"; url = "https://zbib.org"; tags = [ - "votero" + "zotero" "bibliography" "bib" "zbib" ]; keyword = "Bib"; } + { + name = "Zotero Library"; + url = "https://www.zotero.org/uprootnutrition/library"; + tags = [ + "zotero" + "library" + "science" + "research" + "academic" + ]; + keyword = "Zot"; + } ]; } diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index bdfe113..2863b29 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -45,6 +45,17 @@ in }; }; + phobos = { + imports = builtins.attrValues { + inherit (modules) + plasma + sddm + xserver + wireGuard + ; + }; + }; + charon = { imports = builtins.attrValues { inherit (modules) diff --git a/systems/phobos/config/boot.nix b/systems/phobos/config/boot.nix new file mode 100755 index 0000000..6f25045 --- /dev/null +++ b/systems/phobos/config/boot.nix @@ -0,0 +1,43 @@ +{ + pkgs, + config, + ... +}: +{ + boot = { + extraModulePackages = [ + config.boot.kernelPackages.v4l2loopback.out + ]; + supportedFilesystems = [ + "ntfs" + ]; + initrd = { + availableKernelModules = [ + "nvme" + "ahci" + "xhci_pci" + "usb_storage" + "usbhid" + "sd_mod" + ]; + kernelModules = [ + ]; + }; + + kernelModules = [ + "kvm-amd" + "vfio-pci" + "v4l2loopback" + ]; + + kernelPackages = pkgs.linuxPackages_latest; + + loader = { + efi = { + canTouchEfiVariables = true; + efiSysMountPoint = "/boot"; + }; + systemd-boot.enable = true; + }; + }; +} diff --git a/systems/phobos/config/filesystem.nix b/systems/phobos/config/filesystem.nix new file mode 100755 index 0000000..084517a --- /dev/null +++ b/systems/phobos/config/filesystem.nix @@ -0,0 +1,38 @@ +{ + flake, + config, + ... +}: +let + inherit (flake.config.people) + user0 + user1 + ; + inherit (flake.config.machines.devices) + phobos + ; +in +{ + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/c9a82c93-1da4-4cd1-a1fa-26483271a2bb"; + fsType = "ext4"; + }; + "/boot" = { + device = "/dev/disk/by-uuid/71CA-765A"; + fsType = "vfat"; + options = phobos.boot.options; + }; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/74007bf1-6e2f-425e-99fa-d35990f4ea37"; } + ]; + + systemd.tmpfiles.rules = [ + "Z ${config.home-manager.users.${user0}.home.homeDirectory} 0755 ${user0} users -" + "Z ${config.home-manager.users.${user1}.home.homeDirectory} 0755 ${user1} users -" + ]; + + services.udisks2.enable = true; +} diff --git a/systems/phobos/config/graphics.nix b/systems/phobos/config/graphics.nix new file mode 100755 index 0000000..b67a5df --- /dev/null +++ b/systems/phobos/config/graphics.nix @@ -0,0 +1,24 @@ +{ pkgs, ... }: +{ + hardware = { + graphics = { + enable = true; + extraPackages = builtins.attrValues { + inherit (pkgs) + amdvlk + ; + inherit (pkgs.rocmPackages.clr) + icd + ; + }; + extraPackages32 = builtins.attrValues { + inherit (pkgs.driversi686Linux) + amdvlk + ; + }; + }; + }; + boot.initrd.kernelModules = [ + "amdgpu" + ]; +} diff --git a/systems/phobos/config/hardware.nix b/systems/phobos/config/hardware.nix new file mode 100755 index 0000000..60e08be --- /dev/null +++ b/systems/phobos/config/hardware.nix @@ -0,0 +1,15 @@ +{ + config, + lib, + pkgs, + ... +}: +{ + hardware = { + firmware = [ + pkgs.rtl8761b-firmware + ]; + enableAllFirmware = true; + cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + }; +} diff --git a/systems/phobos/config/networking.nix b/systems/phobos/config/networking.nix new file mode 100755 index 0000000..a7b9f23 --- /dev/null +++ b/systems/phobos/config/networking.nix @@ -0,0 +1,37 @@ +{ + lib, + flake, + ... +}: +let + inherit (flake.config.machines.devices) + phobos + ; +in +{ + networking = { + hostName = phobos.name; + networkmanager.enable = true; + nftables.enable = true; + useDHCP = lib.mkDefault true; + firewall = { + enable = true; + allowedTCPPorts = [ + 22 # SSH + 55771 + ]; + }; + }; + services = { + avahi = { + enable = true; + openFirewall = true; + nssmdns4 = true; + }; + sshd.enable = true; + openssh = { + enable = true; + settings.PasswordAuthentication = false; + }; + }; +} diff --git a/systems/phobos/config/sops.nix b/systems/phobos/config/sops.nix new file mode 100755 index 0000000..90298ee --- /dev/null +++ b/systems/phobos/config/sops.nix @@ -0,0 +1,16 @@ +{ + sops = { + secrets = { + "network/synology" = { + path = "/var/lib/secrets/synology"; + owner = "root"; + mode = "600"; + }; + "network/server" = { + path = "/var/lib/secrets/server"; + owner = "root"; + mode = "600"; + }; + }; + }; +} diff --git a/systems/phobos/default.nix b/systems/phobos/default.nix new file mode 100755 index 0000000..a3744f2 --- /dev/null +++ b/systems/phobos/default.nix @@ -0,0 +1,17 @@ +{ lib, ... }: +let + configPath = ./config; + + deimosImports = + let + files = builtins.attrNames (builtins.readDir configPath); + in + map (name: configPath + "/${name}") ( + builtins.filter (name: builtins.match ".*\\.nix$" name != null) files + ); +in +{ + imports = deimosImports; + nixpkgs.hostPlatform = lib.mkForce "x86_64-linux"; + system.stateVersion = lib.mkForce "24.05"; +} From 2103cccccf1ac6a16f198fd2e6e08461d6ed54d5 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 21 Apr 2025 13:44:32 -0500 Subject: [PATCH 3/4] feat: added phobos --- modules/config/devices/config/phobos.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 modules/config/devices/config/phobos.nix diff --git a/modules/config/devices/config/phobos.nix b/modules/config/devices/config/phobos.nix old mode 100644 new mode 100755 From 5c92664d5de30dc5e4f25afda9bc0a3dffceb8ff Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 21 Apr 2025 13:44:49 -0500 Subject: [PATCH 4/4] feat: removed commitizen --- templates/haskell/parts/config/pre-commit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/haskell/parts/config/pre-commit.nix b/templates/haskell/parts/config/pre-commit.nix index a41ffa6..25aa01f 100755 --- a/templates/haskell/parts/config/pre-commit.nix +++ b/templates/haskell/parts/config/pre-commit.nix @@ -1,7 +1,7 @@ { pre-commit.settings.hooks = { - nixfmt.enable = true; - commitizen.enable = true; + nixfmt-rfc-style.enable = true; + # commitizen.enable = true; statix.enable = true; }; }