diff --git a/flake.lock b/flake.lock index cfc17cb..75df541 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1766051518, - "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=", + "lastModified": 1770019181, + "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=", "owner": "serokell", "repo": "deploy-rs", - "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa", + "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1769824510, - "narHash": "sha256-eR1c/iKIHUXYW/PthilPJPO4/DnHQcVp2IpdIkgHJaw=", + "lastModified": 1770602774, + "narHash": "sha256-eRcZ279Oaf8ViHtvdWVTpcD9x7bvJ3ipQ1Xq9bd+qlk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "656fc2edb2d52e7cc547290df5e955325a80c0f8", + "rev": "a3d87c21d1464f1069d8125cafe6adb84d200185", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1769676024, - "narHash": "sha256-OT08V+jMGDsIOW13IFnnobCp05uMv5e+tHNUG+dBBZo=", + "lastModified": 1770539655, + "narHash": "sha256-Uik4la853QtCQJFfAuTroT88Al/LToTS0QGQe353Crc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "18760112ac0d63955060cddbe99881d18a94a23d", + "rev": "e78fc8deedcaab439fedc8cac7229d8ff0f68027", "type": "github" }, "original": { @@ -284,11 +284,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -305,11 +305,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -323,11 +323,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -492,11 +492,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1769721111, - "narHash": "sha256-mwB7UaBiIY7trRH3rJXAMHOrjtcXRAEnp2LGoKzsc34=", + "lastModified": 1770596905, + "narHash": "sha256-ramJSHL39uTmfpY2O3zFd0IUiVPDNR1edCq0nIHEcAs=", "owner": "helix-editor", "repo": "helix", - "rev": "476ae24cc40b5a81522cbf37efe848860b44f434", + "rev": "066dded21b7c520bfa114780907265eda801004b", "type": "github" }, "original": { @@ -513,11 +513,11 @@ ] }, "locked": { - "lastModified": 1769813945, - "narHash": "sha256-9ABv9Lo9t6MrFjlnRnU8Zw1C6LVj2+R8PipQ/rxGLHk=", + "lastModified": 1770586272, + "narHash": "sha256-Ucci8mu8QfxwzyfER2DQDbvW9t1BnTUJhBmY7ybralo=", "owner": "nix-community", "repo": "home-manager", - "rev": "475921375def3eb930e1f8883f619ff8609accb6", + "rev": "b1f916ba052341edc1f80d4b2399f1092a4873ca", "type": "github" }, "original": { @@ -610,11 +610,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1769731486, - "narHash": "sha256-FubWXQX1k1qyVKWiGNVSw2bQ2TD739PRqRsLXS/b2y0=", + "lastModified": 1770595508, + "narHash": "sha256-d81J55C/ctzfofd10e4k8Bldm1eXKuVaQAewbZPjHN4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0d454d45604a3215057806757beda9bc7390d59e", + "rev": "58b19445f29efe3b94db874fc64407099de0f0f7", "type": "github" }, "original": { @@ -626,11 +626,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1769723720, - "narHash": "sha256-gmlHBj1nGfOBaCMEfgHdy/4sbuBXDaVIWNGJVPP+vNw=", + "lastModified": 1770587030, + "narHash": "sha256-2CaAx32akEOjUwkKnkvMWsHLhMvoIZ/SsV4ByiEIxfg=", "owner": "neovim", "repo": "neovim", - "rev": "52cd9dcff260decda860cf154873b298d10c1208", + "rev": "19379d1255554041eb6d67423cfa83ca23e5be42", "type": "github" }, "original": { @@ -651,11 +651,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1769714858, - "narHash": "sha256-IHHAKi8yMonZZmVHUQxew1V9UfLBG8Um9PLbNPx3OA4=", + "lastModified": 1770597374, + "narHash": "sha256-eroNnfweC+C1qzwEFtPFCk7L9wSUIKabYAXQVK4Dtlg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "dfbb02586582d5332d0c06653583b9d743bce081", + "rev": "10aa0ca9d1b2ce08c4351a34bbb2fb5a64340a8a", "type": "github" }, "original": { @@ -684,11 +684,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1769577126, - "narHash": "sha256-v9vz9Rj4MGwPuhGELdvpRKl2HH+xvkgat6VwL0L86Fg=", + "lastModified": 1770394936, + "narHash": "sha256-Pa0fkyLYUR+pZh7phPENDUo4mJIweaAm0uV83iUUlX8=", "owner": "YaLTeR", "repo": "niri", - "rev": "f30db163b5748e8cf95c05aba77d0d3736f40543", + "rev": "549148d27779d024255a84535b42b947f1c2a113", "type": "github" }, "original": { @@ -707,11 +707,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1769677259, - "narHash": "sha256-On/Ue/+X9Ikg5vti1gnOFqP1PsOjlJgrrM6HIrngiL0=", + "lastModified": 1770540718, + "narHash": "sha256-GJrR3PSPJpmEP/X14aLFBlADKuA5pXmPTymgVPLiJJg=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "446cdd1a7c065865f79135745d835ccc04e6197e", + "rev": "2d515fc37d205ff5b0cc8cb44c9d091e3c060842", "type": "github" }, "original": { @@ -726,11 +726,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1769826495, - "narHash": "sha256-jyfGSLu7TjgwaZb7wgUJnAEtcoksqG4f0LORh4JBcdM=", + "lastModified": 1770605007, + "narHash": "sha256-QeDZL8lMz3U318x3q7gb5gyrg2uWnr1Mjlyw5IngEG8=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "84471e0ca212961bd297a2b9017582041c903ddd", + "rev": "4ea62f3a1990c0ad09ff46a177e1cdba6428a43d", "type": "github" }, "original": { @@ -750,11 +750,11 @@ ] }, "locked": { - "lastModified": 1769832438, - "narHash": "sha256-Z2ARPCjrrylnXnC0zZDj81e137Vtfa11v57NZl+rBEU=", + "lastModified": 1770525359, + "narHash": "sha256-l8JfOrAPUsJ3Gr+JR56RxpzV9gwL9U7xIFfJt8c1a/Y=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "c117d404536f6f35c709eed79687b615b96eb4d0", + "rev": "df0761ff98ba2f49034ba9edc0f96ee499e602c9", "type": "github" }, "original": { @@ -781,11 +781,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -795,22 +795,6 @@ "type": "github" } }, - "nixpkgs-485356": { - "locked": { - "lastModified": 1769787892, - "narHash": "sha256-mvKmjiiNOTooYiE1vTGLJRsASPB+v1P0cyU1T56w0oI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c90394bd7b97bf48a653d3483c33c3ac2748489d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "refs/pull/485356/head", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-485603": { "locked": { "lastModified": 1769860058, @@ -829,11 +813,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "rev": "72716169fe93074c333e8d0173151350670b824c", "type": "github" }, "original": { @@ -860,11 +844,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1769598131, - "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", + "lastModified": 1770464364, + "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", + "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", "type": "github" }, "original": { @@ -908,11 +892,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1769527094, - "narHash": "sha256-xV20Alb7ZGN7qujnsi5lG1NckSUmpIb05H2Xar73TDc=", + "lastModified": 1770537093, + "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "afce96367b2e37fc29afb5543573cd49db3357b7", + "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", "type": "github" }, "original": { @@ -924,11 +908,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1769268028, - "narHash": "sha256-mAdJpV0e5IGZjnE4f/8uf0E4hQR7ptRP00gnZKUOdMo=", + "lastModified": 1770380644, + "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab9fbbcf4858bd6d40ba2bbec37ceb4ab6e1f562", + "rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe", "type": "github" }, "original": { @@ -940,11 +924,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -956,11 +940,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1768875095, - "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=", + "lastModified": 1770169770, + "narHash": "sha256-awR8qIwJxJJiOmcEGgP2KUqYmHG4v/z8XpL9z8FnT1A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0", + "rev": "aa290c9891fa4ebe88f8889e59633d20cc06a5f2", "type": "github" }, "original": { @@ -972,11 +956,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -988,11 +972,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", "type": "github" }, "original": { @@ -1009,11 +993,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1769644746, - "narHash": "sha256-1X9o0GjCzku03magX4pM+1OZXA0aUTN7KvEReZ9t3OU=", + "lastModified": 1770388595, + "narHash": "sha256-0NvpmDqFcJAtRFJE3RDZWnN7PDJBZutoDtN+Cl8a3DY=", "owner": "nix-community", "repo": "nixvim", - "rev": "3c27e1b35ca0fee6a89bfc20840654361ffe888d", + "rev": "51abc532525e486176f9a7b24b17908c60017b54", "type": "github" }, "original": { @@ -1029,11 +1013,11 @@ ] }, "locked": { - "lastModified": 1769831457, - "narHash": "sha256-UCHlDVBQe0QGmcra1Oq9yX4LqLGkEPV7I6XvR4eq+oc=", + "lastModified": 1770612565, + "narHash": "sha256-fptkFYS0dap7MEo/UpC+LIUa8KYO1BbqviV4xIKs+Rg=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "131740dcc01af2d0372e169b060984bfe8afaa7a", + "rev": "c2b3419b7f19b67a73d0f22bbd31c8e5d430e050", "type": "github" }, "original": { @@ -1048,11 +1032,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1769834069, - "narHash": "sha256-GjeN/5TdWev/L/Izem3XScV6i/55Z+n+GfjKa1srBcU=", + "lastModified": 1770609856, + "narHash": "sha256-ddzfyTBEX9v+s6xuQqUcX7Gl/QiH3GquK2o+UA5BOBY=", "owner": "nix-community", "repo": "NUR", - "rev": "2db81de33100ef4d86ebc80dc4bc30df1fe97c5d", + "rev": "fbb61a1c12ecb25073bcc3dc0583213ccbec7a22", "type": "github" }, "original": { @@ -1144,7 +1128,6 @@ "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_6", - "nixpkgs-485356": "nixpkgs-485356", "nixpkgs-485603": "nixpkgs-485603", "nixvim": "nixvim", "noctalia": "noctalia", @@ -1206,11 +1189,11 @@ ] }, "locked": { - "lastModified": 1769469829, - "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=", + "lastModified": 1770526836, + "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff", + "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d", "type": "github" }, "original": { @@ -1222,11 +1205,11 @@ "spacemacs": { "flake": false, "locked": { - "lastModified": 1768512276, - "narHash": "sha256-QG3Xqwr49n0p9B8t5fIOid3JfCb1tDg3XpfHfi1XZLM=", + "lastModified": 1770245509, + "narHash": "sha256-ox5DYVDxS5oag6HckdyiKlWeW6pxZlEbCu6SQapQ040=", "owner": "syl20bnr", "repo": "spacemacs", - "rev": "e5b6fbb74618716dbaa24c1ac6b6cd2061058a24", + "rev": "de56b66b5f38db05f9da30dde9698a8d5eb2beb7", "type": "github" }, "original": { @@ -1258,11 +1241,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769819994, - "narHash": "sha256-AJB2hcg1OgocLGuVdot9HyCD+Kv+a6znhY2i3XqcZYU=", + "lastModified": 1770587906, + "narHash": "sha256-N9ZTG3ia7l4iQO+9JlOj+sX4yu6gl7a3aozrlhSIJwQ=", "owner": "nix-community", "repo": "stylix", - "rev": "8b14679c0e1570b0e137f0f7997717be0fdf2cf2", + "rev": "72e6483a88d51471a6c55e1d43e7ed2bc47a76a4", "type": "github" }, "original": { @@ -1447,11 +1430,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1769691507, - "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=", + "lastModified": 1770228511, + "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b", + "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", "type": "github" }, "original": { @@ -1480,11 +1463,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1769713942, - "narHash": "sha256-0BtCSO2qzYK/akRDsERqRVLknCYD3FYErc+szreSHUo=", + "lastModified": 1770583271, + "narHash": "sha256-Q75S8cEqJoZ92s1y4zArvk2U1ayAy2E4SaF7gbNXkYQ=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "37ec78ee26e158b71f42e113e0e7dd9d5eb6bdb0", + "rev": "86f5bd5d867ad6e120935dfe825f6b903ebbeddd", "type": "github" }, "original": { @@ -1503,11 +1486,11 @@ ] }, "locked": { - "lastModified": 1769748063, - "narHash": "sha256-H5XCtJMS3RQKHeaS+axX7CAJ0WwuTUYGy4uzLFSm0Xc=", + "lastModified": 1770568363, + "narHash": "sha256-RJ/C24wN7LyuMmBgvIutA/PqXXceZtJtUCuZSaTjF/4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "efdd1e683da9412f515b9bd42c37861978c2fd3a", + "rev": "2ada8a826ea88512387a5a17ee96f16369bcdd80", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e368cb4..cc15964 100644 --- a/flake.nix +++ b/flake.nix @@ -50,13 +50,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; # nixpkgs.url = "github:NixOS/nixpkgs/master"; - ## fix ffmpeg_7-full - nixpkgs-485356 = { - type = "github"; - owner = "nixos"; - repo = "nixpkgs"; - ref = "refs/pull/485356/head"; - }; ## update rqbit nixpkgs-485603 = { type = "github"; diff --git a/home/david/modules/programs/noctalia/settings.json b/home/david/modules/programs/noctalia/settings.json index 5772029..d6b6bd0 100644 --- a/home/david/modules/programs/noctalia/settings.json +++ b/home/david/modules/programs/noctalia/settings.json @@ -1,34 +1,46 @@ { - "settingsVersion": 41, + "settingsVersion": 49, "bar": { + "barType": "simple", "position": "right", "monitors": [], - "density": "comfortable", + "density": "spacious", "showOutline": false, "showCapsule": true, "capsuleOpacity": 1, + "capsuleColorKey": "none", "backgroundOpacity": 0.93, "useSeparateOpacity": false, "floating": false, "marginVertical": 4, "marginHorizontal": 4, + "frameThickness": 8, + "frameRadius": 12, "outerCorners": true, - "exclusive": true, "hideOnOverview": false, + "displayMode": "always_visible", + "autoHideDelay": 500, + "autoShowDelay": 150, "widgets": { "left": [ { "compactMode": true, "diskPath": "/", + "iconColor": "none", "id": "SystemMonitor", - "showCpuTemp": true, + "showCpuFreq": false, + "showCpuTemp": false, "showCpuUsage": true, + "showDiskAvailable": false, "showDiskUsage": true, - "showGpuTemp": false, + "showDiskUsageAsPercent": false, + "showGpuTemp": true, "showLoadAverage": true, - "showMemoryAsPercent": true, + "showMemoryAsPercent": false, "showMemoryUsage": true, "showNetworkStats": true, + "showSwapUsage": true, + "textColor": "none", "useMonospaceFont": true, "usePrimaryColor": false }, @@ -47,37 +59,31 @@ "showArtistFirst": false, "showProgressRing": true, "showVisualizer": false, + "textColor": "none", "useFixedWidth": false, "visualizerType": "wave" } ], "center": [ - { - "colorizeIcons": false, - "hideMode": "hidden", - "iconScale": 0.8, - "id": "Taskbar", - "maxTaskbarWidth": 40, - "onlyActiveWorkspaces": true, - "onlySameOutput": true, - "showPinnedApps": true, - "showTitle": false, - "smartWidth": true, - "titleWidth": 120 - }, { "characterCount": 2, "colorizeIcons": false, + "emptyColor": "tertiary", "enableScrollWheel": true, + "focusedColor": "primary", "followFocusedScreen": false, "groupedBorderOpacity": 1, "hideUnoccupied": true, - "iconScale": 0.8, + "iconScale": 0.6, "id": "Workspace", "labelMode": "index", - "showApplications": false, + "occupiedColor": "secondary", + "pillSize": 0.6, + "reverseScroll": false, + "showApplications": true, + "showBadge": true, "showLabelsOnlyWhenOccupied": true, - "unfocusedIconsOpacity": 1 + "unfocusedIconsOpacity": 0.5 } ], "right": [ @@ -86,38 +92,49 @@ }, { "displayMode": "onhover", - "id": "Brightness" + "iconColor": "none", + "id": "Brightness", + "textColor": "none" }, { "hideWhenZero": false, "hideWhenZeroUnread": false, + "iconColor": "none", "id": "NotificationHistory", - "showUnreadBadge": true + "showUnreadBadge": true, + "unreadBadgeColor": "primary" }, { "displayMode": "onhover", + "iconColor": "none", "id": "Volume", - "middleClickCommand": "pwvucontrol || pavucontrol" + "middleClickCommand": "pwvucontrol || pavucontrol", + "textColor": "none" }, { "blacklist": [], + "chevronColor": "none", "colorizeIcons": false, "drawerEnabled": true, "hidePassive": false, "id": "Tray", - "pinned": ["Fcitx"] + "pinned": [ + "Fcitx" + ] }, { + "clockColor": "none", "customFont": "", "formatHorizontal": "HH:mm ddd, MMM dd", - "formatVertical": "HH mm - dd MM", + "formatVertical": "HH mm - MM dd", "id": "Clock", - "tooltipFormat": "HH:mm ddd, MMM dd", + "tooltipFormat": "HH:mm:ss ddd, MMM dd yyyy", "useCustomFont": false, "usePrimaryColor": true } ] - } + }, + "screenOverrides": [] }, "general": { "dimmerOpacity": 0, @@ -131,6 +148,7 @@ "animationSpeed": 2, "animationDisabled": false, "compactLockScreen": true, + "lockScreenAnimations": true, "lockOnSuspend": true, "showSessionButtonsOnLockScreen": true, "showHibernateOnLockScreen": true, @@ -141,7 +159,14 @@ "language": "zh-CN", "allowPanelsOnScreenWithoutBar": true, "showChangelogOnStartup": true, - "telemetryEnabled": true + "telemetryEnabled": true, + "enableLockScreenCountdown": true, + "lockScreenCountdownDuration": 10000, + "autoStartAuth": false, + "allowPasswordWithFprintd": false, + "clockStyle": "digital", + "clockFormat": "hh\\nmm", + "lockScreenMonitors": [] }, "ui": { "fontDefault": "Source Han Serif SC", @@ -192,13 +217,14 @@ "overviewEnabled": false, "monitorDirectories": [], "enableMultiMonitorDirectories": false, - "recursiveSearch": true, + "showHiddenFiles": false, + "viewMode": "recursive", "setWallpaperOnAllMonitors": true, "fillMode": "crop", "fillColor": "#000000", "useSolidColor": false, "solidColor": "#1a1a2e", - "randomEnabled": true, + "automationEnabled": true, "wallpaperChangeMode": "random", "randomIntervalSec": 900, "transitionDuration": 1500, @@ -216,13 +242,16 @@ "wallhavenApiKey": "", "wallhavenResolutionMode": "atleast", "wallhavenResolutionWidth": "", - "wallhavenResolutionHeight": "" + "wallhavenResolutionHeight": "", + "sortOrder": "name" }, "appLauncher": { "enableClipboardHistory": true, "autoPasteClipboard": false, "enableClipPreview": true, "clipboardWrapText": true, + "clipboardWatchTextCommand": "wl-paste --type text --watch cliphist store", + "clipboardWatchImageCommand": "wl-paste --type image --watch cliphist store", "position": "center", "pinnedApps": [], "useApp2Unit": true, @@ -234,8 +263,11 @@ "showCategories": true, "iconMode": "tabler", "showIconBackground": true, + "enableSettingsSearch": true, + "enableWindowsSearch": true, "ignoreMouseInput": false, - "screenshotAnnotationTool": "" + "screenshotAnnotationTool": "", + "overviewLayer": false }, "controlCenter": { "position": "close_to_bar_button", @@ -294,15 +326,20 @@ "gpuCriticalThreshold": 90, "memWarningThreshold": 80, "memCriticalThreshold": 90, + "swapWarningThreshold": 80, + "swapCriticalThreshold": 90, "diskWarningThreshold": 80, "diskCriticalThreshold": 90, - "cpuPollingInterval": 3000, - "tempPollingInterval": 3000, + "diskAvailWarningThreshold": 20, + "diskAvailCriticalThreshold": 10, + "batteryWarningThreshold": 20, + "batteryCriticalThreshold": 5, + "cpuPollingInterval": 1000, "gpuPollingInterval": 3000, "enableDgpuMonitoring": true, - "memPollingInterval": 3000, + "memPollingInterval": 1000, "diskPollingInterval": 3000, - "networkPollingInterval": 3000, + "networkPollingInterval": 1000, "loadAvgPollingInterval": 3000, "useCustomColors": false, "warningColor": "", @@ -346,37 +383,43 @@ "action": "lock", "command": "", "countdownEnabled": true, - "enabled": true + "enabled": true, + "keybind": "" }, { "action": "suspend", "command": "", "countdownEnabled": true, - "enabled": true + "enabled": true, + "keybind": "" }, { "action": "hibernate", "command": "", "countdownEnabled": true, - "enabled": true + "enabled": true, + "keybind": "" }, { "action": "reboot", "command": "", "countdownEnabled": true, - "enabled": true + "enabled": true, + "keybind": "" }, { "action": "logout", "command": "", "countdownEnabled": true, - "enabled": true + "enabled": true, + "keybind": "" }, { "action": "shutdown", "command": "", "countdownEnabled": true, - "enabled": true + "enabled": true, + "keybind": "" } ] }, @@ -390,7 +433,6 @@ "lowUrgencyDuration": 3, "normalUrgencyDuration": 8, "criticalUrgencyDuration": 15, - "enableKeyboardLayoutToast": true, "saveToHistory": { "low": true, "normal": true, @@ -405,7 +447,9 @@ "lowSoundFile": "", "excludedApps": "discord,firefox,chrome,chromium,edge" }, - "enableMediaToast": false + "enableMediaToast": false, + "enableKeyboardLayoutToast": true, + "enableBatteryToast": true }, "osd": { "enabled": true, @@ -413,7 +457,12 @@ "autoHideMs": 2000, "overlayLayer": true, "backgroundOpacity": 1, - "enabledTypes": [0, 1, 2, 3], + "enabledTypes": [ + 0, + 1, + 2, + 3 + ], "monitors": [] }, "audio": { @@ -422,7 +471,8 @@ "cavaFrameRate": 165, "visualizerType": "mirrored", "mprisBlacklist": [], - "preferredPlayer": "spotify, mpv" + "preferredPlayer": "spotify, mpv", + "volumeFeedback": false }, "brightness": { "brightnessStep": 1, @@ -432,15 +482,16 @@ "colorSchemes": { "useWallpaperColors": false, "predefinedScheme": "Catppuccin", - "darkMode": true, + "darkMode": false, "schedulingMode": "location", "manualSunrise": "06:30", "manualSunset": "18:30", - "matugenSchemeType": "scheme-fruit-salad" + "generationMethod": "tonal-spot", + "monitorForColors": "" }, "templates": { "activeTemplates": [], - "enableUserTemplates": false + "enableUserTheming": false }, "nightLight": { "enabled": false, @@ -459,8 +510,12 @@ "screenUnlock": "", "performanceModeEnabled": "", "performanceModeDisabled": "", + "startup": "", "session": "" }, + "plugins": { + "autoUpdate": false + }, "desktopWidgets": { "enabled": true, "gridSnap": true, @@ -469,13 +524,14 @@ "name": "eDP-1", "widgets": [ { + "clockColor": "none", "clockStyle": "minimal", "customFont": "", - "format": "HH:mm\\nd MMMM yyyy", + "format": "HH:mm:ss\\nMMMM d yyyy", "id": "Clock", "roundedCorners": true, "scale": 1.1985607401441287, - "showBackground": false, + "showBackground": true, "useCustomFont": false, "usePrimaryColor": true, "x": 68, diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 45cb5bd..2cccd38 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -16,9 +16,6 @@ in ./vim.nix ./prismlauncher.nix - ./fix-ffmpeg_7-full.nix - ./fix-kdePackages.kdenlive.nix - ./fix-rqbit.nix # Nur diff --git a/overlays/modifications/fix-ffmpeg_7-full.nix b/overlays/modifications/fix-ffmpeg_7-full.nix deleted file mode 100644 index 0528464..0000000 --- a/overlays/modifications/fix-ffmpeg_7-full.nix +++ /dev/null @@ -1,14 +0,0 @@ -{inputs, ...}: _final: prev: let - inherit (prev.stdenv.hostPlatform) system; - pkgs = import inputs.nixpkgs-485356 { - localSystem = { - inherit system; - }; - config = { - allowUnfree = true; - cudaSupport = true; - }; - }; -in { - ffmpeg_7-full = pkgs.ffmpeg_7-full; -} diff --git a/overlays/modifications/fix-kdePackages.kdenlive.nix b/overlays/modifications/fix-kdePackages.kdenlive.nix deleted file mode 100644 index b742843..0000000 --- a/overlays/modifications/fix-kdePackages.kdenlive.nix +++ /dev/null @@ -1,9 +0,0 @@ -{...}: final: prev: { - kdePackages = - prev.kdePackages - // { - kdenlive = prev.kdePackages.kdenlive.override { - ffmpeg-full = final.ffmpeg_7-full; - }; - }; -} diff --git a/pkgs/editor-runtime.nix b/pkgs/editor-runtime.nix index 83b35bc..58177f8 100644 --- a/pkgs/editor-runtime.nix +++ b/pkgs/editor-runtime.nix @@ -35,7 +35,7 @@ haskell-language-server, neocmakelsp, jdt-language-server, - zls, + # zls, ty, imagemagick, }: @@ -77,7 +77,7 @@ buildEnv { haskell-language-server neocmakelsp jdt-language-server - zls + # zls ty imagemagick ];