diff --git a/flake.lock b/flake.lock index 050efff..556d6b1 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1736102453, - "narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=", + "lastModified": 1739298463, + "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "4846091641f3be0ad7542086d52769bb7932bde6", + "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16", "type": "github" }, "original": { @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1734906446, - "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=", + "lastModified": 1737636397, + "narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091", + "rev": "7fe006981fae53e931f513026fc754e322f13145", "type": "github" }, "original": { @@ -146,27 +146,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "walker", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -219,11 +198,11 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -249,11 +228,11 @@ ] }, "locked": { - "lastModified": 1734906540, - "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", + "lastModified": 1738664950, + "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", + "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", "type": "github" }, "original": { @@ -281,11 +260,11 @@ ] }, "locked": { - "lastModified": 1734906540, - "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", + "lastModified": 1737634937, + "narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", + "rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e", "type": "github" }, "original": { @@ -310,11 +289,11 @@ ] }, "locked": { - "lastModified": 1736115290, - "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", + "lastModified": 1739049071, + "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "52202272d89da32a9f866c0d10305a5e3d954c50", + "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", "type": "github" }, "original": { @@ -342,11 +321,11 @@ ] }, "locked": { - "lastModified": 1734906236, - "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", + "lastModified": 1737634889, + "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", + "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591", "type": "github" }, "original": { @@ -362,11 +341,11 @@ ] }, "locked": { - "lastModified": 1736771168, - "narHash": "sha256-8TaiwQorn5etYxUtyUYPJBkWuzfoULHSwGDEf+cOhh4=", + "lastModified": 1741008259, + "narHash": "sha256-gXZ4CvL1cpkSA1/dJSjfeyTspRF8B+n1IPbs1LzVQAw=", "owner": "horriblename", "repo": "hyprgrass", - "rev": "d324904d70e8c9710bcf772227f364262baf3820", + "rev": "e59bc280b71be8c45638806f3123fc36834435bc", "type": "github" }, "original": { @@ -391,11 +370,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1737038559, - "narHash": "sha256-irqN8zKwpQ0NFxEvV/wQRdopClwkyZXCQoF7mgX/Uss=", + "lastModified": 1741035361, + "narHash": "sha256-WSfqkzWUY8FMFnaGm0n9QcoO0cgqJbYcv3ccfkFv7Qw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84", + "rev": "d7e7a292613a4f20218074ff8299dff099a80098", "type": "github" }, "original": { @@ -416,11 +395,11 @@ ] }, "locked": { - "lastModified": 1735774328, - "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "type": "github" }, "original": { @@ -443,11 +422,11 @@ ] }, "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", "type": "github" }, "original": { @@ -456,10 +435,79 @@ "type": "github" } }, + "hyprland-qt-support": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], + "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-qt-support_2": { + "inputs": { + "hyprlang": "hyprlang_2", + "nixpkgs": [ + "hyprland-virtual-desktops", + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland-virtual-desktops", + "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", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "hyprutils": [ "hyprland", + "hyprland-qtutils", + "hyprlang", "hyprutils" ], "nixpkgs": [ @@ -472,11 +520,11 @@ ] }, "locked": { - "lastModified": 1736114838, - "narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=", + "lastModified": 1739048983, + "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "6997fe382dcf396704227d2b98ffdd5066da6959", + "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", "type": "github" }, "original": { @@ -487,6 +535,7 @@ }, "hyprland-qtutils_2": { "inputs": { + "hyprland-qt-support": "hyprland-qt-support_2", "hyprutils": [ "hyprland-virtual-desktops", "hyprland", @@ -504,11 +553,11 @@ ] }, "locked": { - "lastModified": 1734906472, - "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=", + "lastModified": 1737811848, + "narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152", + "rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b", "type": "github" }, "original": { @@ -523,11 +572,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1734967974, - "narHash": "sha256-7wKaTYpeLoPnjgDoRxQwW1qb+DKJoIbIXVcTZzfHSik=", + "lastModified": 1739291009, + "narHash": "sha256-yf8kUx2yPwSWHkMC9ueyAtr96jM+rELfcjUIV+rVVys=", "owner": "levnikmyskin", "repo": "hyprland-virtual-desktops", - "rev": "e4469b8f0b0cea850876f42f0ae91c5994705c4d", + "rev": "c1e057a87705a3e6edcc22a739becbab8dd7997d", "type": "github" }, "original": { @@ -543,8 +592,8 @@ "hyprgraphics": "hyprgraphics_2", "hyprland-protocols": "hyprland-protocols_2", "hyprland-qtutils": "hyprland-qtutils_2", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", + "hyprlang": "hyprlang_3", + "hyprutils": "hyprutils_3", "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks_2", @@ -552,17 +601,17 @@ "xdph": "xdph_2" }, "locked": { - "lastModified": 1737136603, - "narHash": "sha256-fUY5Rr3ct03bynJdbMF6dorXkSZdUzZQ/YF3sRsrAxM=", + "lastModified": 1738457237, + "narHash": "sha256-dq6swY473I6lcbSvOWDtzqv0++oPwlRaXwYg/y/KWy8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "b65f8a87232c13697f0469fb7dfa31ff4f14af22", + "rev": "882f7ad7d2bbfc7440d0ccaef93b1cdd78e8e3ff", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "main", "repo": "Hyprland", + "rev": "882f7ad7d2bbfc7440d0ccaef93b1cdd78e8e3ff", "type": "github" } }, @@ -582,11 +631,11 @@ ] }, "locked": { - "lastModified": 1735393019, - "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", + "lastModified": 1739048914, + "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "55608efdaa387af7bfdc0eddb404c409958efa43", + "rev": "a7334904d591f38757c46fbe2ab68651877d9099", "type": "github" }, "original": { @@ -596,6 +645,38 @@ } }, "hyprlang_2": { + "inputs": { + "hyprutils": "hyprutils_2", + "nixpkgs": [ + "hyprland-virtual-desktops", + "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "nixpkgs" + ], + "systems": [ + "hyprland-virtual-desktops", + "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "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_3": { "inputs": { "hyprutils": [ "hyprland-virtual-desktops", @@ -614,11 +695,11 @@ ] }, "locked": { - "lastModified": 1734906259, - "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=", + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0404833ea18d543df44df935ebf1b497310eb046", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", "type": "github" }, "original": { @@ -633,11 +714,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1737011541, - "narHash": "sha256-YAT1VozLQ29V56EvEzJQswBOCLZDqn/gTU05mf+UFts=", + "lastModified": 1740863579, + "narHash": "sha256-U4amsszfgPUTAa9FrIlYsCCpmAyko22h/nbjhmAZvAs=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "88609f7e4c244326face34cb992a79053f2c7810", + "rev": "2be9f1ef6c2df2ecf0eebe5a039e8029d8d151cd", "type": "github" }, "original": { @@ -658,11 +739,11 @@ ] }, "locked": { - "lastModified": 1736164519, - "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", + "lastModified": 1739891528, + "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3c895da64b0eb19870142196fa48c07090b441c4", + "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba", "type": "github" }, "original": { @@ -672,6 +753,39 @@ } }, "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprland-virtual-desktops", + "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "hyprlang", + "nixpkgs" + ], + "systems": [ + "hyprland-virtual-desktops", + "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "hyprlang", + "systems" + ] + }, + "locked": { + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_3": { "inputs": { "nixpkgs": [ "hyprland-virtual-desktops", @@ -685,11 +799,11 @@ ] }, "locked": { - "lastModified": 1734796073, - "narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=", + "lastModified": 1737725508, + "narHash": "sha256-jGmcPc6y/prg/4A8KGYqJ27nSPaProCMiFadaxNAKvA=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf", + "rev": "fb0c2d1de3d1ef7396d19c18ac09e12bd956929e", "type": "github" }, "original": { @@ -710,11 +824,11 @@ ] }, "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "lastModified": 1739049028, + "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "rev": "04146df74a8d5ec0b579657307be01f1e241125f", "type": "github" }, "original": { @@ -737,11 +851,11 @@ ] }, "locked": { - "lastModified": 1734793513, - "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=", + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "type": "github" }, "original": { @@ -768,11 +882,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -782,29 +896,13 @@ "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-unstable": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1741010256, + "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "type": "github" }, "original": { @@ -816,11 +914,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1737632463, + "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", "type": "github" }, "original": { @@ -832,11 +930,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -864,11 +962,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1736549401, - "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", + "lastModified": 1741048562, + "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", + "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", "type": "github" }, "original": { @@ -880,11 +978,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { @@ -904,11 +1002,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -925,15 +1023,14 @@ "hyprland-virtual-desktops", "hyprland", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -1002,16 +1099,15 @@ }, "walker": { "inputs": { - "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_6", "systems": "systems_3" }, "locked": { - "lastModified": 1737092107, - "narHash": "sha256-p1+wUOOLZoeyBanKVN5XNI2kLaBTVVfErs9AR1fg0Xc=", + "lastModified": 1740745001, + "narHash": "sha256-XZEIwnwOYgb1wECvT83HB314bd/JBYwSaTaj2EeqWrc=", "owner": "abenz1267", "repo": "walker", - "rev": "712445d0738e713d23cdbf7dbad07c3e7ae4484e", + "rev": "350d5e078b997b5ca07eda39e207048ee26bbb9d", "type": "github" }, "original": { @@ -1048,11 +1144,11 @@ ] }, "locked": { - "lastModified": 1734907020, - "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", + "lastModified": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", "type": "github" }, "original": { @@ -1095,11 +1191,11 @@ ] }, "locked": { - "lastModified": 1734907020, - "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", + "lastModified": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cafb311..95bce6e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "Nix config entry point"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Home manager - home-manager.url = "github:nix-community/home-manager/release-25.05"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Managing flatpak apps nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; diff --git a/hosts/spectre-x360-2018/default.nix b/hosts/spectre-x360-2018/default.nix index 80495fd..47d2663 100644 --- a/hosts/spectre-x360-2018/default.nix +++ b/hosts/spectre-x360-2018/default.nix @@ -5,6 +5,7 @@ ./configuration.nix ./hardware-configuration.nix ../../modules/nixos/bluetooth.nix + ../../modules/nixos/flakes.nix ../../modules/nixos/fonts.nix ../../modules/nixos/hyprland.nix ../../modules/nixos/monitoring.nix diff --git a/modules/home-manager/code.nix b/modules/home-manager/code.nix index 7e9c1eb..ce389f8 100644 --- a/modules/home-manager/code.nix +++ b/modules/home-manager/code.nix @@ -3,119 +3,114 @@ programs.vscode = { enable = true; - profiles = { - default = { - extensions = with pkgs.vscode-extensions; [ - # QOL - mhutchie.git-graph - redhat.vscode-yaml - github.copilot + # profiles = { + # default = { + extensions = with pkgs.vscode-extensions; [ + # QOL + mhutchie.git-graph + redhat.vscode-yaml + github.copilot - # python - ms-python.python - ms-python.isort - ms-python.debugpy - ms-python.vscode-pylance + # python + ms-python.python + ms-python.isort + ms-python.debugpy + ms-python.vscode-pylance - # Nix language - jnoortheen.nix-ide - ]; + # Nix language + jnoortheen.nix-ide + ]; + # }; + + keybindings = [ + { + key = "ctrl+#"; + command = "editor.action.commentLine"; + when = "textInputFocus"; + } + ]; + + userSettings = { + "telemetry.enableCrashReporter" = false; + "telemetry.enableTelemetry" = false; + "git.ignoreMissingGitWarning" = true; + "editor.suggestSelection" = "first"; + "workbench.editorAssociations" = { + "*.ipynb" = "jupyter-notebook"; }; - - keybindings = { - "ctrl+shift+." = "workbench.action.terminal.focus"; - "ctlr+#" = "editor.action.commentLine"; + "workbench.startupEditor" = "newUntitledFile"; + "editor.renderWhitespace" = "none"; + "editor.acceptSuggestionOnEnter" = "off"; + "explorer.confirmDelete" = false; + "git.confirmSync" = false; + "workbench.iconTheme" = "vs-seti"; + "editor.fontLigatures" = true; + "explorer.confirmDragAndDrop" = false; + "editor.wordWrap" = "on"; + "settingsSync.ignoredSettings" = [ + "editor.fontFamily" + "terminal.integrated.fontFamily" + "-python.venvFolders" + ]; + "jupyter.askForKernelRestart" = false; + "security.workspace.trust.untrustedFiles" = "open"; + "notebook.cellToolbarLocation" = { + "default" = "right"; + "jupyter-notebook" = "left"; }; - - userSettings = '' - { - "telemetry.enableCrashReporter": false, - "telemetry.enableTelemetry": false, - "git.ignoreMissingGitWarning": true, - "editor.suggestSelection": "first", - "workbench.editorAssociations": { - "*.ipynb": "jupyter-notebook" - }, - "workbench.startupEditor": "newUntitledFile", - "editor.renderWhitespace": "none", - "editor.acceptSuggestionOnEnter": "off", - "explorer.confirmDelete": false, - "git.confirmSync": false, - "workbench.iconTheme": "vs-seti", - "editor.fontLigatures": true, - "explorer.confirmDragAndDrop": false, - "editor.wordWrap": "on", - "files.associations": { - }, - "settingsSync.ignoredSettings": [ - "editor.fontFamily", - "terminal.integrated.fontFamily", - "-python.venvFolders" - ], - "jupyter.askForKernelRestart": false, - "security.workspace.trust.untrustedFiles": "open", - "notebook.cellToolbarLocation": { - "default": "right", - "jupyter-notebook": "left" - }, - "git.enableSmartCommit": true, - "terminal.integrated.fontFamily": "Fira Code", - "settingsSync.ignoredExtensions": [ - "ms-vscode-remote.remote-wsl", - "ms-vscode-remote.remote-ssh-edit", - "ms-vscode-remote.remote-ssh" - ], - "editor.bracketPairColorization.enabled": true, - "jupyter.widgetScriptSources": [ - "jsdelivr.com", - "unpkg.com" - ], - "%DOC%.tex" - ], - "diffEditor.renderSideBySide": false, - "editor.inlineSuggest.enabled": true, - "suppressLineUncommittedWarning": true - }, - "github.copilot.enable": { - "*": true, - "plaintext": true, - "markdown": true, - "scminput": false, - "yaml": true - }, - "redhat.telemetry.enabled": false, - "git.autofetch": true, - "terminal.integrated.enableMultiLinePasteWarning": false, - "editor.unicodeHighlight.nonBasicASCII": false, - "jupyter.disableJupyterAutoStart": true, - "editor.unicodeHighlight.invisibleCharacters": false, - "editor.unicodeHighlight.ambiguousCharacters": false, - "diffEditor.ignoreTrimWhitespace": false, - "update.showReleaseNotes": false, - "terminal.external.linuxExec": "kitty", - "window.dialogStyle": "custom", - "window.titleBarStyle": "custom", - "github.copilot.editor.enableAutoCompletions": true, - "window.menuBarVisibility": "compact", - "workbench.colorTheme": "Default Light+", - "github.copilot.advanced": {}, - "git.openRepositoryInParentFolders": "never", - "terminal.integrated.commandsToSkipShell": [ - "language-julia.interrupt" - ], - "diffEditor.hideUnchangedRegions.enabled": true, - "[typst]": { - "editor.wordSeparators": "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?" - }, - "[typst-code]": { - "editor.wordSeparators": "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?" - }, - "tinymist.fontPaths": [ - "./font" - ], - "editor.fontFamily": "'FiraCode Nerd Font Mono', 'monospace', monospace", - }; - ''; + "git.enableSmartCommit" = true; + "terminal.integrated.fontFamily" = "Fira Code"; + "settingsSync.ignoredExtensions" = [ + "ms-vscode-remote.remote-wsl" + "ms-vscode-remote.remote-ssh-edit" + "ms-vscode-remote.remote-ssh" + ]; + "editor.bracketPairColorization.enabled" = true; + "jupyter.widgetScriptSources" = [ + "jsdelivr.com" + "unpkg.com" + ]; + "diffEditor.renderSideBySide" = false; + "editor.inlineSuggest.enabled" = true; + "github.copilot.enable" = { + "*" = true; + "plaintext" = true; + "markdown" = true; + "scminput" = false; + "yaml" = true; + }; + "redhat.telemetry.enabled" = false; + "git.autofetch" = true; + "terminal.integrated.enableMultiLinePasteWarning" = false; + "editor.unicodeHighlight.nonBasicASCII" = false; + "jupyter.disableJupyterAutoStart" = true; + "editor.unicodeHighlight.invisibleCharacters" = false; + "editor.unicodeHighlight.ambiguousCharacters" = false; + "diffEditor.ignoreTrimWhitespace" = false; + "update.showReleaseNotes" = false; + "terminal.external.linuxExec" = "kitty"; + "window.dialogStyle" = "custom"; + "window.titleBarStyle" = "custom"; + "github.copilot.editor.enableAutoCompletions" = true; + "window.menuBarVisibility" = "compact"; + "workbench.colorTheme" = "Default Light+"; + "github.copilot.advanced" = {}; + "git.openRepositoryInParentFolders" = "never"; + "terminal.integrated.commandsToSkipShell" = [ + "language-julia.interrupt" + ]; + "diffEditor.hideUnchangedRegions.enabled" = true; + "[typst]" = { + "editor.wordSeparators" = "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?"; + }; + "[typst-code]" = { + "editor.wordSeparators" = "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?"; + }; + "tinymist.fontPaths" = [ + "./font" + ]; + "editor.fontFamily" = "'FiraCode Nerd Font Mono', 'monospace', monospace"; }; + }; } diff --git a/modules/home-manager/hypr/hyprland-customization.nix b/modules/home-manager/hypr/hyprland-customization.nix index a6444b6..5dcc954 100644 --- a/modules/home-manager/hypr/hyprland-customization.nix +++ b/modules/home-manager/hypr/hyprland-customization.nix @@ -59,9 +59,9 @@ # "${pkgs.hyprpaper}/bin/hyprpaper" # hyprpaper is handled as its own service "${pkgs.waybar}/bin/waybar" - # Fixes cursor themes in gnome apps under hyprland - "gsettings set org.gnome.desktop.interface cursor-theme '${config.home.pointerCursor.name}'" - "gsettings set org.gnome.desktop.interface cursor-size ${toString home.pointerCursor.size}" + # # Fixes cursor themes in gnome apps under hyprland + # "gsettings set org.gnome.desktop.interface cursor-theme '${config.home.pointerCursor.name}'" + # "gsettings set org.gnome.desktop.interface cursor-size ${toString home.pointerCursor.size}" ]; general = { diff --git a/modules/home-manager/hypr/hyprpaper.nix b/modules/home-manager/hypr/hyprpaper.nix index 0581fdc..b86b13e 100644 --- a/modules/home-manager/hypr/hyprpaper.nix +++ b/modules/home-manager/hypr/hyprpaper.nix @@ -4,23 +4,23 @@ ... }: with lib; let - wallpapers = builtins.readDir ../../../wallpapers; + # wallpapers = builtins.readDir ../../../wallpapers; - wallpaperBashArray = "(\"${strings.concatStrings (strings.intersperse "\" \"" (map (wallpaper: ../../../wallpapers + "/" + wallpaper) (attrNames wallpapers)))}\")"; - wallpaperRandomizer = pkgs.writeShellScriptBin "wallpaperRandomizer" '' - wallpapers=${wallpaperBashArray} - rand=$[$RANDOM % ''${#wallpapers[@]}] - wallpaper=''${wallpapers[$rand]} + # wallpaperBashArray = "(\"${strings.concatStrings (strings.intersperse "\" \"" (map (wallpaper: ../../../wallpapers + "/" + wallpaper) (attrNames wallpapers)))}\")"; + # wallpaperRandomizer = pkgs.writeShellScriptBin "wallpaperRandomizer" '' + # wallpapers=${wallpaperBashArray} + # rand=$[$RANDOM % ''${#wallpapers[@]}] + # wallpaper=''${wallpapers[$rand]} - monitor=(`hyprctl monitors | grep Monitor | awk '{print $2}'`) - hyprctl hyprpaper unload all - hyprctl hyprpaper preload $wallpaper - for m in ''${monitor[@]}; do - hyprctl hyprpaper wallpaper "$m,$wallpaper" - done - ''; + # monitor=(`hyprctl monitors | grep Monitor | awk '{print $2}'`) + # hyprctl hyprpaper unload all + # hyprctl hyprpaper preload $wallpaper + # for m in ''${monitor[@]}; do + # hyprctl hyprpaper wallpaper "$m,$wallpaper" + # done + # ''; in { - home.packages = [wallpaperRandomizer]; + # home.packages = [wallpaperRandomizer]; services.hyprpaper = { enable = true; @@ -32,29 +32,29 @@ in { # }; }; - systemd.user = { - services.wallpaperRandomizer = { - Install = {WantedBy = ["graphical-session.target"];}; + # systemd.user = { + # services.wallpaperRandomizer = { + # Install = {WantedBy = ["graphical-session.target"];}; - Unit = { - Description = "Set random desktop background using hyprpaper"; - After = ["graphical-session-pre.target"]; - PartOf = ["graphical-session.target"]; - }; + # Unit = { + # Description = "Set random desktop background using hyprpaper"; + # After = ["graphical-session-pre.target"]; + # PartOf = ["graphical-session.target"]; + # }; - Service = { - Type = "oneshot"; - ExecStart = "${wallpaperRandomizer}/bin/wallpaperRandomizer"; - IOSchedulingClass = "idle"; - }; - }; + # Service = { + # Type = "oneshot"; + # ExecStart = "${wallpaperRandomizer}/bin/wallpaperRandomizer"; + # IOSchedulingClass = "idle"; + # }; + # }; - timers.wallpaperRandomizer = { - Unit = {Description = "Set random desktop background using hyprpaper on an interval";}; + # timers.wallpaperRandomizer = { + # Unit = {Description = "Set random desktop background using hyprpaper on an interval";}; - Timer = {OnUnitActiveSec = "6h";}; + # Timer = {OnUnitActiveSec = "6h";}; - Install = {WantedBy = ["timers.target"];}; - }; - }; + # Install = {WantedBy = ["timers.target"];}; + # }; + # }; } \ No newline at end of file diff --git a/modules/home-manager/hypr/waybar.nix b/modules/home-manager/hypr/waybar.nix index 208b1a7..3739698 100644 --- a/modules/home-manager/hypr/waybar.nix +++ b/modules/home-manager/hypr/waybar.nix @@ -5,9 +5,13 @@ # waybar requires font-awesome home.packages = [ - # fira code now contains ligatures and font-awesome - nerd-fonts.fira-code pkgs.pavucontrol + # fira code now contains ligatures and font-awesome + # TODO - this only works after nixpkgs 25.05 + # nerd-fonts.fira-code + (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }) + pkgs.fira-code + ]; # enable waybar diff --git a/modules/home-manager/xdg-portals.nix b/modules/home-manager/xdg-portals.nix index a796bf2..ab6c353 100644 --- a/modules/home-manager/xdg-portals.nix +++ b/modules/home-manager/xdg-portals.nix @@ -4,7 +4,7 @@ xdg.portal = { enable = true; - configPackages [ pkgs.hyprland ]; + configPackages = [ pkgs.hyprland ]; extraPortals = [ pkgs.xdg-desktop-portal-gtk @@ -17,7 +17,7 @@ createDirectories = true; desktop = "Desktop"; documents = "Documents"; - downloads = "Downloads"; + # downloads = "Downloads"; pictures = "Pictures"; }; } diff --git a/modules/nixos/flakes.nix b/modules/nixos/flakes.nix new file mode 100644 index 0000000..2b6f25a --- /dev/null +++ b/modules/nixos/flakes.nix @@ -0,0 +1,3 @@ +{ + nix.settings.experimental-features = [ "nix-command" "flakes" ]; +} \ No newline at end of file diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index 010847e..5268226 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -1,8 +1,8 @@ { - config, - lib, - pkgs, - ... + config, + lib, + pkgs, + ... }: { @@ -29,14 +29,7 @@ intelBusId = "PCI:0:2:0"; }; - package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "565.77"; - sha256_64bit = "sha256-CnqnQsRrzzTXZpgkAtF7PbH9s7wbiTRNcM0SPByzFHw="; - sha256_aarch64 = "sha256-LSAYUnhfnK3rcuPe1dixOwAujSof19kNOfdRHE7bToE="; - openSha256 = "sha256-Fxo0t61KQDs71YA8u7arY+503wkAc1foaa51vi2Pl5I="; - settingsSha256 = "sha256-VUetj3LlOSz/LB+DDfMCN34uA4bNTTpjDrb6C6Iwukk="; - persistencedSha256 = "sha256-wnDjC099D8d9NJSp9D0CbsL+vfHXyJFYYgU3CwcqKww="; - }; + package = config.boot.kernelPackages.nvidiaPackages.latest; }; # overwrite the blacklists set previously boot.extraModprobeConfig = ""; @@ -65,31 +58,9 @@ ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", ATTR{power/control}="auto", ATTR{remove}="1" ''; - # # Remove the whole bridge responsible for the VGA/3D controller # ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{class}=="0x060400", ATTR{power/control}="auto", ATTR{remove}="1" - # # somehow the udev rules are not enough to prevent the nouveau driver from loading - # # Also unload remove the bus by id manually - # # unload 0000:01:00.1 and 0000:01:00.0 - # # at boot echo 1 > /sys/bus/pci/devices/0000:01:00.1/remove - # # at boot echo 1 > /sys/bus/pci/devices/0000:01:00.0/remove - - # systemd.services.remove-nouveau = { - # description = "Remove Nouveau PCI devices"; - # wantedBy = [ "multi-user.target" ]; - # after = [ "sysinit.target" ]; - # serviceConfig = { - # Type = "oneshot"; - # ExecStart = "${pkgs.coreutils}/bin/echo 1 > /sys/bus/pci/devices/0000:01:00.1/remove"; - # ExecStart = "${pkgs.coreutils}/bin/echo auto > /sys/bus/pci/devices/0000:00:01.0/power/control"; - # ExecStart = "${pkgs.coreutils}/bin/echo 1 > /sys/bus/pci/devices/0000:01:00.0/remove"; - # ExecStart = "${pkgs.coreutils}/bin/echo auto > /sys/bus/pci/devices/0000:00:01.0/power/control"; - # }; - # }; - - - boot.blacklistedKernelModules = [ "nouveau" "nvidia" "nvidia_drm" "nvidia_modeset" ]; }