From e3bafff8f8ac9a4e497ac74e588849b14a72a951 Mon Sep 17 00:00:00 2001 From: tux Date: Fri, 24 Apr 2026 23:32:44 +0530 Subject: [PATCH] feat: update flake --- flake.lock | 418 ++++++++++++---------- hosts/canopus/default.nix | 4 +- hosts/canopus/home.nix | 4 +- modules/home/desktop/hyprland/default.nix | 31 +- modules/home/desktop/mango/default.nix | 337 ++++++++--------- modules/home/firefox/default.nix | 2 +- modules/home/shell/default.nix | 4 +- modules/home/shell/open-code.nix | 4 +- modules/nixos/desktop/awesome/default.nix | 2 +- modules/nixos/desktop/default.nix | 44 ++- pkgs/firefox-mod-blur/default.nix | 3 +- 11 files changed, 473 insertions(+), 380 deletions(-) diff --git a/flake.lock b/flake.lock index 82de474..f82f522 100755 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1767024902, - "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=", + "lastModified": 1776702787, + "narHash": "sha256-qc5uwEWbuubzYthmZcfCapooZGXhoYZWfTQ24TozbCQ=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556", + "rev": "9a1ca6b8cb4d86a599787a55b78f2ddf809bf945", "type": "github" }, "original": { @@ -84,11 +84,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1770895252, - "narHash": "sha256-TUGZVDcC5xsrWVnpBNosAG1cTy+aWchCWXPyeLZdnGM=", + "lastModified": 1776083220, + "narHash": "sha256-78QngptaPiKhlDuhUMrN/GDSHhXtEgMqnRSe3sjhjhM=", "ref": "refs/heads/main", - "rev": "2c86d41d07471f518e24f5cd1f586e4d2a32d12c", - "revCount": 1331, + "rev": "27d68a7b8b81b3b9afced39b32e06639d470c040", + "revCount": 1353, "type": "git", "url": "https://codeberg.org/LGFae/awww" }, @@ -124,11 +124,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1766051518, - "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=", + "lastModified": 1770019181, + "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=", "owner": "serokell", "repo": "deploy-rs", - "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa", + "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1768923567, - "narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=", + "lastModified": 1776613567, + "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=", "owner": "nix-community", "repo": "disko", - "rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28", + "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d", "type": "github" }, "original": { @@ -163,11 +163,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1768962893, - "narHash": "sha256-bBmNS3JE1+oF5s6avzuvFUtV9AcRkQxLadvJXQuXejs=", + "lastModified": 1776998143, + "narHash": "sha256-WmIvF3yOlPIYPUoJk3u41YR0qdsgeA4CPEAsZwzissY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "25bc2837dc80fed361e4ddc3f92b5f51d088386a", + "rev": "f9b22d9d611b13d68480d3e899877e2647f4f1a2", "type": "github" }, "original": { @@ -293,6 +293,22 @@ "type": "github" } }, + "flake-compat_7": { + "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-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -316,11 +332,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -351,24 +367,6 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "locked": { "lastModified": 1637014545, "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", @@ -383,7 +381,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { "systems": "systems_5" }, @@ -421,18 +419,18 @@ "ghostty": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils", "home-manager": "home-manager", "nixpkgs": "nixpkgs_3", + "systems": "systems_2", "zig": "zig", "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1768943356, - "narHash": "sha256-Mx4uoeXO40W2Jw8PVvE0eXx8rzOX2MSDVptz03Fn0HM=", + "lastModified": 1777032533, + "narHash": "sha256-lId8jQ+lToEKv5cmZXFRSwlOxeREIoEGnAe4QxonABM=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "dc43ded149968309c847e33c710989b1240daf9a", + "rev": "48ccec182a932c2ec04c344d45a5fc553861cb13", "type": "github" }, "original": { @@ -488,11 +486,11 @@ ] }, "locked": { - "lastModified": 1768068402, - "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=", + "lastModified": 1770586272, + "narHash": "sha256-Ucci8mu8QfxwzyfER2DQDbvW9t1BnTUJhBmY7ybralo=", "owner": "nix-community", "repo": "home-manager", - "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c", + "rev": "b1f916ba052341edc1f80d4b2399f1092a4873ca", "type": "github" }, "original": { @@ -508,11 +506,11 @@ ] }, "locked": { - "lastModified": 1768984719, - "narHash": "sha256-O6nXCW9FN39qw204e5Nl3qgaxKFcSvdpx0bULqfwyTA=", + "lastModified": 1777004352, + "narHash": "sha256-SV+9PgNwZ8jHVCjK6YaCBzaheLSW7cDnm5DpOYrD8Vw=", "owner": "nix-community", "repo": "home-manager", - "rev": "d6e3935ec6e43c8f54cd0132276c82d951e1453e", + "rev": "6012cf1fed3eba66115f3fd117b9be6bd2a15b2f", "type": "github" }, "original": { @@ -558,11 +556,11 @@ ] }, "locked": { - "lastModified": 1753964049, - "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", + "lastModified": 1776511930, + "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", + "rev": "39435900785d0c560c6ae8777d29f28617d031ef", "type": "github" }, "original": { @@ -587,11 +585,11 @@ ] }, "locked": { - "lastModified": 1766946335, - "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=", + "lastModified": 1776426399, + "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "4af02a3925b454deb1c36603843da528b67ded6c", + "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84", "type": "github" }, "original": { @@ -617,11 +615,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1768919552, - "narHash": "sha256-ixrDZEr5iwbzjGMbrknWSt8mb+EevYGZ0r291zo/KWg=", + "lastModified": 1777040476, + "narHash": "sha256-BEzeFZYo9J3wgKbtBhIhiK46NsRqvyEzN/euJq78Wco=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c44292c72339b3d7820ca7444d45bab7e34ec74e", + "rev": "e3c9b64812042ade8bec47499f461f2c7d36c184", "type": "github" }, "original": { @@ -663,11 +661,11 @@ ] }, "locked": { - "lastModified": 1767023960, - "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", + "lastModified": 1776426575, + "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", + "rev": "a968d211048e3ed538e47b84cb3649299578f19d", "type": "github" }, "original": { @@ -693,11 +691,11 @@ ] }, "locked": { - "lastModified": 1767723101, - "narHash": "sha256-jObY8O7OI+91hoE137APsDxm0235/Yx+HhFIip187zM=", + "lastModified": 1776702833, + "narHash": "sha256-xmzpa+kFv1zDei3nT1sWZ/Q9TdMK/Rhx1I09VuO2F3E=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "fef398ed5e4faf59bc43b915e46a75cfe8b16697", + "rev": "6acc0738f298f5efe40a99db2c12449112d65633", "type": "github" }, "original": { @@ -718,11 +716,11 @@ ] }, "locked": { - "lastModified": 1765214753, - "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", + "lastModified": 1772460177, + "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", + "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", "type": "github" }, "original": { @@ -747,11 +745,11 @@ ] }, "locked": { - "lastModified": 1764612430, - "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", + "lastModified": 1776426736, + "narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0d00dc118981531aa731150b6ea551ef037acddd", + "rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9", "type": "github" }, "original": { @@ -799,11 +797,11 @@ ] }, "locked": { - "lastModified": 1764592794, - "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", + "lastModified": 1772462885, + "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", + "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", "type": "github" }, "original": { @@ -824,11 +822,11 @@ ] }, "locked": { - "lastModified": 1766253372, - "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", + "lastModified": 1776428866, + "narHash": "sha256-XfRlBolGtjvalTHJp3XvvpYLBjkMhaZLLU0WqZ91Fcg=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", + "rev": "eedd60805cd96d4442586f2ba5fe51d549b12674", "type": "github" }, "original": { @@ -849,11 +847,11 @@ ] }, "locked": { - "lastModified": 1763640274, - "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", + "lastModified": 1776430932, + "narHash": "sha256-Yv3RPiUvl7CAsJgwIVsqcj7akn1gLyJP1F/mocof5hA=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", + "rev": "4c2fcc06dc9722c97dbb54ba649c69b18ce83d2e", "type": "github" }, "original": { @@ -878,11 +876,11 @@ ] }, "locked": { - "lastModified": 1767473322, - "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=", + "lastModified": 1776728575, + "narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11", + "rev": "f3a80888783702a39691b684d099e16b83ed4702", "type": "github" }, "original": { @@ -897,11 +895,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1768941735, - "narHash": "sha256-OyxsfXNcOkt06/kM+4bnuC8moDx+t7Qr+RB0BBa83Ig=", + "lastModified": 1769548169, + "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", "owner": "nix-community", "repo": "impermanence", - "rev": "69ecf31e8fddc9354a4b418f3a517445d486bb54", + "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", "type": "github" }, "original": { @@ -932,11 +930,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1764846550, - "narHash": "sha256-/2V2CC1rs1PPVwVBOwh15C6S7g+PMMreeWZTfEyTUAc=", + "lastModified": 1775729061, + "narHash": "sha256-3MotJ2seD7IXvyGpvBhzgEbERBHrWxeCrtGtOcdjEGQ=", "owner": "feschber", "repo": "lan-mouse", - "rev": "3922b45bd92f07f62e8af84bb9471abf8b0873a3", + "rev": "a878c985f0633a12b00a363883fd56385c2368e7", "type": "github" }, "original": { @@ -971,11 +969,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1771671174, - "narHash": "sha256-5yOc1wyqRPUBrKHyjxgKHjCIUA4WEiLpWhW1l6cOrdA=", + "lastModified": 1776999768, + "narHash": "sha256-RP7eVqbnQ/uNCXh0HH8SXRIerMlkyHco+wpI9oxon0U=", "owner": "DreamMaoMao", "repo": "mango", - "rev": "5f6f014debb8af0fc27b2a52f2569d984ada3ef9", + "rev": "b9c6a2c1964cb59536c5d3e02d2ff981a7eb36d2", "type": "github" }, "original": { @@ -1014,11 +1012,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1776829403, + "narHash": "sha256-oHVcvP2Ahhj1KUsEzp+2BQF55/r5VSa3QxdPdwE1p00=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "c43246d4e9e506178b69baed075d797ec2d873e2", "type": "github" }, "original": { @@ -1083,11 +1081,11 @@ ] }, "locked": { - "lastModified": 1768961914, - "narHash": "sha256-IBEuhAlNrOejnfxwYOINI41NVppt62OnLQLiMCNWBSo=", + "lastModified": 1777001568, + "narHash": "sha256-+VunBMPk/FWC5sGj9kDQn7OV0zzVAcO7bnCT/jSwFns=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "05bffac3f1450b1590161937e9eda5914f879ba9", + "rev": "5716665ea6f08119d993bd479b70bb4dde405f50", "type": "github" }, "original": { @@ -1100,14 +1098,15 @@ "inputs": { "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_7", + "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1768989380, - "narHash": "sha256-KIu8qNwASicLMpz6Qxn0R2iPuFtj5mk7QIPgIDQldXo=", + "lastModified": 1777020971, + "narHash": "sha256-Qkls1hkKGaHnbdgqXPTAYHkCSPt/RSVG2V1gxFPzpH4=", "owner": "kaylorben", "repo": "nixcord", - "rev": "19639266ff49f3db8dce2da3b697a527dd61f5fe", + "rev": "5f3ee03b5e027366bd58fb9b34649942a6418cf5", "type": "github" }, "original": { @@ -1118,11 +1117,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1768736227, - "narHash": "sha256-qgGq7CfrYKc3IBYQ7qp0Z/ZXndQVC5Bj0N8HW9mS2rM=", + "lastModified": 1776983936, + "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "d447553bcbc6a178618d37e61648b19e744370df", + "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61", "type": "github" }, "original": { @@ -1139,11 +1138,11 @@ ] }, "locked": { - "lastModified": 1768840529, - "narHash": "sha256-e22ou8nikeThx9x9/y29VdMEW4Fm7DBzlhp9ndDJUGE=", + "lastModified": 1776910211, + "narHash": "sha256-0ku3gW8bZ9TTpEU2fQw86oU6ZLT2vF6pacF+cLaf7VY=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "b8e9a758fa2e08d8ac5c3be5d4b1fcc92fd3ce84", + "rev": "4e6cad241baa0115a7aae8c55b04c166da4997c9", "type": "github" }, "original": { @@ -1193,11 +1192,11 @@ "parts": "parts" }, "locked": { - "lastModified": 1768967241, - "narHash": "sha256-a7WvVC3Mn42yn76Dx+vkX6jzy0XR7Qsje4/IqSpu1Q4=", + "lastModified": 1777007524, + "narHash": "sha256-1fUgYrVQ3BbmU5SXIVAnxjw0+sDaqgljhvH3QwvFnXU=", "owner": "moni-dz", "repo": "nixpkgs-f2k", - "rev": "d5dd1ac3bb5cc0c7f9f86b40314191121335adf3", + "rev": "ab39bcef53b40ab55f62ff3f2e52d967a58ec754", "type": "github" }, "original": { @@ -1209,7 +1208,7 @@ "nixpkgs-fmt": { "inputs": { "fenix": "fenix", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs-f2k", "nixpkgs" @@ -1262,11 +1261,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", "type": "github" }, "original": { @@ -1277,11 +1276,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", "type": "github" }, "original": { @@ -1290,18 +1289,34 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-nixcord": { "locked": { - "lastModified": 1767313136, - "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", + "lastModified": 1776434932, + "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", + "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1776734388, + "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -1324,11 +1339,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1768966538, - "narHash": "sha256-vviyJYeXuDaIGyR/gKZgWuxsuNesgqh6rYdUd7UZPBc=", + "lastModified": 1777005732, + "narHash": "sha256-HO0a+rQt2q84BRocHCAW1wqv/NVdEYuumLEwA4Z9rQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "047e298c755e32cc6ff87efcbffba52c91bf96c7", + "rev": "dfaa40e6a4455ff09bb1c9e0f59a5b6b161ea334", "type": "github" }, "original": { @@ -1340,11 +1355,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1768886240, - "narHash": "sha256-C2TjvwYZ2VDxYWeqvvJ5XPPp6U7H66zeJlRaErJKoEM=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "nixos", "repo": "nixpkgs", - "rev": "80e4adbcf8992d3fd27ad4964fbb84907f9478b0", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { @@ -1356,11 +1371,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1768569498, - "narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=", + "lastModified": 1775888245, + "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114", + "rev": "13043924aaa7375ce482ebe2494338e058282925", "type": "github" }, "original": { @@ -1388,11 +1403,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1768032153, - "narHash": "sha256-zvxtwlM8ZlulmZKyYCQAPpkm5dngSEnnHjmjV7Teloc=", - "rev": "3146c6aa9995e7351a398e17470e15305e6e18ff", + "lastModified": 1770537093, + "narHash": "sha256-XV30uo8tXuxdzuV8l3sojmlPRLd/8tpMsOp4lNzLGUo=", + "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre925418.3146c6aa9995/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre942631.fef9403a3e4d/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1401,11 +1416,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { @@ -1433,11 +1448,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1772963539, + "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", "type": "github" }, "original": { @@ -1449,11 +1464,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1766885793, - "narHash": "sha256-P6RVkrM9JLCW6xBjSwHfgTOQ1JwBUma5xe5LI8xAPC0=", + "lastModified": 1776434932, + "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ef261221d1e72399f2036786498d78c38185c46", + "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", "type": "github" }, "original": { @@ -1465,11 +1480,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1768886240, - "narHash": "sha256-C2TjvwYZ2VDxYWeqvvJ5XPPp6U7H66zeJlRaErJKoEM=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "nixos", "repo": "nixpkgs", - "rev": "80e4adbcf8992d3fd27ad4964fbb84907f9478b0", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { @@ -1481,11 +1496,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { @@ -1555,11 +1570,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1768987531, - "narHash": "sha256-OUuPCbbpt2TScCThL4xPByL5U7gOXQ83aJvXbtcnV9Y=", + "lastModified": 1777050782, + "narHash": "sha256-rourMcvw6wQiFVSsUWG6HxjN8osB6qtnQNOSZ4NCiFQ=", "owner": "nix-community", "repo": "nur", - "rev": "8e6425272de3f758a3b7103b49d6b7edbfb01b40", + "rev": "bf74b124845af237ff82976a37f74367ad599f77", "type": "github" }, "original": { @@ -1573,11 +1588,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -1596,11 +1611,11 @@ ] }, "locked": { - "lastModified": 1767281941, - "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", + "lastModified": 1776796298, + "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", + "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", "type": "github" }, "original": { @@ -1689,11 +1704,11 @@ ] }, "locked": { - "lastModified": 1752806774, - "narHash": "sha256-4cHeoR2roN7d/3J6gT+l6o7J2hTrBIUiCwVdDNMeXzE=", + "lastModified": 1773025773, + "narHash": "sha256-Wik8+xApNfldpUFjPmJkPdg0RrvUPSWGIZis+A/0N1w=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3c90219b3ba1c9790c45a078eae121de48a39c55", + "rev": "3c06fdbbd36ff60386a1e590ee0cd52dcd1892bf", "type": "github" }, "original": { @@ -1765,11 +1780,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1768863606, - "narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=", + "lastModified": 1776771786, + "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2", + "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598", "type": "github" }, "original": { @@ -1794,6 +1809,7 @@ } }, "systems_2": { + "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1941,11 +1957,11 @@ ] }, "locked": { - "lastModified": 1769515279, - "narHash": "sha256-uEUJVeCeFV7r0dd4sdQCXSwqFaB5ryCAuD6/xj9fpHc=", + "lastModified": 1771501010, + "narHash": "sha256-AvEVcS9/3/9zFGJqCjdnDGqyJSXTEAEGyR8q3Wfq1gU=", "owner": "tuxdotrs", "repo": "trok", - "rev": "f586506180cbe16dafeb286ff766715f68851a5b", + "rev": "e451f17df0356a8ff25eaf97f5c4503205d2750f", "type": "github" }, "original": { @@ -1999,6 +2015,7 @@ }, "vicinae-extensions": { "inputs": { + "flake-compat": "flake-compat_7", "nixpkgs": [ "nixpkgs" ], @@ -2006,11 +2023,11 @@ "vicinae": "vicinae" }, "locked": { - "lastModified": 1771192147, - "narHash": "sha256-m/OEmUIdpodyunJ4nLexiCordw0/pn1tWO3MLkoGuIM=", + "lastModified": 1777033580, + "narHash": "sha256-zl/d5Ghgdnjr0nwzF2wIx6TcKfQ964h6HzwHXHSrjB0=", "owner": "vicinaehq", "repo": "extensions", - "rev": "5bd1c123c10e4452df86c6a140f3cd5993547678", + "rev": "03d9a60a6883c88fa80b9e9f74e8721077c08349", "type": "github" }, "original": { @@ -2021,7 +2038,7 @@ }, "wezterm-flake": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", @@ -2033,11 +2050,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1768664668, - "narHash": "sha256-usmXju7tDaJZRicONAX0oduQPkOeahSJPCExuRt6dt4=", + "lastModified": 1774954828, + "narHash": "sha256-F6qDnwdVlX/JJhM7XYkgU2QtBfN1EQ9UysP2xVKAA6I=", "owner": "wez", "repo": "wezterm", - "rev": "05343b387085842b434d267f91b6b0ec157e4331", + "rev": "577474d89ee61aef4a48145cdec82a638d874751", "type": "github" }, "original": { @@ -2076,11 +2093,11 @@ ] }, "locked": { - "lastModified": 1761431178, - "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", + "lastModified": 1776608502, + "narHash": "sha256-UH8YoQxx4hFOm6qjMdjRQNRvSejFIR/wBZ8fW1p9sME=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", + "rev": "4a293523d36dfa367e67ec304cc718ea66a8fec2", "type": "github" }, "original": { @@ -2095,21 +2112,21 @@ "ghostty", "flake-compat" ], - "flake-utils": [ - "ghostty", - "flake-utils" - ], "nixpkgs": [ "ghostty", "nixpkgs" + ], + "systems": [ + "ghostty", + "systems" ] }, "locked": { - "lastModified": 1763295135, - "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=", + "lastModified": 1776789209, + "narHash": "sha256-G6B7Q4TXn7MZ1mB+f9rymjsYF5PLWoSvmbxijb/99bw=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a", + "rev": "14fe971844e841297ddd2ce9783d6892b467af39", "type": "github" }, "original": { @@ -2118,6 +2135,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" + } + }, "zlib": { "flake": false, "locked": { @@ -2140,20 +2179,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/hosts/canopus/default.nix b/hosts/canopus/default.nix index 0ab6012..12d8dc7 100755 --- a/hosts/canopus/default.nix +++ b/hosts/canopus/default.nix @@ -15,7 +15,6 @@ ../common ../../modules/nixos/desktop - ../../modules/nixos/desktop/awesome ../../modules/nixos/desktop/hyprland ../../modules/nixos/desktop/mango ../../modules/nixos/virtualisation @@ -286,7 +285,7 @@ supergfxd = { enable = true; settings = { - mode = "Integrated"; + mode = "Hybrid"; vfio_enable = false; vfio_save = false; always_reboot = false; @@ -298,7 +297,6 @@ asusd = { enable = true; - enableUserService = true; asusdConfig.text = '' ( charge_control_end_threshold: 80, diff --git a/hosts/canopus/home.nix b/hosts/canopus/home.nix index 2434367..999da00 100644 --- a/hosts/canopus/home.nix +++ b/hosts/canopus/home.nix @@ -1,11 +1,9 @@ {pkgs, ...}: { imports = [ - ../../modules/home/desktop/awesome ../../modules/home/desktop/hyprland ../../modules/home/desktop/mango ../../modules/home/desktop/vicinae ../../modules/home/desktop/utils - ../../modules/home/picom ../../modules/home/alacritty ../../modules/home/wezterm ../../modules/home/ghostty @@ -95,7 +93,6 @@ "Stuff" "Distrobox" "go" - ".mozilla" ".ssh" ".wakatime" ".rustup" @@ -104,6 +101,7 @@ ".cache/awww" ".cache/spotifyd" ".cache/spotify-player" + ".config/mozilla" ".config/BraveSoftware" ".config/vivaldi" ".config/Antigravity" diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix index bf61954..15b7cf4 100644 --- a/modules/home/desktop/hyprland/default.nix +++ b/modules/home/desktop/hyprland/default.nix @@ -16,7 +16,7 @@ systemd.variables = ["--all"]; plugins = with pkgs.hyprland-plugins; [ - hyprexpo + # hyprexpo ]; settings = let @@ -79,8 +79,11 @@ misc = { disable_hyprland_logo = true; force_default_wallpaper = 1; - vfr = true; - vrr = 1; + vrr = 0; + }; + + cursor = { + no_hardware_cursors = 1; }; ecosystem = { @@ -162,15 +165,15 @@ "workspace 7 silent, match:class (discord|org.telegram.desktop)" ]; - plugin = { - hyprexpo = { - columns = 3; - gap_size = 5; - bg_col = "rgb(111111)"; - workspace_method = "first 1"; - gesture_distance = 300; - }; - }; + # plugin = { + # hyprexpo = { + # columns = 3; + # gap_size = 5; + # bg_col = "rgb(111111)"; + # workspace_method = "first 1"; + # gesture_distance = 300; + # }; + # }; gesture = [ "3, horizontal, workspace" @@ -207,7 +210,7 @@ # hyprland "SUPER, Q, killactive" - "SUPER, grave, hyprexpo:expo, toggle" + # "SUPER, grave, hyprexpo:expo, toggle" "SUPER_SHIFT, Q, forcekillactive" "SUPER_SHIFT, F, fullscreen, 0" "SUPER_SHIFT, Space, exec, hyprctl dispatch togglefloating; hyprctl dispatch resizeactive exact 1200 800; hyprctl dispatch centerwindow;" @@ -290,7 +293,7 @@ "exec-once" = [ # load hyprland plugins - "hyprctl plugin load '$HYPR_PLUGIN_DIR/lib/libhyprexpo.so'" + # "hyprctl plugin load '$HYPR_PLUGIN_DIR/lib/libhyprexpo.so'" "easyeffects --w" "awww-daemon" diff --git a/modules/home/desktop/mango/default.nix b/modules/home/desktop/mango/default.nix index 884bd2d..d86ec77 100644 --- a/modules/home/desktop/mango/default.nix +++ b/modules/home/desktop/mango/default.nix @@ -5,210 +5,221 @@ wayland.windowManager.mango = { enable = true; - settings = '' + settings = { # Monitors - monitorrule = name:eDP-1, width:2560, height:1440, refresh:165, x:0, y:10, vrr:1 - monitorrule = name:HDMI-A-1, width:2560, height:1440, refresh:100, x:0, y:-1440, vrr:1 + monitorrule = [ + "name:eDP-1, width:2560, height:1440, refresh:165, x:0, y:10, vrr:1" + "name:HDMI-A-1, width:2560, height:1440, refresh:100, x:0, y:-1440, vrr:1" + ]; # Keyboard - repeat_rate = 25 - repeat_delay = 600 - numlockon = 0 - xkb_rules_layout = us + repeat_rate = 25; + repeat_delay = 600; + numlockon = 0; + xkb_rules_layout = "us"; # Trackpad - disable_trackpad = 0 - tap_to_click = 1 - tap_and_drag = 1 - drag_lock = 1 - trackpad_natural_scrolling = 1 - disable_while_typing = 1 - left_handed = 0 - middle_button_emulation = 0 - swipe_min_threshold = 1 + disable_trackpad = 0; + tap_to_click = 1; + tap_and_drag = 1; + drag_lock = 1; + trackpad_natural_scrolling = 1; + disable_while_typing = 1; + left_handed = 0; + middle_button_emulation = 0; + swipe_min_threshold = 1; # Mouse - mouse_natural_scrolling = 0 - accel_profile = 0 + mouse_natural_scrolling = 0; + accel_profile = 0; # Theme - border_radius = 8 - no_radius_when_single = 0 - focused_opacity = 1.0 - unfocused_opacity = 1.0 + border_radius = 8; + no_radius_when_single = 0; + focused_opacity = 1.0; + unfocused_opacity = 1.0; # Scroller Layout Setting - scroller_structs = 0 - scroller_default_proportion = 0.5 - scroller_ignore_proportion_single = 0 - scroller_default_proportion_single = 1.0 + scroller_structs = 0; + scroller_default_proportion = 0.5; + scroller_ignore_proportion_single = 0; + scroller_default_proportion_single = 1.0; # Master-Stack Layout Setting - new_is_master = 0 - default_mfact = 0.5 - default_nmaster = 1 - smartgaps = 0 + new_is_master = 0; + default_mfact = 0.5; + default_nmaster = 1; + smartgaps = 0; # Overview Setting - hotarea_size = 10 - enable_hotarea = 1 - ov_tab_mode = 0 - overviewgappi = 15 - overviewgappo = 15 + hotarea_size = 10; + enable_hotarea = 1; + ov_tab_mode = 0; + overviewgappi = 15; + overviewgappo = 15; # layouts - tagrule = id:1, layout_name:tile - tagrule = id:2, layout_name:tile - tagrule = id:3, layout_name:tile - tagrule = id:4, layout_name:tile - tagrule = id:5, layout_name:tile - tagrule = id:6, layout_name:scroller + tagrule = [ + "id:1, layout_name:tile" + "id:2, layout_name:tile" + "id:3, layout_name:tile" + "id:4, layout_name:tile" + "id:5, layout_name:tile" + "id:6, layout_name:scroller" + ]; # Keybindings - mousebind = SUPER, btn_left, moveresize, curmove - mousebind = SUPER, btn_right, moveresize, curresize - gesturebind = none, left, 3, viewtoright_have_client - gesturebind = none, right, 3, viewtoleft_have_client - gesturebind = none, up, 3, toggleoverview - gesturebind = none, down, 3, toggleoverview + mousebind = [ + "SUPER, btn_left, moveresize, curmove" + "SUPER, btn_right, moveresize, curresize" + ]; - # apps - bind = SUPER, Return, spawn, wezterm - bind = SUPER, Space, spawn, vicinae toggle - bind = SUPER, B, spawn, brave - bind = SUPER, V, spawn, vicinae vicinae://extensions/vicinae/clipboard/history - bind = SUPER+SHIFT, W, spawn, vicinae vicinae://extensions/sovereign/awww-switcher/wpgrid + gesturebind = [ + "none, right, 3, viewtoleft_have_client" + "none, up, 3, toggleoverview" + "none, down, 3, toggleoverview" + ]; - # WM - bind = SUPER, Q, killclient - bind = SUPER+SHIFT, R, reload_config - bind = SUPER+SHIFT, F, togglefullscreen - bind = SUPER+SHIFT, Space, togglefloating + bind = [ + # apps + "SUPER, Return, spawn, wezterm" + "SUPER, Space, spawn, vicinae toggle" + "SUPER, B, spawn, brave" + "SUPER, V, spawn, vicinae vicinae://extensions/vicinae/clipboard/history" + "SUPER+SHIFT, W, spawn, vicinae vicinae://extensions/sovereign/awww-switcher/wpgrid" - bind = ALT, Tab, toggleoverview - bind = ALT+SHIFT, minus, incgaps, -1 - bind = ALT+SHIFT, equal, incgaps, 1 - bind = ALT+SHIFT, R, togglegaps + # WM + "SUPER, Q, killclient" + "SUPER+SHIFT, R, reload_config" + "SUPER+SHIFT, F, togglefullscreen" + "SUPER+SHIFT, Space, togglefloating" - # switch layout - bind = SUPER+SHIFT, H, setlayout, tile - bind = SUPER+SHIFT, V, setlayout, vertical_tile - bind = SUPER+SHIFT, S, setlayout, scroller + "ALT, Tab, toggleoverview" + "ALT+SHIFT, minus, incgaps, -1" + "ALT+SHIFT, equal, incgaps, 1" + "ALT+SHIFT, R, togglegaps" - # resize client - bind = SUPER+CTRL, Up, resizewin, +0, -50 - bind = SUPER+CTRL, Down, resizewin, +0, +50 - bind = SUPER+CTRL, Left, resizewin, -50, +0 - bind = SUPER+CTRL, Right, resizewin, +50, +0 + # switch layout + "SUPER+SHIFT, H, setlayout, tile" + "SUPER+SHIFT, V, setlayout, vertical_tile" + "SUPER+SHIFT, S, setlayout, scroller" - # swap client - bind = SUPER+SHIFT, Up, exchange_client, up - bind = SUPER+SHIFT, Down, exchange_client, down - bind = SUPER+SHIFT, Left, exchange_client, left - bind = SUPER+SHIFT, Right, exchange_client, right + # resize client + "SUPER+CTRL, Up, resizewin, +0, -50" + "SUPER+CTRL, Down, resizewin, +0, +50" + "SUPER+CTRL, Left, resizewin, -50, +0" + "SUPER+CTRL, Right, resizewin, +50, +0" - # switch client focus - bind = SUPER, Tab, focusstack, next - bind = SUPER, Left, focusdir, left - bind = SUPER, Right, focusdir, right - bind = SUPER, Up, focusdir, up - bind = SUPER, Down, focusdir, down + # swap client + "SUPER+SHIFT, Up, exchange_client, up" + "SUPER+SHIFT, Down, exchange_client, down" + "SUPER+SHIFT, Left, exchange_client, left" + "SUPER+SHIFT, Right, exchange_client, right" - # switch view - bind = SUPER, 1, view, 1, 0 - bind = SUPER, 2, view, 2, 0 - bind = SUPER, 3, view, 3, 0 - bind = SUPER, 4, view, 4, 0 - bind = SUPER, 5, view, 5, 0 - bind = SUPER, 6, view, 6, 0 + # switch client focus + "SUPER, Tab, focusstack, next" + "SUPER, Left, focusdir, left" + "SUPER, Right, focusdir, right" + "SUPER, Up, focusdir, up" + "SUPER, Down, focusdir, down" - # move client to the tag with focus - bind = SUPER+SHIFT, 1, tagsilent, 1, 0 - bind = SUPER+SHIFT, 2, tagsilent, 2, 0 - bind = SUPER+SHIFT, 3, tagsilent, 3, 0 - bind = SUPER+SHIFT, 4, tagsilent, 4, 0 - bind = SUPER+SHIFT, 5, tagsilent, 5, 0 - bind = SUPER+SHIFT, 6, tagsilent, 6, 0 + # switch view + "SUPER, 1, view, 1, 0" + "SUPER, 2, view, 2, 0" + "SUPER, 3, view, 3, 0" + "SUPER, 4, view, 4, 0" + "SUPER, 5, view, 5, 0" + "SUPER, 6, view, 6, 0" - # move client to the tag without focus - bind = SUPER+ALT, 1, tag, 1, 0 - bind = SUPER+ALT, 2, tag, 2, 0 - bind = SUPER+ALT, 3, tag, 3, 0 - bind = SUPER+ALT, 4, tag, 4, 0 - bind = SUPER+ALT, 5, tag, 5, 0 - bind = SUPER+ALT, 6, tag, 6, 0 + # move client to the tag with focus + "SUPER+SHIFT, 1, tagsilent, 1, 0" + "SUPER+SHIFT, 2, tagsilent, 2, 0" + "SUPER+SHIFT, 3, tagsilent, 3, 0" + "SUPER+SHIFT, 4, tagsilent, 4, 0" + "SUPER+SHIFT, 5, tagsilent, 5, 0" + "SUPER+SHIFT, 6, tagsilent, 6, 0" + + # move client to the tag without focus + "SUPER+ALT, 1, tag, 1, 0" + "SUPER+ALT, 2, tag, 2, 0" + "SUPER+ALT, 3, tag, 3, 0" + "SUPER+ALT, 4, tag, 4, 0" + "SUPER+ALT, 5, tag, 5, 0" + "SUPER+ALT, 6, tag, 6, 0" + ]; # Window effect - blur = 0 - blur_layer = 0 - blur_optimized = 1 - blur_params_num_passes = 2 - blur_params_radius = 5 - blur_params_noise = 0.02 - blur_params_brightness = 0.9 - blur_params_contrast = 0.9 - blur_params_saturation = 1.2 + blur = 0; + blur_layer = 0; + blur_optimized = 1; + blur_params_num_passes = 2; + blur_params_radius = 5; + blur_params_noise = 0.02; + blur_params_brightness = 0.9; + blur_params_contrast = 0.9; + blur_params_saturation = 1.2; - shadows = 0 - layer_shadows = 0 - shadow_only_floating = 1 - shadows_size = 10 - shadows_blur = 15 - shadows_position_x = 0 - shadows_position_y = 0 - shadowscolor = 0x000000ff + shadows = 0; + layer_shadows = 0; + shadow_only_floating = 1; + shadows_size = 10; + shadows_blur = 15; + shadows_position_x = 0; + shadows_position_y = 0; + shadowscolor = "0x000000ff"; # Animation - animations = 1 - layer_animations = 1 - animation_type_open = slide - animation_type_close = fade - animation_fade_in = 1 - animation_fade_out = 1 - tag_animation_direction = 1 - zoom_initial_ratio = 0.3 - zoom_end_ratio = 0.8 - fadein_begin_opacity = 0.5 - fadeout_begin_opacity = 0.8 + animations = 1; + layer_animations = 1; + animation_type_open = "slide"; + animation_type_close = "fade"; + animation_fade_in = 1; + animation_fade_out = 1; + tag_animation_direction = 1; + zoom_initial_ratio = 0.3; + zoom_end_ratio = 0.8; + fadein_begin_opacity = 0.5; + fadeout_begin_opacity = 0.8; - animation_duration_move = 100 - animation_duration_open = 100 - animation_duration_close = 100 - animation_duration_tag = 200 - animation_duration_focus = 0 + animation_duration_move = 100; + animation_duration_open = 100; + animation_duration_close = 100; + animation_duration_tag = 200; + animation_duration_focus = 0; - animation_curve_open = 0.46, 1.0, 0.29, 1 - animation_curve_move = 0.46, 1.0, 0.29, 1 - animation_curve_tag = 0.46, 1.0, 0.29, 1 - animation_curve_close = 0.08, 0.92, 0, 1 - animation_curve_focus = 0.46, 1.0, 0.29, 1 - animation_curve_opafadeout = 0.5, 0.5, 0.5, 0.5 - animation_curve_opafadein = 0.46, 1.0, 0.29, 1 + animation_curve_open = "0.46, 1.0, 0.29, 1"; + animation_curve_move = "0.46, 1.0, 0.29, 1"; + animation_curve_tag = "0.46, 1.0, 0.29, 1"; + animation_curve_close = "0.08, 0.92, 0, 1"; + animation_curve_focus = "0.46, 1.0, 0.29, 1"; + animation_curve_opafadeout = "0.5, 0.5, 0.5, 0.5"; + animation_curve_opafadein = "0.46, 1.0, 0.29, 1"; # Appearance - borderpx = 0 - gappih = 10 - gappiv = 10 - gappoh = 10 - gappov = 10 + borderpx = 0; + gappih = 10; + gappiv = 10; + gappoh = 10; + gappov = 10; - rootcolor = 0x201b14ff - bordercolor = 0x444444ff - focuscolor = 0xc9b890ff - maximizescreencolor = 0x89aa61ff - urgentcolor = 0xad401fff - scratchpadcolor = 0x516c93ff - globalcolor = 0xb153a7ff - overlaycolor = 0x14a57cff + rootcolor = "0x201b14ff"; + bordercolor = "0x444444ff"; + focuscolor = "0xc9b890ff"; + maximizescreencolor = "0x89aa61ff"; + urgentcolor = "0xad401fff"; + scratchpadcolor = "0x516c93ff"; + globalcolor = "0xb153a7ff"; + overlaycolor = "0x14a57cff"; # Misc - adaptive_sync = 1 - syncobj_enable = 1 + syncobj_enable = 1; - exec-once = awww-daemon - exec-once = kdeconnectd - exec-once = kdeconnect-indicator - exec-once = dbus-update-activation-environment --systemd --all; systemctl --user reset-failed && systemctl --user start mango-session.target - ''; + exec-once = [ + "awww-daemon" + "kdeconnectd" + "kdeconnect-indicator" + "dbus-update-activation-environment --systemd --all; systemctl --user reset-failed && systemctl --user start mango-session.target" + ]; + }; }; } diff --git a/modules/home/firefox/default.nix b/modules/home/firefox/default.nix index 7a2390a..cd70d83 100644 --- a/modules/home/firefox/default.nix +++ b/modules/home/firefox/default.nix @@ -3,7 +3,7 @@ username, ... }: { - home.file.".mozilla/firefox/${username}/chrome".source = pkgs.firefox-mod-blur; + home.file.".config/mozilla/firefox/${username}/chrome".source = pkgs.firefox-mod-blur; programs.firefox = { enable = true; diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix index bbccb19..617d760 100755 --- a/modules/home/shell/default.nix +++ b/modules/home/shell/default.nix @@ -83,8 +83,8 @@ python312 python312Packages.pipx nodejs - nodePackages.pnpm - nodePackages.yarn + pnpm + yarn rustup bun nixpkgs-fmt diff --git a/modules/home/shell/open-code.nix b/modules/home/shell/open-code.nix index 256f54d..8042242 100644 --- a/modules/home/shell/open-code.nix +++ b/modules/home/shell/open-code.nix @@ -1,8 +1,10 @@ { programs.opencode = { enable = true; - settings = { + tui = { theme = "system"; + }; + settings = { provider = { google = { options = { diff --git a/modules/nixos/desktop/awesome/default.nix b/modules/nixos/desktop/awesome/default.nix index a35dd04..d79543e 100755 --- a/modules/nixos/desktop/awesome/default.nix +++ b/modules/nixos/desktop/awesome/default.nix @@ -48,7 +48,7 @@ polkit_gnome xdotool xclip - xorg.xbacklight + xbacklight gpick alsa-utils pavucontrol diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 17bf939..b62351a 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1,4 +1,23 @@ -{...}: { +{pkgs, ...}: { + services = { + displayManager = { + defaultSession = "none+awesome"; + ly = { + enable = true; + settings = { + session_log = "null"; + }; + }; + }; + + acpid.enable = true; + picom.enable = true; + upower.enable = true; + blueman.enable = true; + }; + + programs.dconf.enable = true; + xdg.mime = { enable = true; defaultApplications = { @@ -10,4 +29,27 @@ "x-scheme-handler/unknown" = ["brave-browser.desktop"]; }; }; + + environment.systemPackages = with pkgs; [ + acpi + linuxKernel.packages.linux_zen.acpi_call + inotify-tools + polkit_gnome + xdotool + xclip + xbacklight + gpick + alsa-utils + pavucontrol + brightnessctl + libnotify + feh + maim + mpdris2 + xdg-utils + playerctl + pulsemixer + easyeffects + procps + ]; } diff --git a/pkgs/firefox-mod-blur/default.nix b/pkgs/firefox-mod-blur/default.nix index a802414..2634ed6 100644 --- a/pkgs/firefox-mod-blur/default.nix +++ b/pkgs/firefox-mod-blur/default.nix @@ -11,14 +11,13 @@ stdenv.mkDerivation { owner = "datguypiko"; repo = "Firefox-Mod-Blur"; rev = "refs/heads/master"; - sha256 = "sha256-J/SBMxDWxDC7o8P0t/3surUod52uUwy+xaD5dzZPGq0="; + sha256 = "sha256-CkS0Jl30OBZTGAcL1ytoqJ9yzXg8a2JfuJbMw3+Tkj0="; }; installPhase = '' mkdir $out cp -r * "$out/" cp -r "$out/EXTRA MODS/Bookmarks Bar Mods/Bookmarks bar same color as toolbar/bookmarks_bar_same_color_as_toolbar.css" "$out/" - cp -r "$out/EXTRA MODS/Search Bar Mods/Search box - No search engine buttons/no_search_engines_in_url_bar.css" "$out/" ''; meta = with lib; {