diff --git a/flake.lock b/flake.lock index 220bb5e..c0da304 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1775558810, - "narHash": "sha256-fy95EdPnqQlpbP8+rk0yWKclWShCUS5VKs6P7/1MF2c=", + "lastModified": 1776702787, + "narHash": "sha256-qc5uwEWbuubzYthmZcfCapooZGXhoYZWfTQ24TozbCQ=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7371b669b22aa2af980f913fc312a786d2f1abb2", + "rev": "9a1ca6b8cb4d86a599787a55b78f2ddf809bf945", "type": "github" }, "original": { @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1771437256, - "narHash": "sha256-bLqwib+rtyBRRVBWhMuBXPCL/OThfokA+j6+uH7jDGU=", + "lastModified": 1776249299, + "narHash": "sha256-Dt9t1TGRmJFc0xVYhttNBD6QsAgHOHCArqGa0AyjrJY=", "owner": "numtide", "repo": "blueprint", - "rev": "06ee7190dc2620ea98af9eb225aa9627b68b0e33", + "rev": "56131e8628f173d24a27f6d27c0215eff57e40dd", "type": "github" }, "original": { @@ -175,11 +175,11 @@ }, "crane": { "locked": { - "lastModified": 1773189535, - "narHash": "sha256-E1G/Or6MWeP+L6mpQ0iTFLpzSzlpGrITfU2220Gq47g=", + "lastModified": 1776635034, + "narHash": "sha256-OEOJrT3ZfwbChzODfIH4GzlNTtOFuZFWPtW7jIeR8xU=", "owner": "ipetkov", "repo": "crane", - "rev": "6fa2fb4cf4a89ba49fc9dd5a3eb6cde99d388269", + "rev": "dc7496d8ea6e526b1254b55d09b966e94673750f", "type": "github" }, "original": { @@ -211,17 +211,18 @@ }, "dms": { "inputs": { + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ], "quickshell": "quickshell" }, "locked": { - "lastModified": 1776044801, - "narHash": "sha256-gvN9hOPTF/J0b35hbKv+Ioy4JI5j8n3+GVzurIgK+Tc=", + "lastModified": 1776950906, + "narHash": "sha256-jiPj3d62hEgIaZSA4jW+12DGs0Up/SKBZt0sEb7uVCY=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "3d75a51378fe08ee3299d46dea187ace37f99ca3", + "rev": "f4c11bc2ffc1c6fd8ac3307d6054b88f3e1156d9", "type": "github" }, "original": { @@ -247,22 +248,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1767039857, @@ -278,6 +263,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_3": { "flake": false, "locked": { @@ -295,6 +296,22 @@ } }, "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1746162366, @@ -417,7 +434,7 @@ }, "ghostty": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "home-manager": [ "home-manager" ], @@ -429,11 +446,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1775856388, - "narHash": "sha256-p1ofK6KKlNEFH3OFmNqHq6eh5tnri4l3QZS45R69X+0=", + "lastModified": 1777006226, + "narHash": "sha256-mZjoK+Sr8vbAqYsFCgPESN5R+FVLaFENWoWMe3UTOeg=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "7421b4b13f87e101d4bbcedd4da84886ceae4e7b", + "rev": "b0d359cbbd945f9f3807327526ef79fcaf0477df", "type": "github" }, "original": { @@ -532,11 +549,11 @@ ] }, "locked": { - "lastModified": 1775894317, - "narHash": "sha256-pMO5JwJ/0n+q3sIivB2YUPFgbzoL+UbAhFlL9fDTMjo=", + "lastModified": 1777004352, + "narHash": "sha256-SV+9PgNwZ8jHVCjK6YaCBzaheLSW7cDnm5DpOYrD8Vw=", "owner": "nix-community", "repo": "home-manager", - "rev": "f7f6a559c21dfe5e63108ded0d036ae15e6e9d57", + "rev": "6012cf1fed3eba66115f3fd117b9be6bd2a15b2f", "type": "github" }, "original": { @@ -561,11 +578,11 @@ ] }, "locked": { - "lastModified": 1772461003, - "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=", + "lastModified": 1776511930, + "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7", + "rev": "39435900785d0c560c6ae8777d29f28617d031ef", "type": "github" }, "original": { @@ -590,11 +607,11 @@ ] }, "locked": { - "lastModified": 1775496928, - "narHash": "sha256-Ds759WU03mGWtu3I43J+5GF5Ni8TvF+GYQUFD+fVeMo=", + "lastModified": 1776426399, + "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "cf95d93d17baa18f1d9b016b3afe27f820521a6e", + "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84", "type": "github" }, "original": { @@ -624,11 +641,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1775828308, - "narHash": "sha256-XsijqtwDQd8pf/PweiGGuX7O1250f3YOchQ+oGm0eCc=", + "lastModified": 1776947531, + "narHash": "sha256-DBE9ECXz4ItAyIZ0NCfccpjFjpLALvDbkLd62xDZPQI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f7755322fc515108cc9eed8113c09492d4a352c1", + "rev": "b65714e3b8e123fb2febd507905d25fa6abd0400", "type": "github" }, "original": { @@ -670,11 +687,11 @@ ] }, "locked": { - "lastModified": 1774710575, - "narHash": "sha256-p7Rcw13+gA4Z9EI3oGYe3neQ3FqyOOfZCleBTfhJ95Q=", + "lastModified": 1776426575, + "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "0703df899520001209646246bef63358c9881e36", + "rev": "a968d211048e3ed538e47b84cb3649299578f19d", "type": "github" }, "original": { @@ -724,11 +741,11 @@ ] }, "locked": { - "lastModified": 1772459629, - "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", + "lastModified": 1776426736, + "narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", + "rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9", "type": "github" }, "original": { @@ -764,11 +781,11 @@ ] }, "locked": { - "lastModified": 1772475995, - "narHash": "sha256-I31T8qA7ixC0QUUQnU6LaadqJ7Rx+WQ2nsMvZ7OfX+U=", + "lastModified": 1776428662, + "narHash": "sha256-n983I/fo3HO08cKkUc0H9W7hvPsl5ZZRBEUEt+oPsjU=", "owner": "hyprwm", "repo": "hyprsunset", - "rev": "0f4e35a103b2f7408932bbc928823de6fee97b57", + "rev": "eae013234fe812e906436e24d1b226cf34e35ea6", "type": "github" }, "original": { @@ -841,11 +858,11 @@ ] }, "locked": { - "lastModified": 1774911391, - "narHash": "sha256-c4YVwO33Mmw+FIV8E0u3atJZagHvGTJ9Jai6RtiB8rE=", + "lastModified": 1776428866, + "narHash": "sha256-XfRlBolGtjvalTHJp3XvvpYLBjkMhaZLLU0WqZ91Fcg=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e6caa3d4d1427eedbdf556cf4ceb70f2d9c0b56d", + "rev": "eedd60805cd96d4442586f2ba5fe51d549b12674", "type": "github" }, "original": { @@ -866,11 +883,11 @@ ] }, "locked": { - "lastModified": 1772459835, - "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", + "lastModified": 1776430932, + "narHash": "sha256-Yv3RPiUvl7CAsJgwIVsqcj7akn1gLyJP1F/mocof5hA=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", + "rev": "4c2fcc06dc9722c97dbb54ba649c69b18ce83d2e", "type": "github" }, "original": { @@ -895,11 +912,11 @@ ] }, "locked": { - "lastModified": 1775414057, - "narHash": "sha256-mDpHnf+MkdOxEqIM1TnckYYh9p1SXR8B3KQfNZ12M8s=", + "lastModified": 1776728575, + "narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "86012ee01b0fdd8bf3101ef38816f2efbee42490", + "rev": "f3a80888783702a39691b684d099e16b83ed4702", "type": "github" }, "original": { @@ -998,11 +1015,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1775866084, - "narHash": "sha256-mWn8D/oXXAaqeFFFRorKHvTLw5V9M8eYzAWRr4iffag=", + "lastModified": 1776797459, + "narHash": "sha256-utv296Xwk0PwjONe9dsyKx+9Z5xAB70aAsMI//aakpg=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "29d2cca7fc3841708c1d48e2d1272f79db1538b6", + "rev": "4eda91dd5abd2157a2c7bfb33142fc64da668b0a", "type": "github" }, "original": { @@ -1035,11 +1052,11 @@ "mysecrets": { "flake": false, "locked": { - "lastModified": 1769351269, - "narHash": "sha256-Ne3hnPbWCwIfEe18fg6qPVV/NVAbL7SH/yUF/HPvVq4=", + "lastModified": 1776598405, + "narHash": "sha256-BAzzpdNP3lev6oLfQs1vzOuQRnPWXcvUGBHso1R6HI0=", "ref": "refs/heads/main", - "rev": "07201cd94add8cdf0fd1f5180f333fcd3c87aa61", - "revCount": 28, + "rev": "80b5b14a6d6ab2e7030296f3bc1ac02ad882a921", + "revCount": 30, "type": "git", "url": "ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets" }, @@ -1062,11 +1079,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1775877135, - "narHash": "sha256-nAqtUMy22olwyiOJB0CASVrbu5XB5+43GjlbIJ1KuvQ=", + "lastModified": 1777018640, + "narHash": "sha256-jUGMya3cKXG+DoAqtRsnHnLpwNx/mFRy5IvCfc2IMU0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f943da038fd668d435c2d17916577f295faa8839", + "rev": "95f30b5df47a82779178bb96172bc63ad00dd8ed", "type": "github" }, "original": { @@ -1095,11 +1112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1775561155, - "narHash": "sha256-TK2IrqQivRcwqJa0suZMbcsN17CtA8Uu0v7CDnLATb0=", + "lastModified": 1777013567, + "narHash": "sha256-EifUuSU7UeQ8v59aCGg8wCBOVqt2NCYy6M686iaWd5c=", "owner": "YaLTeR", "repo": "niri", - "rev": "599db847f857b8a7ff78ce02f15acab5d5d9fee1", + "rev": "8d583fe854647951ff83a370c87c823589276e5f", "type": "github" }, "original": { @@ -1140,11 +1157,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1774788895, - "narHash": "sha256-wyIX/5EK9QG7o5oAXZhRghOIKKDHYGda7H97IxKvZfk=", + "lastModified": 1776504286, + "narHash": "sha256-VqiLhvlhDbLd2gqw6NgPlvcNK7q/idIcX7/Dt+Juat0=", "owner": "Naxdy", "repo": "nix-bwrapper", - "rev": "024f91da43f3917e4b26542af75f2a641297ceb1", + "rev": "f80ba353fcc9012d1c601353bf549be92f29861c", "type": "github" }, "original": { @@ -1155,11 +1172,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1768656715, - "narHash": "sha256-Sbh037scxKFm7xL0ahgSCw+X2/5ZKeOwI2clqrYr9j4=", + "lastModified": 1776625032, + "narHash": "sha256-edvwHiFhgOiwywt6/Iwe+sSn6ybhU3WZGnIoiGcKjfQ=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "123fe29340a5b8671367055b75a6e7c320d6f89a", + "rev": "479e19f1decb390aa5b75cae13ddf87d763c74cc", "type": "github" }, "original": { @@ -1198,11 +1215,11 @@ ] }, "locked": { - "lastModified": 1775365369, - "narHash": "sha256-DgH5mveLoau20CuTnaU5RXZWgFQWn56onQ4Du2CqYoI=", + "lastModified": 1776829403, + "narHash": "sha256-oHVcvP2Ahhj1KUsEzp+2BQF55/r5VSa3QxdPdwE1p00=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "cef5cf82671e749ac87d69aadecbb75967e6f6c3", + "rev": "c43246d4e9e506178b69baed075d797ec2d873e2", "type": "github" }, "original": { @@ -1213,7 +1230,7 @@ }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "nixpkgs": [ "nixpkgs" ], @@ -1238,27 +1255,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774374907, - "narHash": "sha256-2pgXW+J51x6tsqJC64znkPsPR7Hn5DAXGoSsjH6hD5o=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce031847d1052b833760206f59d6f9e93b24d3a4", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "ce031847d1052b833760206f59d6f9e93b24d3a4", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1775811116, - "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=", + "lastModified": 1776734388, + "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e", + "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac", "type": "github" }, "original": { @@ -1341,7 +1358,7 @@ }, "pre-commit": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "gitignore": "gitignore_2", "nixpkgs": [ "lanzaboote", @@ -1349,11 +1366,11 @@ ] }, "locked": { - "lastModified": 1772893680, - "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", + "lastModified": 1775585728, + "narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", + "rev": "580633fa3fe5fc0379905986543fd7495481913d", "type": "github" }, "original": { @@ -1364,7 +1381,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "gitignore": "gitignore", "nixpkgs": [ "hyprland", @@ -1372,11 +1389,11 @@ ] }, "locked": { - "lastModified": 1775036584, - "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=", + "lastModified": 1776796298, + "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735", + "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", "type": "github" }, "original": { @@ -1463,11 +1480,11 @@ ] }, "locked": { - "lastModified": 1773544328, - "narHash": "sha256-Iv+qez54LAz+isij4APBk31VWA//Go81hwFOXr5iWTw=", + "lastModified": 1776741231, + "narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4f977d776793c8bfbfdd7eca7835847ccc48874e", + "rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b", "type": "github" }, "original": { @@ -1504,11 +1521,11 @@ ] }, "locked": { - "lastModified": 1775682595, - "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=", + "lastModified": 1776771786, + "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=", "owner": "mic92", "repo": "sops-nix", - "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76", + "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598", "type": "github" }, "original": { @@ -1539,11 +1556,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1775429060, - "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=", + "lastModified": 1776893932, + "narHash": "sha256-AFD5cf9eNqXq1brHS63xeZy2xKZMgG9J86XJ9I2eLn8=", "owner": "danth", "repo": "stylix", - "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019", + "rev": "84971726c7ef0bb3669a5443e151cc226e65c518", "type": "github" }, "original": { @@ -1791,11 +1808,11 @@ ] }, "locked": { - "lastModified": 1775844886, - "narHash": "sha256-o9jx6JIzonYliAkAzY8Zpqje3Ve9lyB+N4JujfKVLPc=", + "lastModified": 1776954236, + "narHash": "sha256-phxwfQQxNcmsOy/stSh+3KNDrClzsy1kz3pmoGB+5cY=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "8dea928bfea1da8c05527a3f55fe2e159ebf1c9e", + "rev": "5969d68c024e5d37fca35a5e0f415243b1423d4c", "type": "github" }, "original": { @@ -1832,11 +1849,11 @@ ] }, "locked": { - "lastModified": 1773601989, - "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=", + "lastModified": 1776608502, + "narHash": "sha256-UH8YoQxx4hFOm6qjMdjRQNRvSejFIR/wBZ8fW1p9sME=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d", + "rev": "4a293523d36dfa367e67ec304cc718ea66a8fec2", "type": "github" }, "original": { @@ -1915,11 +1932,11 @@ ] }, "locked": { - "lastModified": 1773145353, - "narHash": "sha256-dE8zx8WA54TRmFFQBvA48x/sXGDTP7YaDmY6nNKMAYw=", + "lastModified": 1776789209, + "narHash": "sha256-G6B7Q4TXn7MZ1mB+f9rymjsYF5PLWoSvmbxijb/99bw=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "8666155d83bf792956a7c40915508e6d4b2b8716", + "rev": "14fe971844e841297ddd2ce9783d6892b467af39", "type": "github" }, "original": { @@ -1949,6 +1966,28 @@ "type": "github" } }, + "zig_2": { + "inputs": { + "nixpkgs": [ + "ghostty", + "zon2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1776888758, + "narHash": "sha256-OlQexlc8pMXAPhGrT89MtDcPCJv8MsFJcxFPMibRBho=", + "ref": "refs/heads/main", + "rev": "a380ec6969faf5fae32f08b96f8529a3bca55d42", + "revCount": 1672, + "type": "git", + "url": "https://codeberg.org/jcollie/zig-overlay.git" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/jcollie/zig-overlay.git" + } + }, "zmx": { "inputs": { "zig2nix": "zig2nix" @@ -1972,20 +2011,21 @@ "nixpkgs": [ "ghostty", "nixpkgs" - ] + ], + "zig": "zig_2" }, "locked": { - "lastModified": 1768231828, - "narHash": "sha256-wL/8Iij4T2OLkhHcc4NieOjf7YeJffaUYbCiCqKv/+0=", + "lastModified": 1776999674, + "narHash": "sha256-dEuWd2li80+H7f0k7RA25/Od49G91Pn3El3TcbEpONw=", "owner": "jcollie", "repo": "zon2nix", - "rev": "c28e93f3ba133d4c1b1d65224e2eebede61fd071", + "rev": "fe860f11b076bba30708d1efb4830459ecf85f0d", "type": "github" }, "original": { "owner": "jcollie", + "ref": "main", "repo": "zon2nix", - "rev": "c28e93f3ba133d4c1b1d65224e2eebede61fd071", "type": "github" } } diff --git a/flake.nix b/flake.nix index 9b0c6e4..9d3eea8 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,8 @@ nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; # nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; - nixpkgs.url = "github:NixOS/nixpkgs?rev=ce031847d1052b833760206f59d6f9e93b24d3a4"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs?rev=ce031847d1052b833760206f59d6f9e93b24d3a4"; sops-nix.url = "github:mic92/sops-nix"; stylix.url = "github:danth/stylix"; systems.url = "github:nix-systems/default"; diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix index 56bd2f0..ecbe030 100644 --- a/hosts/dunamis/configuration.nix +++ b/hosts/dunamis/configuration.nix @@ -51,6 +51,62 @@ # programs.ydotool.enable = true; # users.users.user.extraGroups = ["ydotool"]; + services.keyd = { + enable = true; + keyboards.win60he = { + ids = ["k:2e3c:c365"]; + settings.main = let + # finger = mod; + pinky = "alt"; + ring = "meta"; + middle = "control"; + index = "shift"; + # timeouts + idle = "170"; + hold = "120"; + # function takes finger and letter + homeRowMod = f: l: "lettermod(${f}, ${l}, ${idle}, ${hold})"; + in { + "a" = homeRowMod pinky "a"; + "s" = homeRowMod ring "s"; + "d" = homeRowMod middle "d"; + "f" = homeRowMod index "f"; + "j" = homeRowMod index "j"; + "k" = homeRowMod middle "k"; + "l" = homeRowMod ring "l"; + ";" = homeRowMod pinky ";"; + "capslock" = "overload(layer1, esc)"; + "compose" = "capslock"; # menu key + }; + settings.layer1 = { + "j" = "left"; + "k" = "down"; + "l" = "up"; + ";" = "right"; + "u" = "home"; + "i" = "pagedown"; + "o" = "pageup"; + "p" = "end"; + "\\" = "`"; + "backspace" = "delete"; + "enter" = "toggle(game)"; + }; + settings.game = { + "a" = "a"; + "s" = "s"; + "d" = "d"; + "f" = "f"; + "j" = "j"; + "k" = "k"; + "l" = "l"; + ";" = ";"; + "capslock" = "leftcontrol"; + # "control" = "capslock"; + "compose" = "layer(layer1)"; + }; + }; + }; + services.displayManager.autoLogin = { enable = true; user = "user"; diff --git a/modules/homePrograms/helix.nix b/modules/homePrograms/helix.nix index d2fcdc9..20a8654 100644 --- a/modules/homePrograms/helix.nix +++ b/modules/homePrograms/helix.nix @@ -95,7 +95,7 @@ in { args = ["server"]; }; tinymist.command = getExe pkgs.tinymist; - vscode-json-language-server.command = getExe pkgs.nodePackages.vscode-json-languageserver; + # vscode-json-language-server.command = getExe pkgs.nodePackages.vscode-json-languageserver; yaml-language-server.command = getExe pkgs.yaml-language-server; zk = { command = getExe pkgs.zk; diff --git a/modules/homePrograms/zed-editor.nix b/modules/homePrograms/zed-editor.nix index 859d2da..d37f365 100644 --- a/modules/homePrograms/zed-editor.nix +++ b/modules/homePrograms/zed-editor.nix @@ -131,12 +131,12 @@ in { path = getExe pkgs.tinymist; }; }; - json-language-server = { - binary = { - arguments = ["--stdio"]; - path = getExe pkgs.nodePackages.vscode-json-languageserver; - }; - }; + # json-language-server = { + # binary = { + # arguments = ["--stdio"]; + # path = getExe pkgs.nodePackages.vscode-json-languageserver; + # }; + # }; yaml-language-server = { binary = { arguments = ["--stdio"]; diff --git a/modules/nixos/shared/users.nix b/modules/nixos/shared/users.nix index 46570d0..b7288f1 100644 --- a/modules/nixos/shared/users.nix +++ b/modules/nixos/shared/users.nix @@ -24,6 +24,7 @@ in { "legion" "morphius" "sarien" + "kled" ]; }; users.user = { @@ -37,6 +38,7 @@ in { "legion" "morphius" "sarien" + "kled" ]; }; }; diff --git a/modules/users/user/flatpak.nix b/modules/users/user/flatpak.nix index 7085733..3782952 100644 --- a/modules/users/user/flatpak.nix +++ b/modules/users/user/flatpak.nix @@ -76,6 +76,7 @@ "com.usebottles.bottles" # wine containers # "de.capypara.FieldMonitor" # qemu and rdp/vnc client "org.qbittorrent.qBittorrent" # torrents + "it.mijorus.gearlever" # appimage manager # "io.github.amit9838.mousam" # weather "io.github.finefindus.Hieroglyphic" # find latex symbols (in rust) # "io.github.lainsce.Khronos" # log time for tasks @@ -145,6 +146,7 @@ "org.kde.kdenlive" = {inherit (homeNoNetwork) Context;}; "org.signal.Signal".Environment.SIGNAL_PASSWORD_STORE = "gnome-libsecret"; "org.qbittorrent.qBittorrent".Context.filesystems = ["host"]; # evil + "it.mijorus.gearlever".Context.filesystems = ["~/AppImages"]; }; }; } diff --git a/modules/users/user/programs.nix b/modules/users/user/programs.nix index 8cbe715..e678fff 100644 --- a/modules/users/user/programs.nix +++ b/modules/users/user/programs.nix @@ -209,6 +209,7 @@ in { ] ++ [ # misc apps + appimage-run adwaita-icon-theme # vial # qmk keyboard configuring app pinentry-gnome3 # pinentry for rbw