diff --git a/flake.lock b/flake.lock index 0a62b3f..887ea06 100755 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1737636397, - "narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=", + "lastModified": 1736102453, + "narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7fe006981fae53e931f513026fc754e322f13145", + "rev": "4846091641f3be0ad7542086d52769bb7932bde6", "type": "github" }, "original": { @@ -110,11 +110,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737654367, - "narHash": "sha256-SLyigXgNQQsMiDFsQ+Tuj2owj5ILyqRdbCWnm4h92zE=", + "lastModified": 1736428354, + "narHash": "sha256-L7uo4PKf4Odc4hl/d5QMpy5aXXkqATxCPKE7omgi+n8=", "owner": "nix-community", "repo": "buildbot-nix", - "rev": "eab66de3448a7dc78324ba45a00f2b91be58dc44", + "rev": "b657f0a25702d260c5a702919a8ad615d709b21b", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "crane_2": { "locked": { - "lastModified": 1737563566, - "narHash": "sha256-GLJvkOG29XCynQm8XWPyykMRqIhxKcBARVu7Ydrz02M=", + "lastModified": 1727974419, + "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", "owner": "ipetkov", "repo": "crane", - "rev": "849376434956794ebc7a6b487d31aace395392ba", + "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1737449923, - "narHash": "sha256-CfhtImn/809qxSduRdx6Zajf9pXLcjmyVicfLq2gSDk=", + "lastModified": 1730270645, + "narHash": "sha256-/ShKBKso+DEFM2AYqmiJNT1ngP9/hIesnJlQmq+I6jk=", "owner": "edgedb", "repo": "packages-nix", - "rev": "890cec292b06511d138c9c414cd5e0c29ccd7b4f", + "rev": "8b84b61569b0bd7389db6f4956c0067ccc18b92e", "type": "github" }, "original": { @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "type": "github" }, "original": { @@ -531,11 +531,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1737779447, - "narHash": "sha256-+iVqQXAUJshUYgxOHfke54Ux4f/aggl1yub86KNx2tE=", + "lastModified": 1737430029, + "narHash": "sha256-z55IQogW9z4HhVeT55LlCUFKbYD5O5aLMnU5cX1WTto=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "71e62f96fa4d286eda835048428d5be96e9f87c1", + "rev": "5cb2fa6f7594202b12a2603bf32094aa75b1bf0e", "type": "github" }, "original": { @@ -836,11 +836,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1737943827, - "narHash": "sha256-r3jDPIci3GL2MQZkgFICzVGANvltFTCTao77NPs5/XY=", + "lastModified": 1737319839, + "narHash": "sha256-wGfX2YcD9Hyqi7sQ8FSqUbN8/Rhftp01YyHoTWYPL8U=", "owner": "helix-editor", "repo": "helix", - "rev": "b00b475dfe96cca7ccaa0211b05b4159260377fc", + "rev": "e7ac2fcdecfdbf43a4f772e7f7c163b43b3d0b9b", "type": "github" }, "original": { @@ -863,11 +863,11 @@ ] }, "locked": { - "lastModified": 1736917206, - "narHash": "sha256-JTBWmyGf8K1Rwb+gviHIUzRJk/sITtT+72HXFkTZUjo=", + "lastModified": 1735695978, + "narHash": "sha256-cwk53OX1S1bCFY09zydubZNmmwcx9l5XEba8mVYuNE4=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "afd0a42e8c61ebb56899315ee4084a8b2e4ff425", + "rev": "f6233b5cfbada692d93a73d6ed35bdbfd0fdb9c4", "type": "github" }, "original": { @@ -883,11 +883,11 @@ ] }, "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", + "lastModified": 1737394973, + "narHash": "sha256-EW4oXMfnfA5sNM9Jqm+y98horWVvN66Gu7YIcEpFYZc=", "owner": "nix-community", "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "9786661d57c476021c8a0c3e53bf9fa2b4f3328b", "type": "github" }, "original": { @@ -933,11 +933,11 @@ ] }, "locked": { - "lastModified": 1737634937, - "narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=", + "lastModified": 1734906540, + "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e", + "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", "type": "github" }, "original": { @@ -962,11 +962,11 @@ ] }, "locked": { - "lastModified": 1737634889, - "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=", + "lastModified": 1736115290, + "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591", + "rev": "52202272d89da32a9f866c0d10305a5e3d954c50", "type": "github" }, "original": { @@ -991,11 +991,11 @@ ] }, "locked": { - "lastModified": 1737634889, - "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=", + "lastModified": 1736115290, + "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591", + "rev": "52202272d89da32a9f866c0d10305a5e3d954c50", "type": "github" }, "original": { @@ -1014,11 +1014,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1737635556, - "narHash": "sha256-Ahb+xhd80dlzgRSICthPktiDcvi+DqDtHP+YX0TrSdE=", + "lastModified": 1734384160, + "narHash": "sha256-zy2uzmlIORQV6VjIqSPhaoUKPLqfzpUQ5UTjmRfrkdg=", "owner": "hyprwm", "repo": "hypridle", - "rev": "33ac8cae64226d3a0b63ebf77a22455807895455", + "rev": "413564cb986cfc67aeb7c4e750b42dc93ff9810f", "type": "github" }, "original": { @@ -1034,8 +1034,8 @@ "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang_3", - "hyprutils": "hyprutils_3", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" @@ -1045,11 +1045,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1737925585, - "narHash": "sha256-+Y0fBW4G2KCmf9NY0bjgHM1W/mrTmm22uO/0aDVScNM=", + "lastModified": 1737398451, + "narHash": "sha256-k3GQfIFSGC364qxx1WsDaaHfTNN/rt1re8JSyAsBzug=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "2f55806d6f11a1e81e3e821cb0327779d5cc50e6", + "rev": "a661203bb6d4714b211572759e2f74b1da194972", "type": "github" }, "original": { @@ -1070,11 +1070,11 @@ ] }, "locked": { - "lastModified": 1737556638, - "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", + "lastModified": 1737127640, + "narHash": "sha256-mIQ3/axCZ4g8ySwWRbW4fJcyC9v55uAii3cqlJRtW8g=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", + "rev": "455c055883d9639d4fcbfcedb4c6d12ce313791e", "type": "github" }, "original": { @@ -1083,37 +1083,8 @@ "type": "github" } }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": "hyprlang_2", - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, "hyprland-qtutils": { "inputs": { - "hyprland-qt-support": "hyprland-qt-support", "hyprutils": [ "hyprland", "hyprutils" @@ -1128,11 +1099,11 @@ ] }, "locked": { - "lastModified": 1737811848, - "narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=", + "lastModified": 1736114838, + "narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b", + "rev": "6997fe382dcf396704227d2b98ffdd5066da6959", "type": "github" }, "original": { @@ -1157,11 +1128,11 @@ ] }, "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "lastModified": 1734364628, + "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", "type": "github" }, "original": { @@ -1172,26 +1143,25 @@ }, "hyprlang_2": { "inputs": { - "hyprutils": "hyprutils_2", + "hyprutils": [ + "hyprland", + "hyprutils" + ], "nixpkgs": [ "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", "nixpkgs" ], "systems": [ "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", "systems" ] }, "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "lastModified": 1735393019, + "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "rev": "55608efdaa387af7bfdc0eddb404c409958efa43", "type": "github" }, "original": { @@ -1201,35 +1171,6 @@ } }, "hyprlang_3": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_4": { "inputs": { "hyprutils": [ "hyprlock", @@ -1245,11 +1186,11 @@ ] }, "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "lastModified": 1735393019, + "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "rev": "55608efdaa387af7bfdc0eddb404c409958efa43", "type": "github" }, "original": { @@ -1261,8 +1202,8 @@ "hyprlock": { "inputs": { "hyprgraphics": "hyprgraphics_2", - "hyprlang": "hyprlang_4", - "hyprutils": "hyprutils_4", + "hyprlang": "hyprlang_3", + "hyprutils": "hyprutils_3", "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "nixpkgs" @@ -1270,11 +1211,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1737837801, - "narHash": "sha256-i7nKSo/FGU5Sjq2xM+UFahZHqqrjZn5WUekOZFsjO2w=", + "lastModified": 1736953751, + "narHash": "sha256-hoc21ZMxcabYWGz4nB/jd6TdFqDY4KZoPLs/qNn0g0Q=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "e77bc92b99e06ee66ccd684afbfe3a743af1f01d", + "rev": "02639c27599b03c81dc1d0e031628224f5ad8d50", "type": "github" }, "original": { @@ -1295,11 +1236,11 @@ ] }, "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "lastModified": 1733502241, + "narHash": "sha256-KAUNC4Dgq8WQjYov5auBw/usaHixhacvb7cRDd0AG/k=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "rev": "104117aed6dd68561be38b50f218190aa47f2cd8", "type": "github" }, "original": { @@ -1312,25 +1253,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "hyprlang", "nixpkgs" ], "systems": [ "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "hyprlang", "systems" ] }, "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "lastModified": 1736164519, + "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "rev": "3c895da64b0eb19870142196fa48c07090b441c4", "type": "github" }, "original": { @@ -1340,31 +1275,6 @@ } }, "hyprutils_3": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737725508, - "narHash": "sha256-jGmcPc6y/prg/4A8KGYqJ27nSPaProCMiFadaxNAKvA=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "fb0c2d1de3d1ef7396d19c18ac09e12bd956929e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_4": { "inputs": { "nixpkgs": [ "hyprlock", @@ -1376,11 +1286,11 @@ ] }, "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "lastModified": 1736164519, + "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "rev": "3c895da64b0eb19870142196fa48c07090b441c4", "type": "github" }, "original": { @@ -1486,11 +1396,11 @@ "systems": "systems_9" }, "locked": { - "lastModified": 1737800942, - "narHash": "sha256-kzZMXYpMg/h1rYWvNDC2R7DEkrC/BPLFGuDINPaf1Rw=", + "lastModified": 1736717676, + "narHash": "sha256-4vHKIwDWEmIRzoSnjv0WigZfr+zC5Xbu44vtluqK5ts=", "owner": "ngi-nix", "repo": "ngipkgs", - "rev": "60540d2de297a4f55f1f81505cd1afbe8c7c9a16", + "rev": "6105761a92b69dd6322361cfc80e36a9a7a5c002", "type": "github" }, "original": { @@ -1506,11 +1416,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1737933450, - "narHash": "sha256-1ggAq/GnSKaYI0cyWN9SOsYY1/6Dli0eVylUQlalmn0=", + "lastModified": 1737360510, + "narHash": "sha256-uiTiklpgmxZ7BJlQOvqULU9oCOkk9glmSDGSIkerPcc=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "2ae10ec7a15b2f25772ba7c9cfe9a6df51d16ca9", + "rev": "cfc19b6d0a0940e600b995827366092405f2bf73", "type": "github" }, "original": { @@ -1521,11 +1431,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737717945, - "narHash": "sha256-ET91TMkab3PmOZnqiJQYOtSGvSTvGeHoegAv4zcTefM=", + "lastModified": 1736657626, + "narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecd26a469ac56357fd333946a99086e992452b6a", + "rev": "2f9e2f85cb14a46410a1399aa9ea7ecf433e422e", "type": "github" }, "original": { @@ -1553,11 +1463,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1736549401, + "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", "type": "github" }, "original": { @@ -1569,11 +1479,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1737299813, + "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", "type": "github" }, "original": { @@ -1601,11 +1511,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1737746512, - "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "825479c345a7f806485b7f00dbe3abb50641b083", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -1617,11 +1527,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -1656,11 +1566,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1737943717, - "narHash": "sha256-JR+pLqfi13qVmSh+rzVcu4BssNnERoClB+HPRrBtGkg=", + "lastModified": 1737433096, + "narHash": "sha256-/p0JGjjQcBwglIMqaTB39eYGf+TI9I86XAzouME52YU=", "owner": "nix-community", "repo": "NUR", - "rev": "9fa2187952b1050eb4da2d969f0c7a267697dace", + "rev": "6ce0765cd6d8703f4de25493d30ff653f9e60f66", "type": "github" }, "original": { @@ -1679,11 +1589,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -1701,11 +1611,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1737301351, + "narHash": "sha256-2UNmLCKORvdBRhPGI8Vx0b6l7M8/QBey/nHLIxOl4jE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "15a87cedeb67e3dbc8d2f7b9831990dffcf4e69f", "type": "github" }, "original": { @@ -1724,11 +1634,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -1812,11 +1722,11 @@ ] }, "locked": { - "lastModified": 1737599167, - "narHash": "sha256-S2rHCrQWCDVp63XxL/AQbGr1g5M8Zx14C7Jooa4oM8o=", + "lastModified": 1728268235, + "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "38374302ae9edf819eac666d1f276d62c712dd06", + "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", "type": "github" }, "original": { @@ -1919,11 +1829,11 @@ ] }, "locked": { - "lastModified": 1737411508, - "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", + "lastModified": 1736515725, + "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", + "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125", "type": "github" }, "original": { @@ -1974,11 +1884,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1737930520, - "narHash": "sha256-CAgB9/o54SXzqWwypA+hL2ETxiHW92Y+Ou4fT581jdk=", + "lastModified": 1737416820, + "narHash": "sha256-PvOXfVj62pYnl2aq8l/hQkgmo22K1qa6n1JILTm4+ng=", "owner": "danth", "repo": "stylix", - "rev": "6103431cd2f9d4352e5493a4063cf57e307d355c", + "rev": "268daf22a1f93a00b7efc74c367d6711ca7f18e1", "type": "github" }, "original": { @@ -2257,11 +2167,11 @@ ] }, "locked": { - "lastModified": 1737483750, - "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", + "lastModified": 1736090846, + "narHash": "sha256-heFL48rpDWjX95ZTnan1mHQ8CA/ziSsF5fWBpf87FJc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", + "rev": "94ae23570d1c5baf710989fa1736eaea537fec27", "type": "github" }, "original": { @@ -2299,11 +2209,11 @@ ] }, "locked": { - "lastModified": 1737793892, - "narHash": "sha256-Dl7JEjpno+4dv66ZhqQyHT3zWw6d51fJ0cphu0Aejqk=", + "lastModified": 1736677965, + "narHash": "sha256-vj4NpvjjW5cUBYJc9AUbH8D8LIkoSwQyKJ+02tHKAAU=", "owner": "Alexays", "repo": "Waybar", - "rev": "481b01d9af1e34b7501665bbfc0b19fce5082eb5", + "rev": "a4241d700823cbee9e717c90a8408e2dfc977b45", "type": "github" }, "original": { @@ -2362,11 +2272,11 @@ ] }, "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "lastModified": 1734907020, + "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", "type": "github" }, "original": { @@ -2382,11 +2292,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1737827658, - "narHash": "sha256-cLVQN4nPiOgu9Guft1vMXphleoj2tm9eGJPiIeM8ZSU=", + "lastModified": 1737370740, + "narHash": "sha256-RKd8w0fZAmwxnpC2k7LRZOk06MbVghygsxgTece+UME=", "owner": "sxyazi", "repo": "yazi", - "rev": "da36cd6ab8b0207984e6755fcef5c7f05c415f28", + "rev": "245fb030df2031a8bc27e61fe3b3fc4f3681fe39", "type": "github" }, "original": { @@ -2405,11 +2315,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1737934654, - "narHash": "sha256-Mjs79LFBuSUizZkVqvdpMjYuELk+ML5ZPeXy5EsNY0k=", + "lastModified": 1737426798, + "narHash": "sha256-2q1fPHCBKKm7P/XH2y9H0XVF50nBNDBhtbAqOyvheB0=", "owner": "zed-industries", "repo": "zed", - "rev": "a6b1514246c2efeefde5ed0f1fb18aac5c7cc8b2", + "rev": "8f87b5637af4d4e68fbcf0ecfa0b43a03404f638", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 22f6f18..e3a5d69 100755 --- a/home/default.nix +++ b/home/default.nix @@ -37,13 +37,6 @@ in ; }; }; - laptop = { - imports = builtins.attrValues { - inherit (modules) - apps - ; - }; - }; server = { imports = builtins.attrValues { inherit (modules) diff --git a/home/modules/cli/development/langauges/default.nix b/home/modules/cli/development/langauges/default.nix old mode 100755 new mode 100644 diff --git a/home/modules/cli/files/fileRoller/default.nix b/home/modules/cli/files/fileRoller/default.nix deleted file mode 100755 index 3e8046c..0000000 --- a/home/modules/cli/files/fileRoller/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - pkgs, - ... -}: -{ - home.packages = builtins.attrValues { - inherit (pkgs) - file-roller - ; - }; -} diff --git a/home/modules/cli/files/unzip/default.nix b/home/modules/cli/files/unzip/default.nix deleted file mode 100755 index 1fad41f..0000000 --- a/home/modules/cli/files/unzip/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - pkgs, - ... -}: -{ - home.packages = builtins.attrValues { - inherit (pkgs) - unzip - ; - }; -} diff --git a/home/modules/cli/utilities/libnatpmp/default.nix b/home/modules/cli/utilities/libnatpmp/default.nix deleted file mode 100755 index 87e7f41..0000000 --- a/home/modules/cli/utilities/libnatpmp/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - pkgs, - ... -}: -{ - home.packages = builtins.attrValues { - inherit (pkgs) - libnatpmp - ; - }; -} diff --git a/home/modules/cli/utilities/protonVpn/default.nix b/home/modules/cli/utilities/protonVpn/default.nix index ee18550..c7fc0f2 100755 --- a/home/modules/cli/utilities/protonVpn/default.nix +++ b/home/modules/cli/utilities/protonVpn/default.nix @@ -6,7 +6,6 @@ home.packages = builtins.attrValues { inherit (pkgs) protonvpn-cli_2 - protonvpn-gui ; }; } diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix index 6216df7..a4ab38f 100755 --- a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix +++ b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix @@ -2,27 +2,6 @@ name = "Tools"; toolbar = false; bookmarks = [ - { - name = "Cyanophage Layout Analyzer"; - url = "https://cyanophage.github.io/"; - tags = [ - "cyanophage" - "keyboard" - "layout" - ]; - keyword = "Layout"; - } - { - name = "Oryx"; - url = "https://configure.zsa.io/moonlander"; - tags = [ - "zsa" - "moonlander" - "keyboard" - "layout" - ]; - keyword = "Moon"; - } { name = "Hugging Face"; url = "https://www.huggingface.co"; @@ -34,17 +13,6 @@ ]; keyword = "Hug"; } - { - name = "DeepSeek"; - url = "https://chat.deepseek.com/"; - tags = [ - "deepseek" - "deep" - "seek" - "ai" - ]; - keyword = "Deep"; - } { name = "Uncensored AI"; url = "https://www.aiuncensored.info"; diff --git a/home/modules/gui/apps/code/zed/config/userSettings/default.nix b/home/modules/gui/apps/code/zed/config/userSettings/default.nix index 2c37cb9..49b8ae5 100755 --- a/home/modules/gui/apps/code/zed/config/userSettings/default.nix +++ b/home/modules/gui/apps/code/zed/config/userSettings/default.nix @@ -31,12 +31,7 @@ let ; }; gitPath = import (configPath + /git); - miscPath = import (configPath + /misc) { - inherit - lib - pkgs - ; - }; + miscPath = import (configPath + /misc) { inherit lib pkgs; }; in { git = gitPath; diff --git a/home/modules/gui/apps/media/video/videoPlaying/jellyfin/default.nix b/home/modules/gui/apps/media/video/videoPlaying/jellyfin/default.nix deleted file mode 100755 index 0157950..0000000 --- a/home/modules/gui/apps/media/video/videoPlaying/jellyfin/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - pkgs, - ... -}: -{ - home.packages = builtins.attrValues { - inherit (pkgs) - jellyfin-media-player - ; - }; -} diff --git a/home/modules/gui/desktop/hypridle/config/settings.nix b/home/modules/gui/desktop/hypridle/config/settings.nix index f7236b5..3fac7d5 100755 --- a/home/modules/gui/desktop/hypridle/config/settings.nix +++ b/home/modules/gui/desktop/hypridle/config/settings.nix @@ -1,23 +1,23 @@ -{ - pkgs, - ... -}: +{ pkgs, ... }: { general = { - after_sleep_cmd = "hyprctl dispatch dpms on"; - ignore_dbus_inhibit = false; - lock_cmd = "swaylock"; + lock_cmd = "pidof swaylock || swaylock"; + before_sleep_cmd = "loginctl lock-session"; }; - listener = [ { - timeout = 900; - on-timeout = "swaylock"; + timeout = 150; + on-timeout = "${pkgs.brightnessctl}/bin/brightnessctl -s set 0"; + on-resume = "${pkgs.brightnessctl}/bin/brightnessctl -r"; } { - timeout = 1800; - on-timeout = "hyprctl dispatch dpms off"; - on-resume = "hyprctl dispatch dpms on"; + timeout = 150; + on-timeout = "${pkgs.brightnessctl}/bin/brightnessctl -sd rgb:kbd_backlight set 0"; + on-resume = "${pkgs.brightnessctl}/bin/brightnessctl -rd rgb:kbd_backlight"; + } + { + timeout = 300; + on-timeout = "systemctl suspend"; } ]; } diff --git a/home/modules/gui/desktop/hyprland/config/exec-once.nix b/home/modules/gui/desktop/hyprland/config/exec-once.nix index 22ff944..98ebbcd 100755 --- a/home/modules/gui/desktop/hyprland/config/exec-once.nix +++ b/home/modules/gui/desktop/hyprland/config/exec-once.nix @@ -6,7 +6,6 @@ let in [ "swaylock" - "hypridle" "wl-clipboard" "wpaperd" "gammastep" @@ -15,13 +14,11 @@ in "waybar" "nm-applet" "blueman-applet" - "blueman-manager" "easyeffects -r" "emote" "flameshot" - "pactl set-default-sink bluez_output.00_16_94_35_0D_5F.1" + "pactl set-default-sink alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink" "pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source" - "gsettings set org.blueman.plugins.powermanager auto-power-on true" "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'" "gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}" ] diff --git a/home/modules/gui/desktop/network/default.nix b/home/modules/gui/desktop/network/default.nix index 3adda0e..d2280d2 100755 --- a/home/modules/gui/desktop/network/default.nix +++ b/home/modules/gui/desktop/network/default.nix @@ -1,12 +1,3 @@ -{ - pkgs, - ... -}: { services.network-manager-applet.enable = true; - home.packages = builtins.attrValues { - inherit (pkgs) - networkmanagerapplet - ; - }; } diff --git a/home/modules/gui/desktop/swaylock/config/settings.nix b/home/modules/gui/desktop/swaylock/config/settings.nix index 9b7be55..60ddcc1 100755 --- a/home/modules/gui/desktop/swaylock/config/settings.nix +++ b/home/modules/gui/desktop/swaylock/config/settings.nix @@ -10,7 +10,6 @@ let in { font = font.name; - font-size = font.size.desktop; indicator-idle-visible = true; indicator-radius = 100; indicator-thickness = 20; diff --git a/home/modules/gui/desktop/waybar/config/settings.nix b/home/modules/gui/desktop/waybar/config/settings.nix index f8416f9..9a6b4c3 100755 --- a/home/modules/gui/desktop/waybar/config/settings.nix +++ b/home/modules/gui/desktop/waybar/config/settings.nix @@ -56,7 +56,7 @@ in "3" = "◉"; "4" = "◉"; urgent = ""; - default = "◉"; + default = ""; sort-by-number = true; }; persistent-workspaces = { @@ -85,13 +85,13 @@ in interval = 60; }; - network = { - format-wifi = " {signalStrength}%"; - format-ethernet = "󰀂 "; - tooltip-format = "Connected to {essid} {ifname} via {gwaddr}"; - format-linked = "{ifname} (No IP)"; - format-disconnected = "󰖪 "; - }; + # network = { + # format-wifi = " {signalStrength}%"; + # format-ethernet = "󰀂 "; + # tooltip-format = "Connected to {essid} {ifname} via {gwaddr}"; + # format-linked = "{ifname} (No IP)"; + # format-disconnected = "󰖪 "; + # }; tray = { icon-size = 12; @@ -151,7 +151,7 @@ in }; "custom/weather" = { - exec = "/home/${user0}/Files/Projects/dotfiles/home/modules/gui/desktop/waybar/config/scripts/get_weather.sh Winnipeg"; + exec = "/home/${user0}/Files/Projects/dotfiles/home/modules/waybar/config/scripts/get_weather.sh Winnipeg"; return-type = "json"; format = "{}"; tooltip = true; diff --git a/nixos/default.nix b/nixos/default.nix index 7a04a50..ae32b8f 100755 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -60,7 +60,7 @@ in inherit (modules) syncthing ollama - # hledger + hledger # plasma # sddm ; diff --git a/nixos/modules/hyprland/default.nix b/nixos/modules/hyprland/default.nix index 7389e7b..e294e97 100755 --- a/nixos/modules/hyprland/default.nix +++ b/nixos/modules/hyprland/default.nix @@ -5,6 +5,7 @@ "network" "hypridle" "hyprland" + "hyprlock" "regreet" "swaylock" "thunar" diff --git a/nixos/modules/hyprland/hyprlock.nix b/nixos/modules/hyprland/hyprlock.nix new file mode 100755 index 0000000..dd7fdd6 --- /dev/null +++ b/nixos/modules/hyprland/hyprlock.nix @@ -0,0 +1,10 @@ +{ + flake, + pkgs, + ... +}: { + programs.hyprlock = { + enable = true; + package = flake.inputs.hyprlock.packages.${pkgs.system}.hyprlock; + }; +} diff --git a/nixos/modules/ollama.nix b/nixos/modules/ollama.nix index f2b22e7..c8ecc7f 100755 --- a/nixos/modules/ollama.nix +++ b/nixos/modules/ollama.nix @@ -14,13 +14,13 @@ in { services = { ollama = { - # acceleration = "rocm"; - # package = pkgs.ollama.override { - # config = { - # rocmSupport = true; - # cudaSupport = false; - # }; - # }; + acceleration = "rocm"; + package = pkgs.ollama.override { + config = { + rocmSupport = true; + cudaSupport = false; + }; + }; enable = true; group = service.name; host = "http://${localhost}"; diff --git a/systems/desktop/config/boot.nix b/systems/desktop/config/boot.nix index cc3f996..9cfcc97 100755 --- a/systems/desktop/config/boot.nix +++ b/systems/desktop/config/boot.nix @@ -2,8 +2,7 @@ pkgs, config, ... -}: -{ +}: { boot = { extraModulePackages = [ config.boot.kernelPackages.v4l2loopback.out