fixup! Replace AGS with waybar

Wow, I didn't know I can do this...

flake.lock

@@ -7,11 +7,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1762958586,
+        "lastModified": 1772290697,
-        "narHash": "sha256-1MryKS54NVQld+xDvCN0OBmAC8Jk+HmplqWbuerrhlk=",
+        "narHash": "sha256-MyLNx13P+pv1RszO1rMd3144NEeU/oU4iL+xOTpRoaU=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "0d212e20bebe63b49b588323d37c0cc46bd7000f",
+        "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": {
@@ -115,28 +115,28 @@
     "base16-fish": {
       "flake": false,
       "locked": {
-        "lastModified": 1754405784,
+        "lastModified": 1765809053,
-        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
+        "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
         "owner": "tomyun",
         "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
         "type": "github"
       },
       "original": {
         "owner": "tomyun",
         "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
         "type": "github"
       }
     },
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1752979451,
+        "lastModified": 1760703920,
-        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
+        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
+        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
         "type": "github"
       },
       "original": {
@@ -165,11 +165,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1758112371,
+        "lastModified": 1764873433,
-        "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
+        "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
+        "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
         "type": "github"
       },
       "original": {
@@ -181,11 +181,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1761588595,
+        "lastModified": 1767039857,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "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"
       }
@@ -218,11 +218,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756770412,
+        "lastModified": 1767609335,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
         "type": "github"
       },
       "original": {
@@ -291,11 +291,11 @@
       "flake": false,
       "locked": {
         "host": "gitlab.gnome.org",
-        "lastModified": 1762869044,
+        "lastModified": 1767737596,
-        "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
+        "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
+        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
         "type": "gitlab"
       },
       "original": {
@@ -313,11 +313,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764135300,
+        "lastModified": 1773681856,
-        "narHash": "sha256-5xOuutXM7UPTUcn3uDAD8UlPQsXmqPrX81cXoDOAGcA=",
+        "narHash": "sha256-+bRqxoFCJFO9ZTFhcCkzNXbDT3b8AEk88fyjB7Is6eo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f4cb25928fafa9ae68660fe71f730fc820a59028",
+        "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": 1763856454,
+        "lastModified": 1771865848,
-        "narHash": "sha256-jlP442tr1Q7BynLKEb+L5lyGViJF5qUioymBCccV7/Y=",
+        "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "7ffc0b314e638ca4f8ce9cb1305951a47d107ade",
+        "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,26 +663,26 @@
         ]
       },
       "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"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761672384,
+        "lastModified": 1770841267,
-        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
+        "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
+        "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae",
         "type": "github"
       },
       "original": {
@@ -701,11 +710,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1764522689,
+        "lastModified": 1773610124,
-        "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
+        "narHash": "sha256-EpC7ELOKmb+xXaqpK5ZRpJ5g9fxxg6tWny7/rUBfrwk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
+        "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": 1763966396,
+        "lastModified": 1773646010,
-        "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
+        "narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
+        "rev": "5b2c2d84341b2afb5647081c1386a80d7a8d8605",
         "type": "github"
       },
       "original": {
@@ -781,11 +790,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1763618868,
+        "lastModified": 1773507054,
-        "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=",
+        "narHash": "sha256-Q8U5VXgrcxmCxPtCCJCIZkcAX3FCZwGh1GNVIXxMND0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942",
+        "rev": "e80236013dc8b77aa49ca90e7a12d86f5d8d64c9",
         "type": "github"
       },
       "original": {
@@ -797,11 +806,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1762977756,
+        "lastModified": 1767767207,
-        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
+        "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
+        "rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
         "type": "github"
       },
       "original": {
@@ -813,11 +822,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1763806073,
+        "lastModified": 1772419343,
-        "narHash": "sha256-FHsEKDvfWpzdADWj99z7vBk4D716Ujdyveo5+A048aI=",
+        "narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "878e468e02bfabeda08c79250f7ad583037f2227",
+        "rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9",
         "type": "github"
       },
       "original": {
@@ -839,11 +848,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758998580,
+        "lastModified": 1767810917,
-        "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
+        "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
+        "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
         "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": {
@@ -885,21 +894,39 @@
         "nixpkgs": "nixpkgs_5",
         "nixpkgs-pinned": "nixpkgs-pinned",
         "nixpkgs-stable": "nixpkgs-stable",
+        "russia-blocked-geoip": "russia-blocked-geoip",
         "sops-nix": "sops-nix",
         "stylix": "stylix",
         "yazi": "yazi"
       }
     },
+    "russia-blocked-geoip": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1773677447,
+        "narHash": "sha256-jo3BJ7iHaicSyrljzIOQu6Ce4ALfpZSgYVNFFcZuMq0=",
+        "owner": "runetfreedom",
+        "repo": "russia-blocked-geoip",
+        "rev": "f6fa2c8e8fb5d29ba674cd809e58a4b25c99e9bf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "runetfreedom",
+        "ref": "release",
+        "repo": "russia-blocked-geoip",
+        "type": "github"
+      }
+    },
     "rust-overlay": {
       "inputs": {
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1761791894,
+        "lastModified": 1770952264,
-        "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=",
+        "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "59c45eb69d9222a4362673141e00ff77842cd219",
+        "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188",
         "type": "github"
       },
       "original": {
@@ -916,11 +943,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763952169,
+        "lastModified": 1772420823,
-        "narHash": "sha256-+PeDBD8P+NKauH+w7eO/QWCIp8Cx4mCfWnh9sJmy9CM=",
+        "narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "ab726555a9a72e6dc80649809147823a813fa95b",
+        "rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c",
         "type": "github"
       },
       "original": {
@@ -934,11 +961,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1764021963,
+        "lastModified": 1773550941,
-        "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=",
+        "narHash": "sha256-wa/++bL2QeMUreNFBZEWluQfOYB0MnQIeGNMuaX9sfs=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec",
+        "rev": "c469b6885f0dcd5c7c56bd935a0f08dbcd9e79e1",
         "type": "github"
       },
       "original": {
@@ -966,11 +993,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1764047889,
+        "lastModified": 1772296853,
-        "narHash": "sha256-KGP5anhJ+uEv4qFV3UtD1YYVn00/zOqLdVBgSdrzW/c=",
+        "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "b5072c51308a20214b7eb095b6fd01ee100a8f18",
+        "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
         "type": "github"
       },
       "original": {
@@ -1060,11 +1087,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1757716333,
+        "lastModified": 1767710407,
-        "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
+        "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
+        "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
         "type": "github"
       },
       "original": {
@@ -1076,11 +1103,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1757811970,
+        "lastModified": 1767489635,
-        "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
+        "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
+        "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
         "type": "github"
       },
       "original": {
@@ -1092,11 +1119,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1757811247,
+        "lastModified": 1767488740,
-        "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
+        "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
+        "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
         "type": "github"
       },
       "original": {
@@ -1133,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": {
@@ -1153,11 +1180,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1764149272,
+        "lastModified": 1773638943,
-        "narHash": "sha256-qQ1UB4hLrzaemZ1GjhJ2jhUqgm4pw63HanJKz+XDRvg=",
+        "narHash": "sha256-TgGuoRB28Q7IeHupfLZ/NFeztWgXS8H0HkPMy5Neb4c=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "329c80cbee5bb9e527ffa475bc0df2477f71ed93",
+        "rev": "de01a56ac5a566ecb4804659a5ecb413a9e3734f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,16 +3,18 @@
 
   nixConfig = {
     extra-substituters = [
-      "https://nix.codrs.ru/main"
+      "https://nix.lair.moe/main"
       "https://nix-community.cachix.org"
       "https://hyprland.cachix.org"
       "https://ezkea.cachix.org"
+      "https://yazi.cachix.org"
     ];
     extra-trusted-public-keys = [
       "main:kpwMe+9BsGJ/IUb7i3iadaV38y5/Yuqoct0mf7wI9ds="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
       "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI="
+      "yazi.cachix.org-1:Dcdz63NZKfvUCbDGngQDAZq6kOroIrFoyO064uvLh8k="
     ];
   };
 
@@ -26,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";
@@ -36,6 +38,11 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    russia-blocked-geoip = {
+      url = "github:runetfreedom/russia-blocked-geoip/release";
+      flake = false;
+    };
   };
 
   outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-pinned, home-manager, ... }@inputs: let

host/Eclipse/hardware-configuration.nix

@@ -47,4 +47,6 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  boot.loader.grub.useOSProber = true;
+
 }

host/Eclipse/modules/aagl.nix

@@ -3,6 +3,7 @@
   nix.settings = inputs.aagl.nixConfig; # Set up Cachix
   programs.honkers-railway-launcher.enable = true;
   programs.sleepy-launcher.enable = true;
+  programs.anime-game-launcher.enable = true;
   networking.hosts."0.0.0.0" = [
     "overseauspider.yuanshen.com"
     "log-upload-os.hoyoverse.com"

host/Eclipse/modules/hyprland.nix

@@ -2,7 +2,7 @@
   wayland.windowManager.hyprland = let
     wallpaper = pkgs.fetchurl {
       name = "miku_wallpaper.jpg";
-      url = "https://c.codrs.ru/pub/miku_wallpaper.jpeg?raw";
+      url = "https://c.lair.moe/pub/miku_wallpaper.jpeg?raw";
       hash = "sha256-inK4X5KzQk5FHwDw2DYy43nm7XtXlC6I0S1PkYUv+3w=";
     };
   in {

host/Impreza/hardware-configuration.nix

@@ -13,19 +13,19 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/31247de4-e9c0-4690-8bce-8380377b6872";
+    device = "/dev/disk/by-label/NixOS";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/328A-299C";
+    device = "/dev/disk/by-label/EFI";
     fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+    options = [ "fmask=0022" "dmask=0022" "nofail" ];
   };
 
-  fileSystems."/mnt/Windows" =
+  fileSystems."/mnt/Windows" = {
-    { device = "/dev/disk/by-uuid/84E48B00E48AF428";
+    device = "/dev/disk/by-label/Windows";
     fsType = "ntfs";
     options = [ "umask=0022" "gid=100" "uid=1000" "nofail" ];
   };

host/Rias/configuration.nix

@@ -3,7 +3,6 @@
     ./secrets/secrets.nix
     ./modules/grub.nix
     ./modules/syncthing.nix
-    ../../modules/host/adb.nix
     ../modules/gpu/nvidia.nix
 
     (import ../modules/common.nix {
@@ -27,4 +26,7 @@
   programs.gamemode.enable = true;
   services.printing.enable = true;
   hardware.opentabletdriver.enable = true;
+
+  environment.systemPackages = [ pkgs.android-tools ];
+  users.users.sweetbread.extraGroups = [ "kvm" ];
 }

host/modules/common.nix

@@ -13,7 +13,7 @@
   config = {
     nix.settings = {
       keep-going = true;
-      extra-substituters = [ "https://nix.codrs.ru/main" ];
+      extra-substituters = [ "https://nix.lair.moe/main" ];
       extra-trusted-public-keys = [ "main:kpwMe+9BsGJ/IUb7i3iadaV38y5/Yuqoct0mf7wI9ds=" ];
       experimental-features = [ "nix-command" "flakes" ];
     };

host/modules/gpu/nvidia.nix

@@ -7,7 +7,7 @@
       enable = true;
       enable32Bit = true;
       extraPackages = with pkgs-stable; [
-        nvidia-vaapi-driver
+        # nvidia-vaapi-driver
         intel-media-driver
         libvdpau-va-gl
       ];

modules/host/adb.nix

@@ -1,4 +0,0 @@
-{
-  programs.adb.enable = true;
-  users.users.sweetbread.extraGroups = ["adbusers"];  # FIXME: check users
-}

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/host/vpn.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }: {
+{ inputs, pkgs, config, ... }: {
   systemd.services.v2raya = {
     enable = true;
     description = "v2rayA gui client";
@@ -17,12 +17,7 @@
   };
 
   environment.etc = {
-    "v2raya/ru_geoip.dat".source = pkgs.fetchurl {
+    "v2raya/ru_geoip.dat".source = "${inputs.russia-blocked-geoip}/geoip.dat";
-      name = "geoip.dat";
-      url = "https://github.com/runetfreedom/russia-blocked-geoip/releases/download/202511300923/geoip.dat";
-      hash = "sha256-irYvR6UpXRojrFYCSt2zjOa3V6YzJWdUX+2IIKDR7nY=";
-    };
-
     "v2raya/bolt.db".source = config.sops.secrets.vpn_bolt.path;
   };
 }

modules/host/xdg-portal.nix

@@ -0,0 +1,40 @@
+{ pkgs, inputs, ... }:
+
+{
+  # Важно: портал должен быть собран под тот же Hyprland, что и сам Hyprland
+  # (есть отдельная опция именно для этого).
+  programs.hyprland = {
+    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+    portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+  };
+
+  xdg.portal = {
+    enable = true;
+
+    # Делает так, что xdg-open идёт через портал (часто полезно для sandbox/FHS/wrappers).
+    # Опция есть в NixOS как xdg.portal.xdgOpenUsePortal :contentReference[oaicite:2]{index=2}
+    xdgOpenUsePortal = true;
+
+    # Два бэкенда: Hyprland (композитор-специфичное) + GTK (интеграция/диалоги/OpenURI)
+    extraPortals = [
+      inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
+      pkgs.xdg-desktop-portal-gtk
+    ];
+
+    # Роутинг интерфейсов по portals.conf(5):
+    # xdg-desktop-portal выбирает конфиг по XDG_CURRENT_DESKTOP (с lower-case) :contentReference[oaicite:3]{index=3}
+    config = {
+      common = {
+        default = [ "gtk" ];
+        "org.freedesktop.impl.portal.FileChooser" = [ "gtk" ];
+        "org.freedesktop.impl.portal.ScreenCast" = [ "hyprland" ];
+        "org.freedesktop.impl.portal.Screenshot"  = [ "hyprland" ];
+        "org.freedesktop.impl.portal.GlobalShortcuts" = [ "hyprland" ];
+      };
+
+      # Если XDG_CURRENT_DESKTOP=Hyprland присутствует — предпочитаем Hyprland,
+      # но оставляем gtk как fallback для интерфейсов, которых нет у hyprland-портала.
+      hyprland.default = [ "hyprland" "gtk" ];
+    };
+  };
+}

modules/host/yggdrasil.nix

@@ -4,7 +4,7 @@
     persistentKeys = true;
     settings = {
       Peers = [
-        "tcp://codrs.ru:5001"
+        "tcp://lair.moe:5001"
       ];
     };
   };

modules/user.nix

@@ -1,6 +1,5 @@
 { config, lib, ... }: {
   imports = [
-    ./user/ags.nix
     ./user/btop.nix
     ./user/fuzzel.nix
     ./user/ghostty.nix
@@ -11,12 +10,13 @@
     ./user/neofetch.nix
     ./user/qt.nix
     ./user/sops.nix
+    ./user/ssh.nix
+    ./user/waybar.nix
     ./user/yazi.nix
     ./user/zsh.nix
 
     ./user/packages/art.nix
     ./user/packages/desktop.nix
-    ./user/packages/coding.nix
     ./user/packages/utils.nix
   ];
 }

modules/user/hyprland.nix

@@ -54,6 +54,13 @@ in {
         enable_stdout_logs = true;
       };
 
+      general = {
+        "col.inactive_border" = lib.mkForce "rgba(00000000)";
+      };
+
+      decoration.inactive_opacity = lib.mkDefault .95;
+      decoration.border_part_of_window = false;
+
       misc = {
         focus_on_activate = true;
       };
@@ -82,16 +89,24 @@ in {
         "3, horizontal, workspace"
       ];
 
+      workspace = [
+        "w[t1], gapsout:10 0 0, gapsin: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:^(xdragon)$"
+        "match:title Список друзей, float 1"
-        "float, title:(nmtui)"
+        "match:title nmtui,         float 1"
-        "float, title:(pulsemixer)"
+        "match:title pulsemixer,    float 1"
-        "float, title:(clipse)"
+
-        "size 622 652, title:(clipse)"
+        "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 [
@@ -202,4 +217,17 @@ in {
       ];
     };
   };
+
+  xdg.portal = {
+    enable = true;
+
+    extraPortals = [
+      pkgs.xdg-desktop-portal-gtk
+    ];
+
+    config.common = {
+      default = [ "hyprland" "gtk" ];
+      "org.freedesktop.impl.portal.FileChooser" = [ "gtk" ];
+    };
+  };
 }

modules/user/neofetch.nix

@@ -1,6 +1,6 @@
 { config, pkgs, ... }: let
   icon = pkgs.fetchurl {
-    url = "https://cloud.codrs.ru/pub/nixos-chan.webp?raw";
+    url = "https://cloud.lair.moe/pub/nixos-chan.webp?raw";
     name = "nixos-chan.webp";
     sha256 = "sha256-0majB9ljjMdZwvOijEgWdFKxWLje5tHgXHBJUWZfHfY=";
   };

modules/user/packages/coding.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    jetbrains.idea-community
-    android-studio
-  ];
-}

modules/user/packages/desktop.nix

@@ -4,6 +4,7 @@
     vesktop
     obs-studio
     mpv
+    imhex
     obsidian
     qbittorrent
     thunderbird

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 onscreen cursor -50% -50%"
+	];
+
 	programs.yazi = {
 		package = inputs.yazi.packages
 			.${pkgs.stdenv.hostPlatform.system}.default
@@ -54,6 +58,20 @@
 			require("git"):setup()
 			require("full-border"):setup()
 			require("starship"):setup()
+
+			Status:children_add(function()
+				local h = cx.active.current.hovered
+				if not h or ya.target_family() ~= "unix" then
+					return ""
+				end
+
+				return ui.Line {
+					ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"),
+					":",
+					ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"),
+					" ",
+				}
+			end, 500, Status.RIGHT)
 		'';
 
 		keymap = {
@@ -63,6 +81,11 @@
 					run = "plugin toggle-pane max-preview";
 					desc = "Maximize or restore the preview pane";
 				}
+				{
+					on = "Y";
+					run = ''shell -- for path in "$@"; do echo "file://$path"; done | wl-copy -t text/uri-list'';
+					desc = "Copy files into system clipboard";
+				}
 				{
 					on = ["c" "m"];
 					run = "plugin chmod";
@@ -75,7 +98,7 @@
 				}
 				{
 					on = [ "<C-n>" ];
-					run = "shell '${lib.getExe pkgs.dragon-drop} -x -i -T %h'";
+					run = "shell '${lib.getExe pkgs.dragon-drop} -x -A -i -T %s'";
 				}
 				{
 					on = [ "g" "<S-d>" ];

modules/user/zsh.nix

@@ -1,5 +1,6 @@
-{ config, pkgs, ... }: {
+{ config, osConfig, pkgs, lib, ... }: {
   home.packages = [ pkgs.nh ];
+
   programs = {
     zoxide.enable = true;
     fzf.enable = true;
@@ -62,11 +63,12 @@
         cd = "z";
         lg = "lazygit";
         s = "nix-shell . --run zsh";
+      } // lib.optionalAttrs osConfig.boot.loader.grub.useOSProber {
+        win = "sudo grub-reboot 2; sudo reboot";
       };
 
-      initContent = ''
+      initContent = /*bash*/ ''
         eval "$(zoxide init zsh)"
-        eval "$(nh completions zsh)"
         source "$(fzf-share)/key-bindings.zsh"
         source "$(fzf-share)/completion.zsh"
       '';

user/chest/home.nix

@@ -2,11 +2,10 @@
   imports = [
     ../../modules/user/packages/cs_utils.nix
   ];
-
   disabledModules = [
     ../../modules/user/packages/art.nix
-    ../../modules/user/packages/coding.nix
   ];
+
   home.packages = with pkgs; [
     nautilus
     python3

user/chest/modules/style.nix

@@ -94,7 +94,7 @@ in {
       sha256 = "0ypqnq7bsr2giq7nq1c3xrw2m0gkii9j5zhfp512r93wc96zvm50";
     };
 
-    iconTheme = {
+    icons = {
       enable = true;
       package = pkgs.pop-icon-theme;
       dark = "Pop-Dark";

user/chest/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
           ];
 

user/sweetbread/home.nix

@@ -4,7 +4,9 @@
   ];
   programs.hyprlock.enable = true;
   home.packages = with pkgs; [
+    android-studio
     vivaldi
+    weechat
   ];
 
   xdg.mimeApps = {

user/sweetbread/modules/git.nix

@@ -3,7 +3,7 @@
     enable = true;
     settings.user = {
       name  = "Sweetbread";
-      email = "risdeveau@codrs.ru";
+      email = "risdeveau@lair.moe";
     };
   };
 }

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()
 
@@ -51,11 +54,10 @@
   in {
     settings = {
       general = {
-        gaps_in = 5;
+        gaps_in = 2;
         gaps_out = 10;
         border_size = 3;
-        "col.active_border" = lib.mkForce "rgba(${colors.base0C}ee) rgba(${colors.base0B}ee) 45deg";
+        "col.active_border" = lib.mkForce "rgba(${colors.base0C}aa) rgba(${colors.base0B}aa) 45deg";
-        "col.inactive_border" = lib.mkForce "rgba(${colors.base05}aa)";
 
         layout = "dwindle";
       };
@@ -70,11 +72,7 @@
           new_optimizations = true;
         };
 
-        shadow = {
+        shadow.enabled = false;
-          enabled = true;
-          range = 4;
-          render_power = 3;
-        };
       };
 
       animations = {

user/sweetbread/modules/style.nix

@@ -97,7 +97,7 @@ in {
       sha256 = "sha256-u4d21a0Kh5OHEzQMSQ7+ey/Va2ftS1DefrOQFahaeC4=";
     };
 
-    iconTheme = {
+    icons = {
       enable = true;
       package = pkgs.pop-icon-theme;
       dark = "Pop-Dark";

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"
+  ];
+}