fixup! tty: fix Cyrillic

flake.lock

@@ -7,11 +7,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1771029844,
+        "lastModified": 1772290697,
-        "narHash": "sha256-fY6UGNKCQcYkflnkdzNRbuGNJiavQzokZjMCMVfUgCg=",
+        "narHash": "sha256-MyLNx13P+pv1RszO1rMd3144NEeU/oU4iL+xOTpRoaU=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "c3b9c0ab9e24d1648ed29040164704a1cd8fa3c9",
+        "rev": "dcb53a4cb4cb09ef7f08328428ba559be5b9f01b",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762356719,
+        "lastModified": 1772460678,
-        "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=",
+        "narHash": "sha256-NYaWs8fYJ38IgFld0hGSdT2LEVhrgO8SiRReBjIH7YY=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7",
+        "rev": "5d2cb726b16ee349df443f84b64cff53221b6983",
         "type": "github"
       },
       "original": {
@@ -197,15 +197,15 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
+        "lastModified": 1767039857,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -313,11 +313,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771037579,
+        "lastModified": 1773681856,
-        "narHash": "sha256-NX5XuhGcsmk0oEII2PEtMRgvh2KaAv3/WWQsOpxAgR4=",
+        "narHash": "sha256-+bRqxoFCJFO9ZTFhcCkzNXbDT3b8AEk88fyjB7Is6eo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "05e6dc0f6ed936f918cb6f0f21f1dad1e4c53150",
+        "rev": "57d5560ee92a424fb71fde800acd6ed2c725dfce",
         "type": "github"
       },
       "original": {
@@ -342,11 +342,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753964049,
+        "lastModified": 1772461003,
-        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
+        "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
+        "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7",
         "type": "github"
       },
       "original": {
@@ -371,11 +371,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762462052,
+        "lastModified": 1772461523,
-        "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=",
+        "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162",
+        "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804",
         "type": "github"
       },
       "original": {
@@ -393,23 +393,24 @@
         "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
-        "hyprwayland-scanner": "hyprwayland-scanner_2",
+        "hyprwayland-scanner": "hyprwayland-scanner",
+        "hyprwire": "hyprwire",
         "nixpkgs": "nixpkgs_4",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1762731096,
+        "lastModified": 1773149218,
-        "narHash": "sha256-Kma5MxOipSBamO6DnwBeqJNjJ+VwEO73zh9h1hs/2Aw=",
+        "narHash": "sha256-m5Ewi+rgn18qPP54Um4O2zwZ02oiomlZssHvXYEUv3U=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "967c3c7404d4fa00234e29c70df3e263386d2597",
+        "rev": "59f9f2688ac508a0584d1462151195a6c4992f99",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "ref": "v0.52.1-b",
+        "ref": "v0.54.2-b",
         "repo": "Hyprland",
         "type": "github"
       }
@@ -433,6 +434,10 @@
           "hyprland",
           "hyprutils"
         ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
@@ -443,11 +448,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762465111,
+        "lastModified": 1772467975,
-        "narHash": "sha256-dS13YZdWjgGGLBjpT4FHB6xf8I/WiAU+mgNWXsZgDUs=",
+        "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=",
         "owner": "hyprwm",
         "repo": "hyprland-guiutils",
-        "rev": "a415eba866a953f3096d661318f771aa0082eb98",
+        "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507",
         "type": "github"
       },
       "original": {
@@ -473,11 +478,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770899531,
+        "lastModified": 1771865848,
-        "narHash": "sha256-UBrWjh0DR8db60aLNkTnZTJ9F4kWK0Y7rUDNJC88W7A=",
+        "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "e03c34ccd51280a44ea6d1f5c040cd81ecca25ed",
+        "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960",
         "type": "github"
       },
       "original": {
@@ -498,11 +503,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759610243,
+        "lastModified": 1772460177,
-        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
+        "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
+        "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
         "type": "github"
       },
       "original": {
@@ -527,11 +532,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758927902,
+        "lastModified": 1772459629,
-        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
+        "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
+        "rev": "7615ee388de18239a4ab1400946f3d0e498a8186",
         "type": "github"
       },
       "original": {
@@ -562,7 +567,11 @@
           "hyprland-guiutils",
           "hyprutils"
         ],
-        "hyprwayland-scanner": "hyprwayland-scanner",
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprwayland-scanner"
+        ],
         "nixpkgs": [
           "hyprland",
           "hyprland-guiutils",
@@ -575,11 +584,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762463729,
+        "lastModified": 1772462885,
-        "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=",
+        "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
         "owner": "hyprwm",
         "repo": "hyprtoolkit",
-        "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532",
+        "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
         "type": "github"
       },
       "original": {
@@ -600,11 +609,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762387740,
+        "lastModified": 1772459870,
-        "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=",
+        "narHash": "sha256-xxkK2Cvqxpf/4UGcJ/TyCwrvmiNWsKsJfFzHMp2bxis=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7",
+        "rev": "e63f3a79334dec49f8eb1691f66f18115df04085",
         "type": "github"
       },
       "original": {
@@ -617,23 +626,19 @@
       "inputs": {
         "nixpkgs": [
           "hyprland",
-          "hyprland-guiutils",
-          "hyprtoolkit",
           "nixpkgs"
         ],
         "systems": [
           "hyprland",
-          "hyprland-guiutils",
-          "hyprtoolkit",
           "systems"
         ]
       },
       "locked": {
-        "lastModified": 1755184602,
+        "lastModified": 1772459835,
-        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
+        "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
+        "rev": "0a692d4a645165eebd65f109146b8861e3a925e7",
         "type": "github"
       },
       "original": {
@@ -642,8 +647,12 @@
         "type": "github"
       }
     },
-    "hyprwayland-scanner_2": {
+    "hyprwire": {
       "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
@@ -654,16 +663,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1755184602,
+        "lastModified": 1772463520,
-        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
+        "narHash": "sha256-GIjASzYnV4fK19HnyJKmHyqyxHxIpjusK9foEA4Yo+4=",
         "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
+        "repo": "hyprwire",
-        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
+        "rev": "4e1933ae5602b350c5b6633f5c932549c9b8aca2",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
+        "repo": "hyprwire",
         "type": "github"
       }
     },
@@ -701,11 +710,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1770770419,
+        "lastModified": 1773610124,
-        "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=",
+        "narHash": "sha256-EpC7ELOKmb+xXaqpK5ZRpJ5g9fxxg6tWny7/rUBfrwk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a",
+        "rev": "9fe1300f4360e13f39d6d1d006e54fd5093e9ad5",
         "type": "github"
       },
       "original": {
@@ -749,11 +758,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1762363567,
+        "lastModified": 1772542754,
-        "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
+        "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4",
+        "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4",
         "type": "github"
       },
       "original": {
@@ -765,11 +774,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1771008912,
+        "lastModified": 1773646010,
-        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
+        "narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "rev": "5b2c2d84341b2afb5647081c1386a80d7a8d8605",
         "type": "github"
       },
       "original": {
@@ -781,11 +790,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1770380644,
+        "lastModified": 1773507054,
-        "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=",
+        "narHash": "sha256-Q8U5VXgrcxmCxPtCCJCIZkcAX3FCZwGh1GNVIXxMND0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe",
+        "rev": "e80236013dc8b77aa49ca90e7a12d86f5d8d64c9",
         "type": "github"
       },
       "original": {
@@ -813,11 +822,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1768875095,
+        "lastModified": 1772419343,
-        "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=",
+        "narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0",
+        "rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9",
         "type": "github"
       },
       "original": {
@@ -862,11 +871,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762441963,
+        "lastModified": 1772024342,
-        "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=",
+        "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885",
+        "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
         "type": "github"
       },
       "original": {
@@ -894,11 +903,11 @@
     "russia-blocked-geoip": {
       "flake": false,
       "locked": {
-        "lastModified": 1773222740,
+        "lastModified": 1773677447,
-        "narHash": "sha256-x2We3wwRUjfatG5je8P9ip1snK3NvtTHv9tKlPsqOwI=",
+        "narHash": "sha256-jo3BJ7iHaicSyrljzIOQu6Ce4ALfpZSgYVNFFcZuMq0=",
         "owner": "runetfreedom",
         "repo": "russia-blocked-geoip",
-        "rev": "6138773989321235eac52193a889197c38efd942",
+        "rev": "f6fa2c8e8fb5d29ba674cd809e58a4b25c99e9bf",
         "type": "github"
       },
       "original": {
@@ -934,11 +943,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769091129,
+        "lastModified": 1772420823,
-        "narHash": "sha256-Jj/vIHjiu4OdDIrDXZ3xOPCJrMZZKzhE2UIVXV/NYzY=",
+        "narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "131e22d6a6d54ab72aeef6a5a661ab7005b4c596",
+        "rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c",
         "type": "github"
       },
       "original": {
@@ -952,11 +961,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1770683991,
+        "lastModified": 1773550941,
-        "narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=",
+        "narHash": "sha256-wa/++bL2QeMUreNFBZEWluQfOYB0MnQIeGNMuaX9sfs=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033",
+        "rev": "c469b6885f0dcd5c7c56bd935a0f08dbcd9e79e1",
         "type": "github"
       },
       "original": {
@@ -984,11 +993,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1770914701,
+        "lastModified": 1772296853,
-        "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=",
+        "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "db03fed72e5ca02be34e1d24789345a943329738",
+        "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
         "type": "github"
       },
       "original": {
@@ -1151,11 +1160,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761431178,
+        "lastModified": 1772476586,
-        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
+        "narHash": "sha256-N/ZwsRLULLpBP5ecvAUzNq8E/CgLRwPwSrHyY3xB5KM=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
+        "rev": "eb6c02a2ead882f3474f3d7f2fbe966b64ed5110",
         "type": "github"
       },
       "original": {
@@ -1171,11 +1180,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1770959024,
+        "lastModified": 1773638943,
-        "narHash": "sha256-r2fZFW+xZxEdyORsAipCrnuxQblGGldtZcx0iSQI1ZQ=",
+        "narHash": "sha256-TgGuoRB28Q7IeHupfLZ/NFeztWgXS8H0HkPMy5Neb4c=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "13bdb164a473091b46e857d37599e7e1ae22665e",
+        "rev": "de01a56ac5a566ecb4804659a5ecb413a9e3734f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -28,7 +28,7 @@
     ags.url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6";
     yazi.url = "github:sxyazi/yazi";
 
-    hyprland.url = "github:hyprwm/Hyprland/v0.52.1-b";
+    hyprland.url = "github:hyprwm/Hyprland/v0.54.2-b";
     hyprland-plugins = {
       url = "github:hyprwm/hyprland-plugins";
       inputs.hyprland.follows = "hyprland";

host/Rias/modules/hyprland.nix

@@ -39,6 +39,11 @@
         ''$mainMod, F2, exec, ${lib.getExe monitor-switcher} mirror''
         ''$mainMod, F3, exec, ${lib.getExe monitor-switcher}''
       ];
+
+      workspace = [
+        "2, layout:scrolling"
+        "4, layout:monocle"
+      ];
     };
   };
 }

modules/host/console.nix

@@ -1,6 +1,6 @@
-{ pkgs, ... }: {
+{
   console = {
-    font = "${pkgs.kbd}/share/consolefonts/LatArCyrHeb-19.psfu.gz";
+    font = "LatArCyrHeb-19";
     colors = [
       "16161E"
       "1A1B26"

modules/host/gamemode.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, pkgs-stable, lib, ... }:
 
 lib.mkIf config.programs.gamemode.enable {
   programs.steam = {
@@ -10,7 +10,7 @@ lib.mkIf config.programs.gamemode.enable {
     mangohud
     protonup-ng
     bottles
-    heroic
+    pkgs-stable.heroic
     prismlauncher
   ];
 

modules/user.nix

@@ -1,6 +1,5 @@
 { config, lib, ... }: {
   imports = [
-    ./user/ags.nix
     ./user/btop.nix
     ./user/fuzzel.nix
     ./user/ghostty.nix
@@ -11,6 +10,8 @@
     ./user/neofetch.nix
     ./user/qt.nix
     ./user/sops.nix
+    ./user/ssh.nix
+    ./user/waybar.nix
     ./user/yazi.nix
     ./user/zsh.nix
 

modules/user/hyprland.nix

@@ -2,7 +2,9 @@
   optImport = path: lib.optional (builtins.pathExists path) path;
   hostname = osConfig.networking.hostName;
 in {
-  imports =
+  imports = [
+    ./hyprland/zoom.nix
+  ] ++
     optImport ../../host/${hostname}/modules/hyprland.nix ++
     optImport ../../user/${username}/modules/hyprland.nix;
 
@@ -90,22 +92,23 @@ in {
       ];
 
       workspace = [
-        "w[t1], gapsout:10 0 0, gapsin:0"
+        "w[t1], gapsout:0"
       ];
 
       windowrule = [
-        "float, class:^(imv)$"
+        "match:class imv,           float 1"
-        "float, class:^(feh)$"
+        "match:class feh,           float 1"
-        "float, class:^(mpv)$"
+        "match:class mpv,           float 1"
-        "float, title:^(Список друзей)"
-        "move onscreen cursor -50% -50%, class:^(dragon-drop)$"
-        "float, title:(nmtui)"
-        "float, title:(pulsemixer)"
-        "float, title:(clipse)"
-        "size 622 652, title:(clipse)"
 
-        "rounding 0, focus:1"
+        "match:title Список друзей, float 1"
-        "bordersize 0, floating:0, onworkspace:w[t1]"
+        "match:title nmtui,         float 1"
+        "match:title pulsemixer,    float 1"
+
+        "match:title clipse,        float 1"
+        "match:title clipse,   size 622 652"
+
+        "match:focus 1, rounding 0"
+        "match:float 0, match:workspace w[t1], border_size 0"
       ];
 
       exec-once = lib.mkBefore [
@@ -126,7 +129,7 @@ in {
         "$mainMod, F, togglefloating,"
         "$mainMod, D, exec, fuzzel"
         "$mainMod, P, pseudo, # dwindle"
-        "$mainMod, J, togglesplit, # dwindle"
+        "$mainMod, J, layoutmsg, togglesplit, # dwindle"
 
         # Move focus with mainMod + arrow keys
         "$mainMod, left,  movefocus, l"

modules/user/hyprland/zoom.nix

@@ -0,0 +1,21 @@
+{
+  wayland.windowManager.hyprland.settings = {
+    bind = [
+      # "$mainMod, mouse_down, exec, hyprctl -q keyword cursor:zoom_factor $(hyprctl getoption cursor:zoom_factor -j | jq '.float * 1.1')"
+      # "$mainMod, mouse_up  , exec, hyprctl -q keyword cursor:zoom_factor $(hyprctl getoption cursor:zoom_factor -j | jq '(.float * 0.9) | if . < 1 then 1 else . end')"
+
+      "$mainMod SHIFT, mouse_up   , exec, hyprctl -q keyword cursor:zoom_factor 1"
+      "$mainMod SHIFT, mouse_down , exec, hyprctl -q keyword cursor:zoom_factor 1"
+      "$mainMod SHIFT, minus      , exec, hyprctl -q keyword cursor:zoom_factor 1"
+      "$mainMod SHIFT, KP_SUBTRACT, exec, hyprctl -q keyword cursor:zoom_factor 1"
+      "$mainMod SHIFT, 0          , exec, hyprctl -q keyword cursor:zoom_factor 1"
+    ];
+
+    binde = [
+      "$mainMod, equal      , exec, hyprctl -q keyword cursor:zoom_factor $(hyprctl getoption cursor:zoom_factor -j | jq '.float * 1.1')"
+      "$mainMod, minus      , exec, hyprctl -q keyword cursor:zoom_factor $(hyprctl getoption cursor:zoom_factor -j | jq '(.float * 0.9) | if . < 1 then 1 else . end')"
+      "$mainMod, KP_ADD     , exec, hyprctl -q keyword cursor:zoom_factor $(hyprctl getoption cursor:zoom_factor -j | jq '.float * 1.1')"
+      "$mainMod, KP_SUBTRACT, exec, hyprctl -q keyword cursor:zoom_factor $(hyprctl getoption cursor:zoom_factor -j | jq '(.float * 0.9) | if . < 1 then 1 else . end')"
+    ];
+  };
+}

modules/user/ssh.nix

@@ -0,0 +1,12 @@
+{
+  programs.ssh = {
+    enable = true;
+    enableDefaultConfig = false;
+    matchBlocks = {
+      "*" = {
+        serverAliveInterval = 30;
+        serverAliveCountMax = 5;
+      };
+    };
+  };
+}

modules/user/waybar.nix

@@ -0,0 +1,140 @@
+{ osConfig, config, pkgs, ... }: {
+  home.packages = with pkgs; [
+    font-awesome
+    nerd-fonts.symbols-only
+    playerctl
+  ];
+  
+  programs.waybar = {
+    enable = true;
+    systemd.enable = true;
+
+    settings.mainBar = {
+      modules-left = [
+        "hyprland/workspaces"
+        "hyprland/language"
+        "keyboard-state"
+      ];
+
+      modules-center = [
+        "mpris"
+      ];
+
+      modules-right = [
+        "tray"
+        "group/system"
+        "pulseaudio"
+        "battery"
+        "clock"
+      ];
+
+      clock = {
+        tooltip = false;
+        interval = 5;
+        format = "{:L%d %b - %H:%M %a}";
+      };
+
+      pulseaudio = {
+        format = "{icon} {volume}%";
+        format-icons = {
+          headphone =  "";
+          hands-free =  "";
+          headset =  "";
+          phone =  "";
+          phone-muted =  "";
+          portable =  "";
+          car =  "";
+          default =  ["" ""];
+        };
+        on-click = "ghostty --title=pulsemixer -e pulsemixer";
+      };
+
+      mpris = {
+        format = "{dynamic}";
+        dynamic-len = if osConfig.host.laptop then 32 else 64;
+        dynamic-order = [ "title" "artist" "album" ];
+      };
+
+      battery = {
+        interval = 5;
+        states = {
+          warning = 30;
+          critical = 15;
+        };
+        format = "{icon} {capacity}%";
+        format-icons = {
+          default = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
+          charging = ["󰢟" "󰢜" "󰂆" "󰂇" "󰂈" "󰢝" "󰂉" "󰢞" "󰂊" "󰂋" "󰂅"];
+        };
+      };
+
+      "keyboard-state" = {
+        capslock = true;
+        format = "{icon}";
+        format-icons = {
+          locked = "CAPS";
+          unlocked = "";
+        };
+      };
+
+      "hyprland/language" = {
+        format-en = "en";
+        format-ru = "ru";
+      };
+
+
+      "group/system" = {
+        orientation = "inherit";
+          drawer = {
+            transition-duration = 500;
+            transition-left-to-right = false;
+          };
+          modules = [
+            "network"
+            "custom/mem"
+            "cpu"
+            "temperature"
+          ];
+      };
+
+	    network = {
+        format = "{ifname}";
+        format-wifi = " {essid} ({signalStrength}%)";
+        format-ethernet = "{ifname}";
+        format-disconnected = "";
+        tooltip-format = "{ipaddr}";
+        max-length = 50;
+        on-click = "ghostty --title=nmtui -e nmtui";
+      };
+
+      "custom/weather" = {
+        format = "{}";
+        tooltip = true;
+        interval = 1800;
+        exec = "python3 $HOME/.config/waybar/scripts/wttr.py";
+        return-type = "json";
+      };
+
+      "custom/mem" = {
+        format = "{} ";
+        interval = 3;
+        exec = "free -h | awk '/Mem:/{printf $3}'";
+        tooltip = false;
+      };
+
+      cpu = {
+        interval = 2;
+        format = "{usage}% ";
+        min-length = 6;
+      };
+
+      temperature = {
+        hwmon-path = "/sys/class/hwmon/hwmon5/temp1_input";
+        critical-threshold = 80;
+        format = "{temperatureC}°C {icon}";
+        format-icons = ["" "" "" "" ""];
+        tooltip = false;
+      };
+    };
+  };
+}

modules/user/yazi.nix

@@ -3,6 +3,10 @@
 		( ouch.override { enableUnfree = true; } )
 	];
 
+	wayland.windowManager.hyprland.settings.windowrule = [
+		"match:class dragon-drop, move cursor_x-window_w/2 cursor_y-window_h/2"
+	];
+
 	programs.yazi = {
 		package = inputs.yazi.packages
 			.${pkgs.stdenv.hostPlatform.system}.default

user/chest/modules/waybar.nix

@@ -0,0 +1,142 @@
+{ config, pkgs, ... }: {
+  programs.waybar.settings.mainBar.spacing = 4;
+  programs.waybar.style = let
+    colors = config.lib.stylix.colors.withHashtag;
+    accent = colors.base0E;
+    scssFile = pkgs.writeText "waybar.scss" /*scss*/ ''
+      window#waybar {
+        background: ${colors.base00}80;
+        color: ${colors.base05};
+        font-weight: bold;
+        font-size: .85em;
+      }
+
+      #mpris,
+      #pulseaudio,
+      #network,
+      #battery,
+      #cpu,
+      #temperature,
+      #custom-mem,
+      #clock {
+        background: ${colors.base01};
+        padding: 8px;
+      }
+
+      #language { padding: 8px; }
+
+      #workspaces,
+      #tray {
+        background: ${colors.base01};
+      }
+
+      #workspaces button {
+        color: ${colors.base05};
+        padding: 0 2px;
+        border-radius: 999px;
+        border: 1pt solid transparent;
+        min-width: 20px;
+
+        &:hover { background: ${colors.base02}; }
+
+        &.active {
+          background: ${accent};
+          color: ${colors.base00};
+          min-width: 30px;
+
+          &:hover {
+            border-color: ${accent};
+            background: ${colors.base02};
+            color: ${accent};
+          }
+        }
+      }
+
+      #mpris {
+        border-radius: 0 0 20px 20px;
+        padding: 10px;
+        &:hover { background: ${colors.base02}; }
+        &.playing {
+          border: 3px solid ${accent};
+          border-top-color: transparent;
+          padding: calc(10px - 3px);
+        }
+      }
+
+      #tray {
+        widget {
+          border: 1pt solid transparent;
+          &:hover { background: ${colors.base02}; }
+          & > image { padding: 8px; }
+        }
+
+        & > .passive { border-color: ${colors.base02}; }
+        & > .needs-attention { border-color: ${colors.base09}; }
+      }
+
+      #pulseaudio {
+        &:hover { background: ${colors.base02}; }
+        &.muted {
+          background: ${colors.base08};
+          color: ${colors.base00};
+
+          &:hover {
+            color: ${colors.base08};
+            background: ${colors.base02};
+          }
+        }
+      }
+
+      #network {
+        &:hover { background: ${colors.base02}; }
+        &.disconnected {
+          color: ${colors.base00};
+          background: ${colors.base08};
+        }
+      }
+
+      #system .drawer-child > * {
+        margin-right: 4px
+      }
+
+      #keyboard-state label.locked {
+        color: ${colors.base08};
+      }
+
+      #battery {
+        &.plugged { color: ${colors.base0D}; }
+        &.charging { color: ${colors.base0B}; }
+        &:not(.charging) {
+          &.warning {
+            color: ${colors.base00};
+            background-color: ${colors.base09};
+          }
+          &.critical {
+            background-color: ${colors.base08};
+            color: ${colors.base00};
+            animation-name: blink;
+            animation-duration: 0.5s;
+            animation-timing-function: linear;
+            animation-iteration-count: infinite;
+            animation-direction: alternate;
+          }
+        }
+        &.full {
+          color: ${colors.base00};
+          background: ${colors.base0B};
+        }
+      }
+
+    	@keyframes blink {
+        to {
+          background-color: ${colors.base00};
+          color: ${colors.base08};
+        }
+      }
+    '';
+
+    cssFile = pkgs.runCommand "waybar.css" {
+      nativeBuildInputs = [ pkgs.dart-sass ];
+    } "sass ${scssFile} $out";
+  in builtins.readFile cssFile;
+}

user/common.nix

@@ -22,6 +22,7 @@
             ../modules/user.nix
             ./${name}/modules/git.nix
             ./${name}/modules/style.nix
+            ./${name}/modules/waybar.nix
             ./${name}/home.nix
           ];
 
@@ -56,7 +57,7 @@
 
   services.greetd = let
     tuigreet = lib.getExe pkgs.tuigreet;
-    session = lib.getExe inputs.hyprland.packages.${pkgs.system}.default;
+    session = lib.getExe' inputs.hyprland.packages.${pkgs.system}.default "start-hyprland";
   in {
     enable = true;
     settings = {

user/sweetbread/modules/hyprland.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, inputs, ... }: {
+{ pkgs, lib, config, osConfig, inputs, ... }: {
   wayland.windowManager.hyprland = let
     colors = config.lib.stylix.colors;
 
@@ -13,7 +13,10 @@
 
       notify = lambda s: system(f"notify-desktop Wallpaper '{s}'")
       folder = "${config.home.homeDirectory}/Wallpapers"
-      url = "https://wallhaven.cc/api/v1/collections/sweetbread/1764377"
+      url = "https://wallhaven.cc/api/v1/collections/sweetbread/${
+        if osConfig.networking.hostName == "Rias" then "1764377"
+        else "2108577"
+      }"
       with open("${config.sops.secrets."tokens/apis/wallhaven".path}") as f:
         token = f.read()
 

user/sweetbread/modules/waybar.nix

@@ -0,0 +1,145 @@
+{ config, pkgs, ... }: {
+  programs.waybar.settings.mainBar.spacing = 8;
+  programs.waybar.style = let
+    colors = config.lib.stylix.colors.withHashtag;
+    radius = "6px";
+    scssFile = pkgs.writeText "waybar.scss" /*scss*/ ''
+      window#waybar {
+        background: transparent;
+        color: ${colors.base05};
+        border-radius: ${radius};
+        font-weight: bold;
+        font-size: .85em;
+
+        & > * { padding: 8px; }
+      }
+
+      #language,
+      #mpris,
+      #pulseaudio,
+      #network,
+      #battery,
+      #cpu,
+      #temperature,
+      #keyboard-state label.locked,
+      #custom-mem,
+      #clock {
+        background: ${colors.base00};
+        border-radius: ${radius};
+        padding: 8px;
+      }
+
+      #workspaces,
+      #tray {
+        background: ${colors.base00};
+        border-radius: ${radius};
+      }
+
+      #workspaces button {
+        color: ${colors.base05};
+        padding: 4px;
+        border-radius: ${radius};
+        border: 1pt solid transparent;
+
+        &:hover { background: ${colors.base01}; }
+
+        &.active {
+          background: ${colors.base0B};
+          color: ${colors.base00};
+
+          &:hover {
+            border-color: ${colors.base0B};
+            background: ${colors.base01};
+            color: ${colors.base0B};
+          }
+        }
+      }
+
+      #mpris {
+        &:hover { background: ${colors.base01}; }
+        &.paused { opacity: .5; }
+      }
+
+      #tray {
+        widget {
+          border: 1pt solid transparent;
+          border-radius: ${radius};
+          &:hover { background: ${colors.base01}; }
+          & > image { padding: 8px; }
+        }
+
+        & > .passive { border-color: ${colors.base02}; }
+        & > .needs-attention { border-color: ${colors.base09}; }
+      }
+
+      #pulseaudio {
+        &:hover { background: ${colors.base01}; }
+        &.muted {
+          background: ${colors.base08};
+          color: ${colors.base00};
+
+          &:hover {
+            color: ${colors.base08};
+            background: ${colors.base01};
+          }
+        }
+      }
+
+      #network {
+        &:hover { background: ${colors.base01}; }
+        &.disconnected {
+          color: ${colors.base00};
+          background: ${colors.base08};
+        }
+      }
+
+      #system .drawer-child > * {
+        margin-right: 4px
+      }
+
+      #keyboard-state label.locked {
+        background-color: ${colors.base00};
+        color: ${colors.base08};
+      }
+
+      #battery {
+        &.plugged { color: ${colors.base0D}; }
+        &.charging { color: ${colors.base0B}; }
+        &:not(.charging) {
+          &.warning {
+            color: ${colors.base00};
+            background-color: ${colors.base09};
+          }
+          &.critical {
+            background-color: ${colors.base08};
+            color: ${colors.base00};
+            animation-name: blink;
+            animation-duration: 0.5s;
+            animation-timing-function: linear;
+            animation-iteration-count: infinite;
+            animation-direction: alternate;
+          }
+        }
+        &.full {
+          color: ${colors.base00};
+          background: ${colors.base0B};
+        }
+      }
+
+    	@keyframes blink {
+        to {
+          background-color: ${colors.base00};
+          color: ${colors.base08};
+        }
+      }
+    '';
+
+    cssFile = pkgs.runCommand "waybar.css" {
+      nativeBuildInputs = [ pkgs.dart-sass ];
+    } "sass ${scssFile} $out";
+  in builtins.readFile cssFile;
+
+  wayland.windowManager.hyprland.settings.layerrule = [
+    "blur on, match:namespace waybar"
+  ];
+}