diff --git a/flake.lock b/flake.lock index 833ae48..e83ae41 100644 --- a/flake.lock +++ b/flake.lock @@ -1,53 +1,5 @@ { "nodes": { - "ags": { - "inputs": { - "astal": "astal", - "nixpkgs": [ - "hyprpanel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736090999, - "narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=", - "owner": "aylur", - "repo": "ags", - "rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "ags", - "type": "github" - } - }, - "apple-fonts": { - "inputs": { - "nixpkgs": "nixpkgs", - "ny": "ny", - "sf-arabic": "sf-arabic", - "sf-armenian": "sf-armenian", - "sf-compact": "sf-compact", - "sf-georgian": "sf-georgian", - "sf-hebrew": "sf-hebrew", - "sf-mono": "sf-mono", - "sf-pro": "sf-pro" - }, - "locked": { - "lastModified": 1740961576, - "narHash": "sha256-9L6d3owtajM72YvUOpK1zYle2nM0BpsuopbF9lm9lJs=", - "owner": "Lyndeno", - "repo": "apple-fonts.nix", - "rev": "4df58996ed654f6ce9b71b41c1826484c6870739", - "type": "github" - }, - "original": { - "owner": "Lyndeno", - "repo": "apple-fonts.nix", - "type": "github" - } - }, "aquamarine": { "inputs": { "hyprutils": [ @@ -68,11 +20,11 @@ ] }, "locked": { - "lastModified": 1739298463, - "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=", + "lastModified": 1749155310, + "narHash": "sha256-t0HfHg/1+TbSra5s6nNM0o4tnb3uqWedShSpZXsUMYY=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16", + "rev": "94981cf75a9f11da0b6dd6a1abbd7c50a36ab2d3", "type": "github" }, "original": { @@ -81,38 +33,16 @@ "type": "github" } }, - "astal": { - "inputs": { - "nixpkgs": [ - "hyprpanel", - "ags", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735172721, - "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=", - "owner": "aylur", - "repo": "astal", - "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -140,11 +70,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1736852337, - "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "lastModified": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "type": "github" }, "original": { @@ -172,18 +102,17 @@ }, "firefox-addons": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1741147406, - "narHash": "sha256-sXP9Iz+DSfnS45XzlVIxnsGw3SOwlGWGogJB0MxALEw=", + "lastModified": 1750392203, + "narHash": "sha256-rJU+WeeLxDinRWEGXw5OT4tToIAO8zy/ULFVWHhLp/Q=", "owner": "rycee", "repo": "nur-expressions", - "rev": "b8236b71159b0090b722eb686ec38612de854ddb", + "rev": "09e3cfed476fc06384610a7e6027df221fc93bd3", "type": "gitlab" }, "original": { @@ -196,11 +125,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1739223196, - "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -227,11 +156,11 @@ }, "flake-compat_2": { "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -248,11 +177,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -265,16 +194,15 @@ "inputs": { "nixpkgs-lib": [ "stylix", - "nur", "nixpkgs" ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -284,21 +212,6 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1629284811, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": "systems_3" }, @@ -316,27 +229,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "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" - } - }, "fromYaml": { "flake": false, "locked": { @@ -366,11 +258,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -426,16 +318,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } @@ -447,11 +339,11 @@ ] }, "locked": { - "lastModified": 1741128660, - "narHash": "sha256-GWaZ+KGxWYbOB15CSqktwngq0ccA1l2Ov3aUfl9jeY4=", + "lastModified": 1750304462, + "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "owner": "nix-community", "repo": "home-manager", - "rev": "b1b964ea9348aef08cab514fa88e9c99def6fd63", + "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "type": "github" }, "original": { @@ -468,11 +360,11 @@ ] }, "locked": { - "lastModified": 1740347597, - "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=", + "lastModified": 1748737919, + "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449", + "rev": "5675a9686851d9626560052a032c4e14e533c1fa", "type": "github" }, "original": { @@ -497,11 +389,11 @@ ] }, "locked": { - "lastModified": 1738664950, - "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", + "lastModified": 1749155331, + "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", + "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", "type": "github" }, "original": { @@ -526,11 +418,11 @@ ] }, "locked": { - "lastModified": 1739049071, - "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", + "lastModified": 1749238452, + "narHash": "sha256-8qiKEWcxUrjpUpK+WyFNg/72C8rp70LUuyTD23T+SdQ=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", + "rev": "c7225d73755a6c4c7c72f4d4f3925ea426e325a8", "type": "github" }, "original": { @@ -549,22 +441,22 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1741035361, - "narHash": "sha256-WSfqkzWUY8FMFnaGm0n9QcoO0cgqJbYcv3ccfkFv7Qw=", + "lastModified": 1750373382, + "narHash": "sha256-HsBt7sl2ODSHv1LxKxA47j7klCqY4k3fE4SQGnEO0Ac=", "owner": "hyprwm", - "repo": "Hyprland", - "rev": "d7e7a292613a4f20218074ff8299dff099a80098", + "repo": "hyprland", + "rev": "8ebff1948ff665ff6a1b49fb715b7de0797fae04", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "Hyprland", + "repo": "hyprland", "type": "github" } }, @@ -580,11 +472,11 @@ ] }, "locked": { - "lastModified": 1738422629, - "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", + "lastModified": 1749046714, + "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", + "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", "type": "github" }, "original": { @@ -612,11 +504,11 @@ ] }, "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "lastModified": 1749154592, + "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", "owner": "hyprwm", "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", + "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", "type": "github" }, "original": { @@ -638,11 +530,11 @@ ] }, "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "lastModified": 1749154592, + "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", "owner": "hyprwm", "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", + "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", "type": "github" }, "original": { @@ -674,11 +566,11 @@ ] }, "locked": { - "lastModified": 1739048983, - "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", + "lastModified": 1749155776, + "narHash": "sha256-t1PM0wxQLQwv2F2AW23uA7pm5giwmcgYEWbNIRct9r4=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", + "rev": "396e8aa1c06274835b69da7f9a015fff9a9b7522", "type": "github" }, "original": { @@ -703,11 +595,11 @@ ] }, "locked": { - "lastModified": 1739048914, - "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", + "lastModified": 1749145882, + "narHash": "sha256-qr0KXeczF8Sma3Ae7+dR2NHhvG7YeLBJv19W4oMu6ZE=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a7334904d591f38757c46fbe2ab68651877d9099", + "rev": "1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676", "type": "github" }, "original": { @@ -731,11 +623,11 @@ ] }, "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "lastModified": 1749145882, + "narHash": "sha256-qr0KXeczF8Sma3Ae7+dR2NHhvG7YeLBJv19W4oMu6ZE=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "rev": "1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676", "type": "github" }, "original": { @@ -744,40 +636,19 @@ "type": "github" } }, - "hyprpanel": { - "inputs": { - "ags": "ags", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1740863579, - "narHash": "sha256-U4amsszfgPUTAa9FrIlYsCCpmAyko22h/nbjhmAZvAs=", - "owner": "Jas-SinghFSU", - "repo": "HyprPanel", - "rev": "2be9f1ef6c2df2ecf0eebe5a039e8029d8d151cd", - "type": "github" - }, - "original": { - "owner": "Jas-SinghFSU", - "repo": "HyprPanel", - "type": "github" - } - }, "hyprpolkitagent": { "inputs": { "hyprland-qt-support": "hyprland-qt-support_2", "hyprutils": "hyprutils_3", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "systems": "systems_2" }, "locked": { - "lastModified": 1739049006, - "narHash": "sha256-AlvqgzQTaSWepmfNHugQM+aSuhsNaLUU95y5VzdbuI8=", + "lastModified": 1750372026, + "narHash": "sha256-TNK4bEM5vnbN0lj1zTjWYMrUFzjXq7ytkEMGaKP7czM=", "owner": "hyprwm", "repo": "hyprpolkitagent", - "rev": "3bef8bf8fcac95339d1e8cab3addbe83a7f99d57", + "rev": "5f8de19fd0d723c421fc7892f5d2a2ac76994066", "type": "github" }, "original": { @@ -798,11 +669,11 @@ ] }, "locked": { - "lastModified": 1739891528, - "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=", + "lastModified": 1749819919, + "narHash": "sha256-7F/KG8dwSH9JXdlpOVrEEArS+PJSn0iEnx5eVCk89/I=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba", + "rev": "57ab2a867d8b554ad89f29060c15efd11631db91", "type": "github" }, "original": { @@ -827,11 +698,11 @@ ] }, "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "lastModified": 1749135356, + "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb", "type": "github" }, "original": { @@ -852,11 +723,11 @@ ] }, "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "lastModified": 1749135356, + "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb", "type": "github" }, "original": { @@ -877,11 +748,11 @@ ] }, "locked": { - "lastModified": 1739049028, - "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", + "lastModified": 1749145760, + "narHash": "sha256-IHaGWpGrv7seFWdw/1A+wHtTsPlOGIKMrk1TUIYJEFI=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "04146df74a8d5ec0b579657307be01f1e241125f", + "rev": "817918315ea016cc2d94004bfb3223b5fd9dfcc6", "type": "github" }, "original": { @@ -904,27 +775,27 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1748294338, + "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.0.8", "repo": "ixx", "type": "github" } }, "nixos-hardware": { "locked": { - "lastModified": 1740646007, - "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", + "lastModified": 1750431636, + "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", + "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "type": "github" }, "original": { @@ -936,15 +807,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740828860, - "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", - "owner": "nixos", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -952,11 +823,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "type": "github" }, "original": { @@ -968,15 +839,15 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", - "owner": "NixOS", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -984,27 +855,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -1014,36 +869,21 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch" + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_4" }, "locked": { - "lastModified": 1741098523, - "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", + "lastModified": 1750345447, + "narHash": "sha256-yOuSSfI4xovXQpSkZUK02CBcY1f0Nvm0RhnUN8xn2rY=", "owner": "nix-community", "repo": "nixvim", - "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", + "rev": "6a1a348ab1f00bd32d2392b5c2fc72489c699af3", "type": "github" }, "original": { @@ -1054,7 +894,10 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": [ + "stylix", + "flake-parts" + ], "nixpkgs": [ "stylix", "nixpkgs" @@ -1062,11 +905,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740408283, - "narHash": "sha256-2xECnhgF3MU9YjmvOkrRp8wRFo2OjjewgCtlfckhL5s=", + "lastModified": 1748730660, + "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", "owner": "nix-community", "repo": "NUR", - "rev": "496a4a11162bdffb9a7b258942de138873f019f7", + "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", "type": "github" }, "original": { @@ -1077,7 +920,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1085,11 +928,11 @@ ] }, "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", + "lastModified": 1749730855, + "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "owner": "NuschtOS", "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", + "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "type": "github" }, "original": { @@ -1098,18 +941,6 @@ "type": "github" } }, - "ny": { - "flake": false, - "locked": { - "narHash": "sha256-3257NAH4qlan2YHVLpNRy7x8IJqR2pal3OzFo/ykqXs=", - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" - }, - "original": { - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -1120,11 +951,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1749636823, + "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", "type": "github" }, "original": { @@ -1135,102 +966,15 @@ }, "root": { "inputs": { - "apple-fonts": "apple-fonts", "firefox-addons": "firefox-addons", "home-manager": "home-manager", "hyprland": "hyprland", - "hyprpanel": "hyprpanel", "hyprpolkitagent": "hyprpolkitagent", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", "spicetify-nix": "spicetify-nix", - "stylix": "stylix", - "zen-browser": "zen-browser" - } - }, - "sf-arabic": { - "flake": false, - "locked": { - "narHash": "sha256-/0gjRimqvZyE60xYxxPdlU+7Q2LJnnvtbmwOP0YmS9U=", - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg" - }, - "original": { - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg" - } - }, - "sf-armenian": { - "flake": false, - "locked": { - "narHash": "sha256-rRoDkbNMYkzOHZmQm96Zv80TZvRlAeoxkv4pMHP5nUg=", - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Armenian.dmg" - }, - "original": { - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Armenian.dmg" - } - }, - "sf-compact": { - "flake": false, - "locked": { - "narHash": "sha256-J72Lyt2wy83E46wN8w6/Rih9kilM9wEjtY6KnbF0DsA=", - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" - }, - "original": { - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" - } - }, - "sf-georgian": { - "flake": false, - "locked": { - "narHash": "sha256-IevVNOC28IiR45YfI3PsZzXLMRxuB5u7UiE53Zn6tRU=", - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Georgian.dmg" - }, - "original": { - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Georgian.dmg" - } - }, - "sf-hebrew": { - "flake": false, - "locked": { - "narHash": "sha256-Dw84kYwMpCtKKKqm8cZcQ9TZ7GayU5MO7W0LJw0Rcwk=", - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Hebrew.dmg" - }, - "original": { - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Hebrew.dmg" - } - }, - "sf-mono": { - "flake": false, - "locked": { - "narHash": "sha256-ICdHRFdNL7PM/fXJUzS7LgZxZiqcyIuCMHLze4En4vg=", - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg" - }, - "original": { - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg" - } - }, - "sf-pro": { - "flake": false, - "locked": { - "narHash": "sha256-Q/pOQ4MGhW/ZtLka+UUQcwSoZFDWW34XvutxL4GvzUY=", - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" - }, - "original": { - "type": "file", - "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" + "stylix": "stylix" } }, "spicetify-nix": { @@ -1238,14 +982,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_5" }, "locked": { - "lastModified": 1740889006, - "narHash": "sha256-A1iyKVvZrLdLwqWPC9OvPjC85ADQn2R1EGfCzJBl+wI=", + "lastModified": 1749961984, + "narHash": "sha256-1Nmycj9cVUIkoDsVEn9k8SGMS9V+BcBUL+rDXNapslw=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "f8d3757d4ae3af2175a631fb9598a42d30ee75fc", + "rev": "c9f12a733e8edcf8d408ccd178c1a11e753ffa08", "type": "github" }, "original": { @@ -1262,13 +1006,13 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_5", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1276,11 +1020,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1741112087, - "narHash": "sha256-dBGwN4aHmX2QUXolZDhV+p06+WM5ZykL4wd9BD6bT7k=", + "lastModified": 1750459519, + "narHash": "sha256-5r+n+UspGQmATwiaA/HPoHgLWkmlIFEweHC3A4fqk80=", "owner": "danth", "repo": "stylix", - "rev": "11780517948f214b9f93d1bf5a2d29bc181d3a33", + "rev": "faa5a34c3fd533b289ed082ff2b0e579634e3e4f", "type": "github" }, "original": { @@ -1364,6 +1108,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -1384,28 +1143,27 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1740351358, - "narHash": "sha256-Hdk850xgAd3DL8KX0AbyU7tC834d3Lej1jOo3duWiOA=", + "lastModified": 1748180480, + "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", "owner": "tinted-theming", "repo": "schemes", - "rev": "a1bc2bd89e693e7e3f5764cfe8114e2ae150e184", + "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", "type": "github" }, "original": { @@ -1417,11 +1175,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1740272597, - "narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=", + "lastModified": 1748740859, + "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0", + "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", "type": "github" }, "original": { @@ -1496,11 +1254,11 @@ ] }, "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "lastModified": 1749490041, + "narHash": "sha256-R9Dn9IyUdPaJHD2Oqd7XJnnxpka6M6UYw4Ld0iA46HM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "rev": "3cf35e178bc192ee51e3fddfd69e531e2c106a30", "type": "github" }, "original": { @@ -1508,24 +1266,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zen-browser": { - "inputs": { - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1740560716, - "narHash": "sha256-/8r6Q1eHM2WIIQfzFmdi4m77EYEFtHHWwUK+1GaG7P0=", - "ref": "refs/heads/main", - "rev": "f4259577d16bfc506d746198223ccba1047b6c6f", - "revCount": 77, - "type": "git", - "url": "https://git.sr.ht/~canasta/zen-browser-flake/" - }, - "original": { - "type": "git", - "url": "https://git.sr.ht/~canasta/zen-browser-flake/" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 64c2283..9cd8494 100644 --- a/flake.nix +++ b/flake.nix @@ -19,24 +19,17 @@ url = "github:Gerg-L/spicetify-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - # sops-nix = { - # url = "github:Mic92/sops-nix"; + hyprland.url = "github:/hyprwm/hyprland"; + hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent"; + # hyprpanel = { + # url = "github:Jas-SinghFSU/HyprPanel"; # inputs.nixpkgs.follows = "nixpkgs"; # }; - hyprland.url = "github:/hyprwm/Hyprland?submodules=1"; - hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent"; - hyprpanel = { - url = "github:Jas-SinghFSU/HyprPanel"; - inputs.nixpkgs.follows = "nixpkgs"; - }; stylix.url = "github:danth/stylix"; - apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; - zen-browser.url = - "git+https://git.sr.ht/~canasta/zen-browser-flake/"; # updated flake }; outputs = inputs@{ nixpkgs, ... }: { @@ -46,7 +39,7 @@ system = "x86_64-linux"; modules = [ { - nixpkgs.overlays = [ inputs.hyprpanel.overlay ]; + # nixpkgs.overlays = [ inputs.hyprpanel.overlay ]; _module.args = { inherit inputs; }; } inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x270 # CHANGEME: check https://github.com/NixOS/nixos-hardware diff --git a/home/programs/firefox/default.nix b/home/programs/firefox/default.nix index 6efe6b6..7f3624f 100644 --- a/home/programs/firefox/default.nix +++ b/home/programs/firefox/default.nix @@ -49,7 +49,7 @@ search = { force = true; default = "Searx"; - order = [ "Searx" "Google" ]; + order = [ "Searx" "google" ]; engines = { "Nix Packages" = { urls = [{ @@ -73,7 +73,7 @@ urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }]; - iconUpdateURL = "https://nixos.wiki/favicon.png"; + icon = "https://nixos.wiki/favicon.png"; updateInterval = 24 * 60 * 60 * 1000; # every day definedAliases = [ "@nw" ]; }; @@ -81,12 +81,12 @@ urls = [{ template = "https://searx.aicampground.com/?q={searchTerms}"; }]; - iconUpdateURL = "https://nixos.wiki/favicon.png"; + icon = "https://nixos.wiki/favicon.png"; updateInterval = 24 * 60 * 60 * 1000; # every day definedAliases = [ "@searx" ]; }; - "Bing".metaData.hidden = true; - "Google".metaData.alias = + bing.metaData.hidden = true; + google.metaData.alias = "@g"; # builtin engines only support specifying one additional alias }; }; @@ -100,4 +100,5 @@ ]; }; }; + stylix.targets.firefox.profileNames = [ "dark" ]; } diff --git a/home/programs/ghostty/default.nix b/home/programs/ghostty/default.nix new file mode 100644 index 0000000..881edc6 --- /dev/null +++ b/home/programs/ghostty/default.nix @@ -0,0 +1,8 @@ +{ + programs.ghostty = { + enable = true; + enableZshIntegration = true; + installVimSyntax = true; + installBatSyntax = true; + }; +} diff --git a/home/programs/nvim/plugins/cmp.nix b/home/programs/nvim/plugins/cmp.nix index 6bbfbbe..5d5f9c3 100644 --- a/home/programs/nvim/plugins/cmp.nix +++ b/home/programs/nvim/plugins/cmp.nix @@ -1,6 +1,7 @@ { programs.nixvim.plugins = { luasnip.enable = true; + friendly-snippets.enable = true; cmp-buffer = { enable = true; }; cmp-emoji = { enable = true; }; cmp-nvim-lsp = { enable = true; }; diff --git a/home/programs/nvim/plugins/lsp.nix b/home/programs/nvim/plugins/lsp.nix index c5e0d9a..67f16b9 100644 --- a/home/programs/nvim/plugins/lsp.nix +++ b/home/programs/nvim/plugins/lsp.nix @@ -53,7 +53,7 @@ shfmt.enable = true; # golines.enable = true; # gofumpt.enable = true; - phpcsfixer.enable = true; + # phpcsfixer.enable = true; elm_format.enable = true; blade_formatter = { enable = true; diff --git a/home/programs/nvim/plugins/ui.nix b/home/programs/nvim/plugins/ui.nix index 038b11f..377e9c3 100644 --- a/home/programs/nvim/plugins/ui.nix +++ b/home/programs/nvim/plugins/ui.nix @@ -3,6 +3,7 @@ programs.nixvim.plugins = { web-devicons.enable = true; noice.enable = true; + glance.enable = true; gitsigns = { enable = true; settings.current_line_blame = false; diff --git a/home/programs/nvim/plugins/utils.nix b/home/programs/nvim/plugins/utils.nix index a4f866a..93740ac 100644 --- a/home/programs/nvim/plugins/utils.nix +++ b/home/programs/nvim/plugins/utils.nix @@ -8,7 +8,7 @@ flash.enable = true; image = { enable = false; - integrations.markdown = { + settings.integrations.markdown = { clearInInsertMode = true; onlyRenderImageAtCursor = true; }; @@ -17,23 +17,6 @@ comment.enable = true; nvim-autopairs.enable = true; todo-comments.enable = true; - harpoon = { - enable = true; - enableTelescope = true; - keymapsSilent = true; - keymaps = { - addFile = "ha"; - toggleQuickMenu = "hu"; - navNext = "hl"; - navPrev = "hh"; - navFile = { - "1" = "h1"; - "2" = "h2"; - "3" = "h3"; - "4" = "h4"; - }; - }; - }; orgmode.enable = false; treesitter-context.enable = true; nvim-surround.enable = true; diff --git a/home/programs/pass/default.nix b/home/programs/pass/default.nix index 013524d..caecca3 100644 --- a/home/programs/pass/default.nix +++ b/home/programs/pass/default.nix @@ -11,6 +11,6 @@ enableZshIntegration = true; verbose = true; enableScDaemon = false; - pinentryPackage = pkgs.pinentry-all; + pinentry.package = pkgs.pinentry-all; }; } diff --git a/home/programs/shell/zsh.nix b/home/programs/shell/zsh.nix index e40d4ce..a2429a8 100644 --- a/home/programs/shell/zsh.nix +++ b/home/programs/shell/zsh.nix @@ -14,7 +14,7 @@ in { batdiff batgrep batwatch - prettybat + # prettybat ]; }; @@ -26,7 +26,7 @@ in { syntaxHighlighting.enable = true; historySubstringSearch.enable = true; - initExtraFirst = '' + initContent = lib.mkBefore '' bindkey -e ${if fetch == "neofetch" then pkgs.neofetch + "/bin/neofetch" @@ -95,7 +95,7 @@ in { gcu = "git add . && git commit -m 'Update'"; gp = "git push"; gpl = "git pull"; - gs = "git status"; + gst = "git status"; gd = "git diff"; gco = "git checkout"; gcb = "git checkout -b"; diff --git a/home/scripts/default.nix b/home/scripts/default.nix index dacc8e4..9c920e9 100644 --- a/home/scripts/default.nix +++ b/home/scripts/default.nix @@ -4,8 +4,6 @@ ./sounds ./brightness ./caffeine - ./hyprpanel - ./hyprfocus ./night-shift ./screenshot ./nerdfont_fzf diff --git a/home/system/dunst/default.nix b/home/system/dunst/default.nix new file mode 100644 index 0000000..4b57a78 --- /dev/null +++ b/home/system/dunst/default.nix @@ -0,0 +1,36 @@ +{ config, lib, ... }: +let + accent = "#${config.lib.stylix.colors.base0D}"; + accent-alt = "#${config.lib.stylix.colors.base03}"; + background = "#${config.lib.stylix.colors.base00}"; + background-alt = "#${config.lib.stylix.colors.base01}"; + foreground = "#${config.lib.stylix.colors.base05}"; + font = "${config.stylix.fonts.sansSerif.name}"; + font-size = "${toString config.stylix.fonts.sizes.desktop}"; + + inherit (config.var.theme) rounding border-size gaps-in gaps-out; +in { + + services.dunst = { + enable = true; + settings = { + global = { + height = 300; + offset = "15x15"; + origin = "top-right"; + follow = "keyboard"; + shrink = "no"; + transparency = 0; + separator_height = 2; + padding = gaps-in; + horizontal_padding = gaps-in; + corner_radius = rounding; + gap_size = gaps-out; + frame_width = border-size; + markup = "full"; + word_wrap = "yes"; + ellipsize = "middle"; + }; + }; + }; +} diff --git a/home/system/hyprland/bindings.nix b/home/system/hyprland/bindings.nix index 339a28e..d798257 100644 --- a/home/system/hyprland/bindings.nix +++ b/home/system/hyprland/bindings.nix @@ -1,11 +1,9 @@ { pkgs, ... }: { wayland.windowManager.hyprland.settings = { bind = [ - "$mod,RETURN, exec, ${pkgs.kitty}/bin/kitty" # Kitty + "$mod,RETURN, exec, ${pkgs.kitty}/bin/kitty" # Terminal "$mod,E, exec, ${pkgs.xfce.thunar}/bin/thunar" # Thunar - # "$mod,B, exec, ${pkgs.qutebrowser}/bin/qutebrowser" # Qutebrowser "$mod,U, exec, ${pkgs.firefox}/bin/firefox" # Firefox - # "$shiftMod,B, exec, ${pkgs.bitwarden}/bin/bitwarden" # Bitwarden "$shiftMod,Q, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock "$mod,X, exec, powermenu" # Powermenu "$mod,SPACE, exec, menu" # Launcher @@ -32,14 +30,16 @@ "$mod,l, movefocus, r" # Move focus Right "$mod,k, movefocus, u" # Move focus Up "$mod,j, movefocus, d" # Move focus Down + "$shiftMod,j, swapnext" # Swap with next client + "$shiftMod,k, swapnext, prev" # Swap with previous client "$ctrlMod,k, focusmonitor, -1" # Focus previous monitor "$ctrlMod,j, focusmonitor, 1" # Focus next monitor "$ctrlMod,h, layoutmsg, addmaster" # Add to master "$ctrlMod,l, layoutmsg, removemaster" # Remove from master - "$mod,PRINT, exec, screenshot window" # Screenshot window - ",PRINT, exec, screenshot monitor" # Screenshot monitor - "$shiftMod,PRINT, exec, screenshot region" # Screenshot region + "$mod,PRINT, exec, screenshot window swappy" # Screenshot window + ",PRINT, exec, screenshot monitor swappy" # Screenshot monitor + "$shiftMod,PRINT, exec, screenshot region swappy" # Screenshot region "ALT,PRINT, exec, screenshot region swappy" # Screenshot region then edit # "$shiftMod,S, exec, ${pkgs.qutebrowser}/bin/qutebrowser :open $(wofi --show dmenu -L 1 -p ' Search on internet')" # Search on internet with wofi @@ -47,7 +47,6 @@ "$shiftMod,E, exec, ${pkgs.wofi-emoji}/bin/wofi-emoji" # Emoji picker with wofi "$mod,F2, exec, night-shift" # Toggle night shift "$mod,F3, exec, night-shift" # Toggle night shift - "$mod,B, exec, hyprpanel-toggle" # Toggle hyprpanel ] ++ (builtins.concatLists (builtins.genList (i: let ws = i + 1; in [ diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix index b570f93..87a5aab 100644 --- a/home/system/hyprland/default.nix +++ b/home/system/hyprland/default.nix @@ -34,6 +34,8 @@ in { wayland.windowManager.hyprland = { enable = true; + systemd.enable = true; + systemd.variables = [ "--all" ]; package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; portalPackage = @@ -45,6 +47,7 @@ in { "$ctrlMod" = "SUPER_CTRL"; exec-once = [ "dbus-update-activation-environment --systemd --all" ]; + ecosystem = { no_update_news = true; }; plugin = { overview = { autoDrag = false; }; }; @@ -102,7 +105,10 @@ in { }; decoration = { - blur = { enabled = if blur then "true" else "false"; }; + blur = { + enabled = if blur then "true" else "false"; + size = 18; + }; shadow = { enabled = true; range = 20; @@ -116,7 +122,7 @@ in { master = { new_status = true; allow_small_split = true; - mfact = 0.5; + mfact = 0.6; }; gestures = { workspace_swipe = true; }; @@ -130,8 +136,34 @@ in { new_window_takes_over_fullscreen = 2; }; - windowrulev2 = - [ "float, tag:modal" "pin, tag:modal" "center, tag:modal" ]; + windowrulev2 = [ + "float, tag:modal" + "pin, tag:modal" + "center, tag:modal" + "float, title:^(Media viewer)$" + + # Bitwarden extension + "float, title:^(.*Bitwarden Password Manager.*)$" + + # make Firefox/Zen PiP window floating and sticky + "float, title:^(Picture-in-Picture)$" + "pin, title:^(Picture-in-Picture)$" + + # idle inhibit while watching videos + "idleinhibit focus, class:^(mpv|.+exe|celluloid)$" + "idleinhibit focus, class:^(zen)$, title:^(.*YouTube.*)$" + "idleinhibit fullscreen, class:^(zen)$" + + "dimaround, class:^(gcr-prompter)$" + "dimaround, class:^(xdg-desktop-portal-gtk)$" + "dimaround, class:^(polkit-gnome-authentication-agent-1)$" + "dimaround, class:^(zen)$, title:^(File Upload)$" + + # fix xwayland apps + "rounding 0, xwayland:1" + "center, class:^(.*jetbrains.*)$, title:^(Confirm Exit|Open Project|win424|win201|splash)$" + "size 640 400, class:^(.*jetbrains.*)$, title:^(splash)$" + ]; layerrule = [ "noanim, launcher" "noanim, ^ags-.*" ]; @@ -151,6 +183,6 @@ in { }; }; }; - systemd.user.targets.hyprland-session.Unit.Wants = - [ "xdg-desktop-autostart.target" ]; + # systemd.user.targets.hyprland-session.Unit.Wants = + # [ "xdg-desktop-autostart.target" ]; } diff --git a/home/system/hyprland/windowrule.nix b/home/system/hyprland/windowrule.nix index 794e9d5..1674e6e 100644 --- a/home/system/hyprland/windowrule.nix +++ b/home/system/hyprland/windowrule.nix @@ -3,32 +3,36 @@ windowrulev2 = [ "workspace 2, class:^(emacs)$" "workspace 3, class:^(kitty)$" + "workspace 3, class:^(com.mitchellh.ghostty)$" "workspace 9, class:^(org.qutebrowser.qutebrowser)$" "workspace 9, title:^(Chromium)$" "fullscreen, class:^(wlogout)$" "float, class:^(Zotero)$" + "size 810 200, class:^(Zotero)$,title:^(Quick Format Citation)*$" "float, class:^(firefox)$,title:^(Certificate for )*$" "float, class:^(firefox)$,title:^(.*Firefox — Sharing Indicator.*)$" "float, class:^(firefox)$,title:^(.*Presensi Mahasiswa.*)$" - "float, class:(firefox),title:^(Extension)(.*)$" + "float, class:^(firefox)$,title:^(Extension)(.*)$" "float, class:^(pcmanfm)$,title:^(Confirm File Replacing)$" "float, class:^(nemo)$,title:^(Confirm File Replacing)$" "float, title:^(Confirm File Replacing)$" + "float, class:thunar,title:^(Rename.*)$" + "float, class:^(org.inkscape.Inkscape)$" "float, class:^(nm-connection-editor)$" "float, class:^(.*blueman-manager.*)$" "size 530 300, class:^(.*blueman-manager.*)$" "move 100%-w-20 40, class:^(.*blueman-manager.*)$" "tag +portal, class:^(.*desktop-portal.*)$" "noborder, tag:portal" - "noblur, class:portal" - "noshadow, class:portal" - "float, class:portal" - "pin, class:portal" + "noblur, tag:portal" + "noshadow, tag:portal" + "float, tag:portal" + "pin, tag:portal" "pin, class:^(gcr-prompter)$" "float, title:^(Volume Control)$" "pin, title:^(Volume Control)$" "size 560 340, title:^(Volume Control)$" - "move 100%-w-30 30, title:^(Volume Control)$" + "move 100%-w-40 40, title:^(Volume Control)$" "float, class:^(spotube)$" "size 660 700, class:^(spotube)$" "move 100%-w-20 40, class:^(spotube)$" @@ -37,6 +41,7 @@ "float, class:^(thunderbird)$,title:^(Edit Event:)$" "float, class:^(thunderbird)$,title:^(An error has occurred)$" "float, class:^(thunar)$,title:^(File Operation Progress)$" + "float, class:^(firefox)$,title:^(.*Bitwarden Password Manager.*)$" "float, class:^(org.kde.polkit-kde-authentication-agent-1)$" "size 60% 55%, class:^(nwg-look)$" "center, class:^(nwg-look)$" @@ -44,6 +49,9 @@ "float, class:^(virt-manager)$,title:^(Virtual Machine Manager)$" "size 440 220, class:^(virt-manager)$,title:^(Virtual Machine Manager)$" "center, class:^(virt-manager)$,title:^(Virtual Machine Manager)$" + "stayfocused, class:(pinentry-)(.*)" # fix pinentry losing focus + "rounding 10, class:kitty" + # "float, class:.*xdg-desktop-portal.*" ]; }; } diff --git a/home/system/hyprlock/default.nix b/home/system/hyprlock/default.nix index cbfd29f..61a2bae 100644 --- a/home/system/hyprlock/default.nix +++ b/home/system/hyprlock/default.nix @@ -2,88 +2,98 @@ { config, ... }: let foreground = "rgba(216, 222, 233, 0.70)"; - imageStr = "screenshow"; # toString config.stylix.image; - font = config.stylix.fonts.serif.name; + imageStr = toString config.stylix.image; + font = config.stylix.fonts.sansSerif.name; in { programs.hyprlock = { enable = true; settings = { general = { - grace = 5; + grace = 3; no_fade_in = false; disable_loading_bar = false; }; - # # BACKGROUND - # background = { - # monitor = ""; - # path = imageStr; - # blur_passes = 0; - # contrast = 0.8916; - # brightness = 0.7172; - # vibrancy = 0.1696; - # vibrancy_darkness = 0.0; - # }; - # - # label = [ - # { - # # Day-Month-Date - # monitor = ""; - # text = ''cmd[update:1000] echo -e "$(date +"%A, %B %d")"''; - # color = foreground; - # font_size = 28; - # font_family = font + " Bold"; - # position = "0, 490"; - # halign = "center"; - # valign = "center"; - # } - # # Time - # { - # monitor = ""; - # text = ''cmd[update:1000] echo "$(date +"%I:%M")"''; - # color = foreground; - # font_size = 160; - # font_family = "steelfish outline regular"; - # position = "0, 370"; - # halign = "center"; - # valign = "center"; - # } - # # USER - # { - # monitor = ""; - # text = " $USER"; - # color = foreground; - # outline_thickness = 2; - # dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8 - # dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0 - # dots_center = true; - # font_size = 18; - # font_family = font + " Bold"; - # position = "0, -180"; - # halign = "center"; - # valign = "center"; - # } - # ]; - # - # # INPUT FIELD - # input-field = [{ - # monitor = ""; - # size = "300, 60"; - # outline_thickness = 2; - # dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8 - # dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0 - # dots_center = true; - # outer_color = "rgba(255, 255, 255, 0)"; - # inner_color = "rgba(255, 255, 255, 0.1)"; - # font_color = foreground; - # fade_on_empty = false; - # font_family = font + " Bold"; - # placeholder_text = "🔒 Enter Password"; - # hide_input = false; - # position = "0, -250"; - # halign = "center"; - # valign = "center"; - # }]; + background = { + path = "screenshot"; + blur_passes = 3; + blur_size = 6; + noise = 1.17e-2; + contrast = 1.3; # Vibrant!!! + brightness = 0.8; + vibrancy = 0.21; + vibrancy_darkness = 0.0; + }; + + label = [ + # Hour + { + text = ''cmd[update:1000] echo " $(date +"%H") "''; + color = "#${config.lib.stylix.colors.base06}"; + font_size = 112; + font_family = font; + shadow_passes = 2; + shadow_boost = 0.4; + shadow_size = 4; + position = "0, 220"; + halign = "center"; + valign = "center"; + } + { + monitor = ""; + text = ''cmd[update:1000] echo " $(date +"%M") "''; + color = "#${config.lib.stylix.colors.base06}"; + font_size = 112; + font_family = font; + shadow_passes = 2; + shadow_boost = 0.4; + shadow_size = 4; + position = "0, 80"; + halign = "center"; + valign = "center"; + } + { + monitor = ""; + text = + ''cmd[update:18000000] echo " "$(date +'%A')" "''; + color = "#${config.lib.stylix.colors.base07}"; + font_size = 22; + font_family = font; + position = "0, -10"; + halign = "center"; + valign = "center"; + } + { + monitor = ""; + text = ''cmd[update:18000000] echo " "$(date +'%d %b')" "''; + color = "#${config.lib.stylix.colors.base07}"; + font_size = 18; + font_family = font; + position = "0, -40"; + halign = "center"; + valign = "center"; + } + ]; + + input-field = [{ + monitor = ""; + size = "250, 50"; + outline_thickness = 3; + dots_size = 0.26; # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.64; # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = true; + dots_rouding = -1; + rounding = 22; + outer_color = "#${config.lib.stylix.colors.base00}"; + inner_color = "#${config.lib.stylix.colors.base00}"; + font_color = "#${config.lib.stylix.colors.base06}"; + fade_on_empty = true; + placeholder_text = + "Password..."; # Text rendered in the input box when it's empty. + position = "0, 120"; + halign = "center"; + valign = "bottom"; + }]; }; }; } diff --git a/home/system/hyprpanel/default.nix b/home/system/hyprpanel/default.nix index 376c00d..a1804c8 100644 --- a/home/system/hyprpanel/default.nix +++ b/home/system/hyprpanel/default.nix @@ -7,7 +7,7 @@ let background = "#${config.lib.stylix.colors.base00}"; background-alt = "#${config.lib.stylix.colors.base01}"; foreground = "#${config.lib.stylix.colors.base05}"; - font = "${config.stylix.fonts.serif.name}"; + font = "${config.stylix.fonts.sansSerif.name}"; fontSize = "${toString config.stylix.fonts.sizes.desktop}px"; inherit (config.var.theme) rounding border-size gaps-in gaps-out; @@ -22,81 +22,36 @@ in { overlay.enable = true; hyprland.enable = true; overwrite.enable = true; - layout = { - "bar.layouts" = { - "0" = { - left = [ "dashboard" "hypridle" "workspaces" "windowtitle" ]; - middle = [ "media" ]; - right = [ - "systray" - "volume" - "hyprsunset" - "battery" - "network" - "cpu" - "clock" - "notifications" - ]; - }; - "*" = { - left = [ "dashboard" "workspaces" "windowtitle" ]; - middle = [ "clock" ]; - right = [ "volume" "notifications" ]; + settings = { + layout = { + bar.layouts = { + "0" = { + left = [ "dashboard" "hypridle" "workspaces" "windowtitle" ]; + middle = [ "media" ]; + right = [ + "volume" + "hyprsunset" + "battery" + "network" + "bluetooth" + "cpu" + "clock" + "systray" + "notifications" + ]; + }; + "*" = { + left = [ "dashboard" "workspaces" "windowtitle" ]; + middle = [ "clock" ]; + right = [ "volume" "notifications" ]; + }; }; }; }; override = { - bar.battery.hideLabelWhenFull = true; - bar.bluetooth.label = false; - bar.clock.format = "%a, %d %b %H:%M"; - bar.customModules.hypridle.label = false; - bar.customModules.hyprsunset.label = false; - bar.customModules.hyprsunset.temperature = "4500k"; - bar.launcher.icon = ""; - bar.media.show_active_only = true; - bar.network.label = false; - bar.network.truncation_size = 12; - bar.volume.label = false; - bar.windowtitle.label = true; - bar.workspaces.applicationIconEmptyWorkspace = ""; - bar.workspaces.hideUnoccupied = false; - bar.workspaces.monitorSpecific = false; - bar.workspaces.numbered_active_indicator = "underline"; - bar.workspaces.showApplicationIcons = false; - bar.workspaces.showIcons = false; - bar.workspaces.workspaces = 5; - bar.workspaces.show_numbered = true; - menus.clock.time.hideSeconds = true; - menus.clock.time.military = true; - menus.clock.weather.key = weatherapikey; - menus.clock.weather.location = location; - menus.clock.weather.unit = "metric"; - menus.dashboard.powermenu.avatar.image = - "/home/${username}/.profile_picture.png"; - menus.dashboard.powermenu.confirmation = false; - menus.dashboard.shortcuts.left.shortcut1.command = "firefox"; - menus.dashboard.shortcuts.left.shortcut1.icon = ""; - menus.dashboard.shortcuts.left.shortcut1.tooltip = "Firefox"; - menus.dashboard.shortcuts.left.shortcut2.command = "caffeine"; - menus.dashboard.shortcuts.left.shortcut2.icon = "󰅶"; - menus.dashboard.shortcuts.left.shortcut2.tooltip = "Caffeine"; - menus.dashboard.shortcuts.left.shortcut3.command = "night-shift"; - menus.dashboard.shortcuts.left.shortcut3.icon = "󰖔"; - menus.dashboard.shortcuts.left.shortcut3.tooltip = "Night-shift"; - menus.dashboard.shortcuts.left.shortcut4.command = "menu"; - menus.dashboard.shortcuts.left.shortcut4.icon = ""; - menus.dashboard.shortcuts.left.shortcut4.tooltip = "Search Apps"; - menus.dashboard.shortcuts.right.shortcut1.command = "hyprpicker -a"; - menus.dashboard.shortcuts.right.shortcut1.icon = ""; - menus.dashboard.shortcuts.right.shortcut1.tooltip = "Color Picker"; - menus.dashboard.shortcuts.right.shortcut3.command = - "screenshot region swappy"; - menus.dashboard.shortcuts.right.shortcut3.icon = "󰄀"; - menus.dashboard.shortcuts.right.shortcut3.tooltip = "Screenshot"; - menus.dashboard.stats.enabled = false; theme.bar.background = - "${background + (if transparentButtons then "00" else "")}"; + "${background + (if transparent then "00" else "")}"; theme.bar.border_radius = "${toString rounding}px"; theme.bar.buttons.background = "${(if transparent then background else background-alt) @@ -117,10 +72,9 @@ in { theme.bar.buttons.workspaces.available = accent-alt; theme.bar.buttons.workspaces.hover = accent-alt; theme.bar.buttons.workspaces.occupied = accent; - theme.bar.buttons.y_margins = - if floating && transparent then "0" else "8"; + theme.bar.buttons.y_margins = if transparentButtons then "0" else "8"; theme.bar.dropdownGap = "3em"; - theme.bar.floating = if floating then "true" else "false"; + theme.bar.floating = floating; theme.bar.location = position; theme.bar.margin_bottom = "${if position == "top" then "0" else toString (gaps-in * 2)}px"; @@ -176,6 +130,56 @@ in { theme.osd.muted_zero = true; theme.osd.orientation = "vertical"; theme.osd.radius = "${toString rounding}px"; + + bar.workspaces.reverse_scroll = true; + bar.battery.hideLabelWhenFull = true; + bar.bluetooth.label = false; + bar.clock.format = "%a, %d %b %H:%M"; + bar.customModules.hypridle.label = false; + bar.customModules.hyprsunset.label = false; + bar.customModules.hyprsunset.temperature = "4500k"; + bar.launcher.icon = ""; + bar.media.show_active_only = true; + bar.network.label = false; + bar.network.truncation_size = 12; + bar.volume.label = false; + bar.windowtitle.label = true; + # bar.workspaces.applicationIconEmptyWorkspace = ""; + # bar.workspaces.hideUnoccupied = false; + bar.workspaces.monitorSpecific = false; + # bar.workspaces.numbered_active_indicator = "underline"; + # bar.workspaces.showApplicationIcons = false; + bar.workspaces.show_icons = false; + bar.workspaces.workspaces = 5; + bar.workspaces.show_numbered = true; + menus.clock.time.hideSeconds = true; + menus.clock.time.military = true; + menus.clock.weather.key = weatherapikey; + menus.clock.weather.location = location; + menus.clock.weather.unit = "metric"; + menus.dashboard.powermenu.avatar.image = + "/home/${username}/.profile_picture.png"; + menus.dashboard.powermenu.confirmation = false; + menus.dashboard.shortcuts.left.shortcut1.command = "firefox"; + menus.dashboard.shortcuts.left.shortcut1.icon = ""; + menus.dashboard.shortcuts.left.shortcut1.tooltip = "Firefox"; + menus.dashboard.shortcuts.left.shortcut2.command = "caffeine"; + menus.dashboard.shortcuts.left.shortcut2.icon = "󰅶"; + menus.dashboard.shortcuts.left.shortcut2.tooltip = "Caffeine"; + menus.dashboard.shortcuts.left.shortcut3.command = "night-shift"; + menus.dashboard.shortcuts.left.shortcut3.icon = "󰖔"; + menus.dashboard.shortcuts.left.shortcut3.tooltip = "Night-shift"; + menus.dashboard.shortcuts.left.shortcut4.command = "menu"; + menus.dashboard.shortcuts.left.shortcut4.icon = ""; + menus.dashboard.shortcuts.left.shortcut4.tooltip = "Search Apps"; + menus.dashboard.shortcuts.right.shortcut1.command = "hyprpicker -a"; + menus.dashboard.shortcuts.right.shortcut1.icon = ""; + menus.dashboard.shortcuts.right.shortcut1.tooltip = "Color Picker"; + menus.dashboard.shortcuts.right.shortcut3.command = + "screenshot region swappy"; + menus.dashboard.shortcuts.right.shortcut3.icon = "󰄀"; + menus.dashboard.shortcuts.right.shortcut3.tooltip = "Screenshot"; + menus.dashboard.stats.enabled = false; wallpaper.enable = false; }; }; diff --git a/home/system/waybar/default.nix b/home/system/waybar/default.nix new file mode 100644 index 0000000..c6575ff --- /dev/null +++ b/home/system/waybar/default.nix @@ -0,0 +1,216 @@ +{ config, pkgs, ... }: +let + inherit (config.var.theme.bar) position; + inherit (config.var.theme) rounding border-size gaps-in gaps-out; +in { + home.packages = with pkgs; [ playerctl ]; + programs.waybar = { + enable = true; + systemd = { + enable = true; + target = "hyprland-session"; + }; + settings = [{ + layer = "top"; + position = position; + modules-left = [ + "idle_inhibitor" + "power-profile-daemon" + "backlight" + "pulseaudio" + "hyprland/workspaces" + "hyprland/window" + ]; + modules-center = [ "mpris" ]; + modules-right = [ + "battery#1" + "battery#2" + "cpu" + "memory" + "temperature" + "clock" + "privacy" + "tray" + ]; + clock = { + "format" = "{:%d %B %H:%M}  "; + "format-alt" = "{:%A, %d %B %Y (%R)} "; + "tooltip-format" = "{calendar}"; + "calendar" = { + "mode" = "year"; + "mode-mon-col" = 3; + "weeks-pos" = "right"; + "on-scroll" = 1; + "format" = { + "months" = "{}"; + "days" = "{}"; + "weeks" = "W{}"; + "weekdays" = "{}"; + "today" = "{}"; + }; + }; + actions = { + "on-click-right" = "mode"; + "on-scroll-up" = "shift_up"; + "on-scroll-down" = "shift_down"; + }; + }; + tray = { spacing = gaps-in; }; + cpu = { format = " {usage}"; }; + memory = { format = " {}"; }; + idle_inhibitor = { + format = "{icon}"; + format-icons = { + activated = ""; + deactivated = ""; + }; + }; + network = { + format = "{ifname}"; + format-wifi = "{essid} ({signalStrength}%) "; + format-ethernet = "{ipaddr}/{cidr} 󰈀"; + format-disconnected = ""; + tooltip-format = "{ifname} via {gwaddr} 󰈀"; + tooltip-format-wifi = "{essid} ({signalStrength}%) "; + tooltip-format-ethernet = "{ifname} "; + tooltip-format-disconnected = "Disconnected"; + max-length = 50; + }; + temperature = { format = "{temperatureC}󰔄 "; }; + backlight = { + device = "intel_backlight"; + format = "{icon}"; + format-icons = [ "󱃓" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥" ]; + }; + "battery#1" = { + bat = "BAT0"; + interval = 90; + states = { + warning = 30; + critical = 15; + }; + format = "{capacity}"; + max-length = 2; + }; + "battery#2" = { + bat = "BAT1"; + interval = 90; + states = { + warning = 30; + critical = 15; + }; + format = "{capacity} {icon}"; + format-icons = [ "" "" "" "" "" ]; + max-length = 25; + }; + "hyprland/window" = { + format = "{}"; + rewrite = { + "(.*) — Mozilla Firefox" = "󰈹 $1"; + "(.*) - kitty" = " [$1]"; + }; + separate-outputs = true; + }; + "hyprland/workspaces" = { + format = "{name}"; + format-icons = { + "2" = ""; + "3" = ""; + "9" = ""; + "active" = ""; + "default" = ""; + }; + # "persistent-workspaces" = { + # "eDP-1" = [ 1 2 3 4 5 ]; + # "DP-3" = [ 6 7 8 9 0 ]; + # }; + }; + mpris = { + "format" = "{player_icon} {dynamic}"; + "format-paused" = "{status_icon} {dynamic}"; + "player-icons" = { + "default" = "󰐊"; + "mpv" = "󰎇"; + }; + "dynamic-len" = 30; + "status-icons" = { "paused" = "󰏤"; }; + "ignored-players" = [ "firefox" ]; + }; + privacy = { + "icon-spacing" = 4; + "icon-size" = 18; + "transition-duration" = 250; + "modules" = [ + { + "type" = "screenshare"; + "tooltip" = true; + "tooltip-icon-size" = 24; + } + { + "type" = "audio-out"; + "tooltip" = true; + "tooltip-icon-size" = 24; + } + { + "type" = "audio-in"; + "tooltip" = true; + "tooltip-icon-size" = 24; + } + ]; + }; + pulseaudio = { + "format" = "{volume}%{icon}"; + "format-bluetooth" = "{volume}%{icon}"; + "format-muted" = ""; + "format-icons" = { + "headphone" = ""; + "phone" = ""; + "portable" = ""; + "car" = ""; + "default" = [ "" "" ]; + }; + "scroll-step" = 1; + "on-click" = "pavucontrol"; + "ignored-sinks" = [ "Easy Effects Sink" ]; + }; + "pulseaudio/slider" = { + "min" = 0; + "max" = 100; + "orientation" = "horizontal"; + }; + }]; + + style = '' + * { border: none; border-radius: 0; } + label.module { padding: 0 ${toString gaps-out}px; } + #workspaces button { + padding-top: ${toString border-size}px; + border-bottom: ${toString border-size}px solid transparent; + } + #workspaces button.focused, + #workspaces button.active { + border-bottom: ${toString border-size}px solid @base09; + } + label#battery.1 { padding-right: 0; } + label#battery.2 { padding-left: ${toString gaps-in}px; } + #privacy, #tray { padding: 0 ${toString gaps-in}px; } + #pulseaudio-slider slider { + min-height: 0px; + min-width: 0px; + opacity: 0; + background-image: none; + border: none; + box-shadow: none; + } + #pulseaudio-slider trough { + min-height: 5px; + min-width: 80px; + border-radius: ${toString rounding}px; + } + #pulseaudio-slider highlight { + min-width: 10px; + border-radius: ${toString rounding}px; + } + ''; + }; +} diff --git a/home/system/wofi/default.nix b/home/system/wofi/default.nix index 7dd6e55..5f1ccc2 100644 --- a/home/system/wofi/default.nix +++ b/home/system/wofi/default.nix @@ -5,7 +5,7 @@ let background = "#${config.lib.stylix.colors.base00}"; background-alt = "#${config.lib.stylix.colors.base01}"; foreground = "#${config.lib.stylix.colors.base05}"; - font = config.stylix.fonts.serif.name; + font = config.stylix.fonts.sansSerif.name; rounding = config.var.theme.rounding; font-size = config.stylix.fonts.sizes.popups; in { diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 0156a5b..6ede699 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -13,6 +13,7 @@ ../../nixos/systemd-boot.nix ../../nixos/timezone.nix ../../nixos/tuigreet.nix + ../../nixos/tlp.nix ../../nixos/users.nix ../../nixos/utils.nix ../../nixos/virtualisation.nix @@ -31,6 +32,7 @@ # users.users."${config.var.username}".extraGroups = [ "scanner" "lp" ]; # hardware.sane.enable = true; + programs.nm-applet.enable = true; networking.hosts = { "192.168.122.52" = [ "websiteku.lokal" ]; "127.0.0.1" = [ "dimensi.lokal" "sisfokampus.ddev.site" ]; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index f34b181..04ececd 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -26,7 +26,7 @@ ../../home/system/hyprland ../../home/system/hypridle ../../home/system/hyprlock - ../../home/system/hyprpanel + # ../../home/system/hyprpanel ../../home/system/hyprpaper ../../home/system/wofi ../../home/system/batsignal @@ -34,12 +34,16 @@ ../../home/system/mime ../../home/system/udiskie ../../home/system/clipman + ../../home/system/waybar + ../../home/system/dunst # ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets ]; stylix = { targets.gtk.flatpakSupport.enable = false; + targets.hyprlock.enable = false; + targets.waybar.addCss = false; iconTheme = { enable = true; package = pkgs.qogir-icon-theme; @@ -117,18 +121,23 @@ # cava # Backup - # zed-editor + zed-editor neovide inkscape-with-extensions # gimp-with-plugins gimp sqlitebrowser sqlite - # emacs29-pgtk + emacs-pgtk + php + phpPackages.composer + aspell + html-tidy + stylelint + jsbeautifier zotero_7 chromium remmina - # inputs.zen-browser.packages."${pkgs.system}" ]; # Import my profile picture, used by the hyprpanel dashboard diff --git a/nixos/audio.nix b/nixos/audio.nix index 3b69bf6..a84b026 100644 --- a/nixos/audio.nix +++ b/nixos/audio.nix @@ -1,4 +1,6 @@ -{ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ pavucontrol ]; + security.rtkit.enable = true; services.pulseaudio.enable = false; diff --git a/nixos/fonts.nix b/nixos/fonts.nix index d56ddbc..94901d9 100644 --- a/nixos/fonts.nix +++ b/nixos/fonts.nix @@ -16,13 +16,11 @@ noto-fonts-cjk-sans noto-fonts-emoji victor-mono - # (nerdfonts.override { fonts = [ "FiraCode" "Meslo" "VictorMono" ]; }) nerd-fonts.victor-mono nerd-fonts.fira-code nerd-fonts.meslo-lg openmoji-color twemoji-color-font - inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd ]; enableDefaultPackages = false; @@ -30,8 +28,8 @@ fontconfig = { defaultFonts = { monospace = [ "FiraCode Nerd Font Mono" "Noto Color Emoji" ]; - sansSerif = [ "SFProDisplay Nerd Font" "Noto Color Emoji" ]; - serif = [ "SFProDisplay Nerd Font" "Noto Color Emoji" ]; + sansSerif = [ "Inter Display" "Noto Color Emoji" ]; + serif = [ "Noto Serif" "Noto Color Emoji" ]; emoji = [ "Noto Color Emoji" ]; }; }; diff --git a/nixos/nix.nix b/nixos/nix.nix index 1fdc13b..be9f9e7 100644 --- a/nixos/nix.nix +++ b/nixos/nix.nix @@ -15,12 +15,17 @@ in { settings = { auto-optimise-store = true; experimental-features = [ "nix-command" "flakes" ]; - substituters = - [ "https://hyprland.cachix.org" "https://devenv.cachix.org" ]; + substituters = [ + "https://cache.nixos.org/?priority=10" + "https://nix-community.cachix.org" + "https://hyprland.cachix.org" + "https://devenv.cachix.org" + ]; trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "nixpkgs-python.cachix.org-1:hxjI7pFxTyuTHn2NkvWCrAUcNZLNS3ZAvfYNuYifcEU=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" + "nixpkgs-python.cachix.org-1:hxjI7pFxTyuTHn2NkvWCrAUcNZLNS3ZAvfYNuYifcEU=" ]; }; gc = { diff --git a/nixos/tlp.nix b/nixos/tlp.nix new file mode 100644 index 0000000..ead2f09 --- /dev/null +++ b/nixos/tlp.nix @@ -0,0 +1,28 @@ +{ + services.tlp = { + enable = true; + settings = { + CPU_SCALING_GOVERNOR_ON_AC = "performance"; + CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + + CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; + + CPU_MIN_PERF_ON_AC = 0; + CPU_MAX_PERF_ON_AC = 100; + CPU_MIN_PERF_ON_BAT = 0; + CPU_MAX_PERF_ON_BAT = 60; + + # Optional helps save long term battery health + START_CHARGE_THRESH_BAT0 = 40; # 40 and bellow it starts to charge + STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging + START_CHARGE_THRESH_BAT1 = 40; # 40 and bellow it starts to charge + STOP_CHARGE_THRESH_BAT1 = 80; # 80 and above it stops charging + RESTORE_THRESHOLD_ON_BAT = 1; + + # Networking powersave + DEVICES_TO_DISABLE_ON_LAN_CONNECT = "wifi"; + DEVICES_TO_ENABLE_ON_UNDOCK = "wifi"; + }; + }; +} diff --git a/nixos/utils.nix b/nixos/utils.nix index 3320ada..a377fe3 100644 --- a/nixos/utils.nix +++ b/nixos/utils.nix @@ -20,7 +20,7 @@ in { dbus.enable = true; gvfs.enable = true; upower.enable = true; - power-profiles-daemon.enable = true; + # power-profiles-daemon.enable = true; udisks2.enable = true; devmon.enable = true; journald.extraConfig = '' @@ -62,6 +62,7 @@ in { nix-tree stevenblack-blocklist wlay + ldns ]; services.logind.extraConfig = '' diff --git a/themes/stylix/nixy.nix b/themes/stylix/nixy.nix index f2c5d75..45f9380 100644 --- a/themes/stylix/nixy.nix +++ b/themes/stylix/nixy.nix @@ -44,12 +44,12 @@ name = "JetBrains Mono Nerd Font"; }; sansSerif = { - package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; - name = "SFProDisplay Nerd Font"; + package = pkgs.inter; + name = "Inter Display"; }; serif = { - package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; - name = "SFProDisplay Nerd Font"; + package = pkgs.noto-fonts; + name = "Noto Serif"; }; emoji = { package = pkgs.noto-fonts-emoji; @@ -57,9 +57,9 @@ }; sizes = { applications = 11; - desktop = 12; - popups = 12; - terminal = 11; + desktop = 10; + popups = 10; + terminal = 10; }; }; diff --git a/themes/var/nixy.nix b/themes/var/nixy.nix index 12428a4..b0ec56b 100644 --- a/themes/var/nixy.nix +++ b/themes/var/nixy.nix @@ -11,8 +11,8 @@ bar = { position = "top"; # "top" | "bottom" - transparent = true; - transparentButtons = false; - floating = true; + transparent = false; + transparentButtons = true; + floating = false; }; }