wip: yin

https://github.com/helix-editor/helix/discussions/5764#discussioncomment-9518381

drv/mumble.nix

@@ -1,60 +0,0 @@
-{ lib
-, pkgs
-, mumble ? pkgs.mumble
-}:
-
-let
-  # PipeWire 1.4.0 removed client-rt.conf, changing how clients negotiate
-  # realtime scheduling. Mumble never adapted, so its PipeWire data-loop
-  # thread stalls mid-negotiation and its own RT watchdog SIGKILLs the
-  # whole process almost immediately on every launch (confirmed via
-  # bpftrace: signal_generate shows Mumble's own "data-loop.0" thread
-  # sending itself SIGKILL). Reproduced identically on both the packaged
-  # 1.5.915 (Qt5) and a from-source 1.6.870 RC (Qt6) build, so it's the
-  # shared PipeWire client integration at fault, not Mumble's UI stack.
-  #
-  # Upstream: https://github.com/mumble-voip/mumble/issues/6780
-  # Bisected there to PipeWire 1.2.7 (last known-good) vs 1.4.1+ (broken).
-  #
-  # Fix: give Mumble an old, compatible libpipewire-0.3.so to dlopen at
-  # runtime. The system's actual PipeWire daemon is untouched (still
-  # whatever version NixOS ships) - only the client library Mumble talks
-  # through is pinned back.
-  pipewireGoodPkgs = import (fetchTarball {
-    url = "https://channels.nixos.org/nixos-24.11/nixexprs.tar.xz";
-    sha256 = "189lwv8l10bm9fnksfkzy05pm86gmziy9z3bdn13zc8d636ylchj"; # nix-prefetch-url --unpack https://channels.nixos.org/nixos-24.11/nixexprs.tar.xz
-  }) { inherit (pkgs) system; };
-  pipewireGood = pipewireGoodPkgs.pipewire;
-
-  # Mumble's own build is Qt5-based; QT_PLUGIN_PATH isn't set by its
-  # wrapper for the platform/sql plugins mumble actually needs when we
-  # bypass that wrapper below, so it has to be supplied explicitly.
-  qt5PluginPath = lib.makeSearchPath "lib/qt-${pkgs.qt5.qtbase.version}/plugins" [
-    pkgs.qt5.qtbase.bin
-    pkgs.qt5.qtsvg.bin
-    pkgs.qt5.qtwayland.bin
-  ];
-in
-pkgs.symlinkJoin {
-  name = "mumble-pipewire-fixed-${mumble.version}";
-
-  paths = [ mumble ];
-
-  nativeBuildInputs = [ pkgs.makeWrapper ];
-
-  # mumble's own wrapper always prepends its own (broken, too-new)
-  # PipeWire path in front of anything we set, so wrapping it a second
-  # time can't win that ordering fight. Instead we skip straight to the
-  # real unwrapped binary and set env ourselves.
-  postBuild = ''
-    rm -f $out/bin/mumble
-    makeWrapper ${mumble}/bin/.mumble-wrapped $out/bin/mumble \
-      --prefix LD_LIBRARY_PATH : "${pipewireGood}/lib" \
-      --set QT_PLUGIN_PATH "${qt5PluginPath}"
-  '';
-
-  meta = mumble.meta // {
-    description = mumble.meta.description
-      + " (patched: pinned PipeWire client lib to 1.2.7 to work around SIGKILL-on-launch with PipeWire >=1.4.0, see mumble#6780)";
-  };
-}

flake.lock

@@ -3,17 +3,15 @@
     "aagl": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs",
-          "nixpkgs"
-        ],
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1789138122,
+        "lastModified": 1783689476,
-        "narHash": "sha256-mh+ZiGCtHAo0xIi1yaNjHsftfnlWz9JiYwHCyT16yIE=",
+        "narHash": "sha256-Ac4EGPZr9e+mPUdmavJFSTft4vgoXml40+YOFYKTXPg=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "d82d6d6f66caf4b63fb154e62fad83c627874127",
+        "rev": "af94408291ad477cae8eed964981ab41f90eb184",
         "type": "github"
       },
       "original": {
@@ -25,9 +23,7 @@
     "ags": {
       "inputs": {
         "astal": "astal",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_2"
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1744557573,
@@ -64,11 +60,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784368054,
+        "lastModified": 1772460678,
-        "narHash": "sha256-zF1iJkBQSDWmRO4/LEeHR1SpKY0lqZaxkoQJpPS9K9U=",
+        "narHash": "sha256-NYaWs8fYJ38IgFld0hGSdT2LEVhrgO8SiRReBjIH7YY=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "9b5f14d9483445e766294eb8fbe0b8f370269ed0",
+        "rev": "5d2cb726b16ee349df443f84b64cff53221b6983",
         "type": "github"
       },
       "original": {
@@ -189,11 +185,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1783570805,
+        "lastModified": 1782007937,
-        "narHash": "sha256-ptl5aRlCv9/uRSv2u8Hq8UFVFeZ6Q/bT049bpqNgc3w=",
+        "narHash": "sha256-PbnJr+eB+9Czol3ReI83dUgEhcn0sDK6TSy6ODTQm88=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "5602ed62d638142c1ab31dccd01dfbfb28841225",
+        "rev": "981bd332015397fb1ca033fa982bd61635160c78",
         "type": "github"
       },
       "original": {
@@ -234,22 +230,6 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -305,6 +285,28 @@
         "type": "github"
       }
     },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "gnome-shell": {
       "flake": false,
       "locked": {
@@ -326,17 +328,15 @@
     },
     "helix-steel": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_3",
-          "nixpkgs"
-        ],
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1788213353,
+        "lastModified": 1784384926,
-        "narHash": "sha256-vJ7VgxuM/Dp7vyVlu6EXjP/ES14TALy64jgzyuYZl6g=",
+        "narHash": "sha256-qYR2f+uSUNsJYbbwSo9bCB+LI7n3NzQDCHXJRmHztDg=",
         "owner": "mattwparas",
         "repo": "helix",
-        "rev": "ba5b022c1000a0ce28d4ce1d09acdd062a83a020",
+        "rev": "8d189f46e9c620baa685bdfbe39b7c95928475a0",
         "type": "github"
       },
       "original": {
@@ -353,11 +353,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1789320570,
+        "lastModified": 1784913159,
-        "narHash": "sha256-1Js4AJiWLV7U1SF3ok0J2tKbBEJYE5YpElGU+7fMbfo=",
+        "narHash": "sha256-JWq0BfjO4ktpH5USfQNQzdvHpIDT8fSKD5K7LvdMRFs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "87b3c74df02a2b2e691a24f3c82774f48a70c1bd",
+        "rev": "079a3b5d1aa6a719920a51316253b7d6dd22738d",
         "type": "github"
       },
       "original": {
@@ -382,11 +382,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776511930,
+        "lastModified": 1772461003,
-        "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=",
+        "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "39435900785d0c560c6ae8777d29f28617d031ef",
+        "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7",
         "type": "github"
       },
       "original": {
@@ -411,11 +411,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782566056,
+        "lastModified": 1772461523,
-        "narHash": "sha256-haEZcHzYrePnjFOYSWTbxm/Nrla0aPslJfmvdCvqtVc=",
+        "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "c6e7b9f673f4360bc813d3dc75028f75ee88d3f8",
+        "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804",
         "type": "github"
       },
       "original": {
@@ -435,22 +435,22 @@
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_4",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1785170029,
+        "lastModified": 1773149218,
-        "narHash": "sha256-8CKDx282HhxlD1pwXPnC4uK29Abn1Jsnh7LgPzeIXxI=",
+        "narHash": "sha256-m5Ewi+rgn18qPP54Um4O2zwZ02oiomlZssHvXYEUv3U=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "5c9377c15f85c50648f35ca5a213754f95b93ca0",
+        "rev": "59f9f2688ac508a0584d1462151195a6c4992f99",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "ref": "v0.56.1",
+        "ref": "v0.54.2-b",
         "repo": "Hyprland",
         "type": "github"
       }
@@ -488,11 +488,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784196523,
+        "lastModified": 1772467975,
-        "narHash": "sha256-ahtKMGXFJdlQNhatQm1+BBU/pGfGYnAqQt3vWvq4p8s=",
+        "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=",
         "owner": "hyprwm",
         "repo": "hyprland-guiutils",
-        "rev": "a6ccb6cb112ed5a244c0191fb972347ecfa893e0",
+        "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507",
         "type": "github"
       },
       "original": {
@@ -518,11 +518,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1788563182,
+        "lastModified": 1784102347,
-        "narHash": "sha256-e2Q7i5T+iQY0o/uxFNnXxWpXZ1e5f6VV4eHdKk7l6kc=",
+        "narHash": "sha256-piRpwar7VZI3YviYo0a/UMFz9+rLesfv3nRLGKxjVGg=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "722f15a77768eab13f01f5e5dce024bd2f61f270",
+        "rev": "7644cecdb947060682891a0db2a0cdc5c0b9e704",
         "type": "github"
       },
       "original": {
@@ -572,11 +572,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777320127,
+        "lastModified": 1772459629,
-        "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=",
+        "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc",
+        "rev": "7615ee388de18239a4ab1400946f3d0e498a8186",
         "type": "github"
       },
       "original": {
@@ -624,11 +624,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782554491,
+        "lastModified": 1772462885,
-        "narHash": "sha256-+p3MlyN/nqRefcf2IckPlGRUn9+hielqpS9XClbLleM=",
+        "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
         "owner": "hyprwm",
         "repo": "hyprtoolkit",
-        "rev": "bdba25ced39ea39ab004a8f31593ba0b0ff1ca35",
+        "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
         "type": "github"
       },
       "original": {
@@ -649,11 +649,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784323413,
+        "lastModified": 1772459870,
-        "narHash": "sha256-XnAVV+H4f8Xdv0yZcSwJ5kCjLyE8fHxPeLX6a3HSrAU=",
+        "narHash": "sha256-xxkK2Cvqxpf/4UGcJ/TyCwrvmiNWsKsJfFzHMp2bxis=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "5f03477ab3a005ff27c527486f551883535aea2f",
+        "rev": "e63f3a79334dec49f8eb1691f66f18115df04085",
         "type": "github"
       },
       "original": {
@@ -674,11 +674,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777159683,
+        "lastModified": 1772459835,
-        "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=",
+        "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404",
+        "rev": "0a692d4a645165eebd65f109146b8861e3a925e7",
         "type": "github"
       },
       "original": {
@@ -703,11 +703,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778410714,
+        "lastModified": 1772463520,
-        "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=",
+        "narHash": "sha256-GIjASzYnV4fK19HnyJKmHyqyxHxIpjusK9foEA4Yo+4=",
         "owner": "hyprwm",
         "repo": "hyprwire",
-        "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc",
+        "rev": "4e1933ae5602b350c5b6633f5c932549c9b8aca2",
         "type": "github"
       },
       "original": {
@@ -718,15 +718,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1784356753,
+        "lastModified": 1782723713,
-        "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=",
+        "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a",
+        "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -750,11 +750,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1789114715,
+        "lastModified": 1784856561,
-        "narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=",
+        "narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "21a67dc470149f337cecafbe965d8d252a390518",
+        "rev": "597283ad8aa0b331c788e97c4c262d58877074ef",
         "type": "github"
       },
       "original": {
@@ -766,11 +766,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1789149629,
+        "lastModified": 1743583204,
-        "narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=",
+        "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "eaad089433ca2bb662274377d33df3d0e51ef28b",
+        "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
         "type": "github"
       },
       "original": {
@@ -780,6 +780,102 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1775036866,
+        "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1772542754,
+        "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1784796856,
+        "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "e2587caef70cea85dd97d7daab492899902dbf5d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1782175435,
+        "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1783224372,
+        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_8": {
+      "locked": {
+        "lastModified": 1783279667,
+        "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "inputs": {
         "flake-parts": [
@@ -792,11 +888,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785549842,
+        "lastModified": 1783439237,
-        "narHash": "sha256-DCwBZmGsySF7oKGTRgEv2HvpxVXkHT+38VhTM76k0B4=",
+        "narHash": "sha256-WUr8JF2v3n4Y30E5dxv4sAgNJXpVDBoCQNoQ/V4+n4o=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "a9f987b57594e845e3e5cdd423b9a70846d70308",
+        "rev": "b70bb66c7bcd162642f3a609bc16843c7059f503",
         "type": "github"
       },
       "original": {
@@ -808,17 +904,18 @@
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore",
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1784288435,
+        "lastModified": 1772024342,
-        "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
+        "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9",
+        "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
         "type": "github"
       },
       "original": {
@@ -836,12 +933,11 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-pinned": "nixpkgs-pinned",
         "nixpkgs-stable": "nixpkgs-stable",
         "sops-nix": "sops-nix",
         "stylix": "stylix",
-        "waybar": "waybar",
         "yazi": "yazi",
         "yazi-plugins": "yazi-plugins"
       }
@@ -854,11 +950,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785476452,
+        "lastModified": 1782875958,
-        "narHash": "sha256-/CXwCFPS41rb/JI2VitKCgVK6V5E6/sfw5ke3B9zyVQ=",
+        "narHash": "sha256-5eqDcnBjb1424HRQdnhuhNOBZguq1Z2tqSa2OMF/m2c=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "6ef009bf4c4873cdc1a621826722bdea7c03e62c",
+        "rev": "13139aefa973f3d96c60c0fbab801de058ae25ca",
         "type": "github"
       },
       "original": {
@@ -911,16 +1007,14 @@
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_6"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1788914643,
+        "lastModified": 1783174389,
-        "narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=",
+        "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "13616fff713a9f94055c66f15687ebdc17a335df",
+        "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
         "type": "github"
       },
       "original": {
@@ -938,9 +1032,7 @@
         "firefox-gnome-theme": "firefox-gnome-theme",
         "flake-parts": "flake-parts",
         "gnome-shell": "gnome-shell",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_7",
-          "nixpkgs"
-        ],
         "nur": "nur",
         "systems": "systems_2",
         "tinted-kitty": "tinted-kitty",
@@ -949,11 +1041,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1787771653,
+        "lastModified": 1784676123,
-        "narHash": "sha256-DkkJSBOXWV/mja5Vy8az5g1KpZlsbUwlmH0BsQhowaQ=",
+        "narHash": "sha256-ndyanKzw90yX2nUVFmTuYqXidUNymtMfgmIHyNdhht0=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "5e3809851f486e7fc7e84b40f174c74b60ecc784",
+        "rev": "66714e5ce44269ecc58c20d9196da8dbe1b27a31",
         "type": "github"
       },
       "original": {
@@ -979,16 +1071,15 @@
     },
     "systems_2": {
       "locked": {
-        "lastModified": 1774449309,
+        "lastModified": 1681028828,
-        "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
         "repo": "default",
-        "rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "ref": "future-26.11",
         "repo": "default",
         "type": "github"
       }
@@ -1027,11 +1118,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1785153830,
+        "lastModified": 1781968807,
-        "narHash": "sha256-fNdfCTeCXU3tZG3TMincd+u68qBHQgCr2Ljr/M1mWP0=",
+        "narHash": "sha256-yYO3Vw2M0y3TAUqt+9+Mj0zwP3XDTF5/PXcPhhFQ1ZM=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "9bd28ed313560db3c5b605c63bc4e309e78e3fc8",
+        "rev": "2ccef2f4b22e3cab5a9292811f7133a07eeba4a7",
         "type": "github"
       },
       "original": {
@@ -1043,11 +1134,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1785031658,
+        "lastModified": 1782012462,
-        "narHash": "sha256-mZp9O2LjzdMzlqQF3l3fjqsuPBzXy+1qTfBEUGjTlpk=",
+        "narHash": "sha256-2iDiD8DQLwS1lGuD9TS8WlvNyDoTs6krWntJbtB2zGo=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "5d2c67f61ea7af36f16865ab6d541cdba41dc257",
+        "rev": "8c4e750f738a742bd73377ee41d3dadedebedef4",
         "type": "github"
       },
       "original": {
@@ -1059,11 +1150,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1785030526,
+        "lastModified": 1782009766,
-        "narHash": "sha256-klZf8UviewRkxuu74Bhbq6tqy7oxebQC7UVRWbbtQxU=",
+        "narHash": "sha256-VUhBjpGvWqHI7rWeyMYb/u87YJSXHKfVV6S+IelWeO8=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "16f5a8adf4a6b1310d0a61ab172de963e8f76a02",
+        "rev": "5e8350bcd354e3241ab681a265fa6ef060c40be1",
         "type": "github"
       },
       "original": {
@@ -1072,27 +1163,6 @@
         "type": "github"
       }
     },
-    "waybar": {
-      "inputs": {
-        "flake-compat": "flake-compat_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1789627973,
-        "narHash": "sha256-OJBVQSIpW0Ozb3czGP3+TQyDC5BBqMQtx2asPsspFHo=",
-        "owner": "Alexays",
-        "repo": "Waybar",
-        "rev": "1687ec724a89756e79371784a2ba3f9700f8e5c6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Alexays",
-        "repo": "Waybar",
-        "type": "github"
-      }
-    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
@@ -1121,11 +1191,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784371182,
+        "lastModified": 1772476586,
-        "narHash": "sha256-S8A1lezEalltWcCp3gAic5lssS0xTSISK6fKODefhOk=",
+        "narHash": "sha256-N/ZwsRLULLpBP5ecvAUzNq8E/CgLRwPwSrHyY3xB5KM=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "08d99f727944dd15e4740090305e31c5fb92a50a",
+        "rev": "eb6c02a2ead882f3474f3d7f2fbe966b64ed5110",
         "type": "github"
       },
       "original": {
@@ -1137,17 +1207,15 @@
     "yazi": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_8",
-          "nixpkgs"
-        ],
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1789171366,
+        "lastModified": 1784994533,
-        "narHash": "sha256-b7B5VQC96NJx0/q5pTVWqgGjyCiO0Cz1aPfVJcBXLfA=",
+        "narHash": "sha256-DDle7Ge8I+Wd77hwWCKLs/BuhBobmoZxWRG9PGGjPJ8=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "b8973fb4c2b9b184aad03cfc717c1fefe4140c40",
+        "rev": "d30866dbb22e9ee50226bb65c6cec72dbce5ad98",
         "type": "github"
       },
       "original": {
@@ -1159,11 +1227,11 @@
     "yazi-plugins": {
       "flake": false,
       "locked": {
-        "lastModified": 1788955781,
+        "lastModified": 1784743894,
-        "narHash": "sha256-kwf9+KXOL5JXGDoEGdtwq+JujP8GVoOwDgz76FBM3xk=",
+        "narHash": "sha256-lio4pvrqK575q7M+GtRr/5EdA4h2J/7gIvXK8c5rq1U=",
         "owner": "yazi-rs",
         "repo": "plugins",
-        "rev": "58c4f4e2f4835cc9bf6751f39e3f7c574fc7f55a",
+        "rev": "bbac5e75b22a2893ef7cdd2bd6814b15f2abb91e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -19,72 +19,35 @@
   };
 
   inputs = {
-    aagl = {
+    aagl.url = "github:ezKEa/aagl-gtk-on-nix";
-      url = "github:ezKEa/aagl-gtk-on-nix";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-      inputs.nixpkgs.follows = "nixpkgs";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05";
-    };
+    nixpkgs-pinned.url = "github:nixos/nixpkgs/ec942ba042dad5ef097e2ef3a3effc034241f011";
-
-    ags = {
-      url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     disko = {
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    sops-nix.url = "github:Mic92/sops-nix";
+    stylix.url = "github:danth/stylix";
+    ags.url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6";
+    helix-steel.url = "github:mattwparas/helix/steel-event-system";
 
-    helix-steel = {
+    yazi.url = "github:sxyazi/yazi";
-      url = "github:mattwparas/helix/steel-event-system";
+    yazi-plugins = {
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:yazi-rs/plugins";
+      flake = false;
+    };
+
+    hyprland.url = "github:hyprwm/Hyprland/v0.54.2-b";
+    hyprland-plugins = {
+      url = "github:hyprwm/hyprland-plugins";
+      inputs.hyprland.follows = "hyprland";
     };
 
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    hyprland = {
-      url = "github:hyprwm/Hyprland/v0.56.1";
-      # inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    hyprland-plugins = {
-      url = "github:hyprwm/hyprland-plugins";
-      inputs = {
-        hyprland.follows = "hyprland";
-      # nixpkgs.follows = "nixpkgs";
-      };
-    };
-
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-pinned.url = "github:nixos/nixpkgs/ec942ba042dad5ef097e2ef3a3effc034241f011";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05";
-
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    stylix = {
-      url = "github:danth/stylix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    waybar = {
-      url = "github:Alexays/Waybar";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    yazi = {
-      url = "github:sxyazi/yazi";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    yazi-plugins = {
-      url = "github:yazi-rs/plugins";
-      flake = false;
-    };
   };
 
   outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-pinned, home-manager, ... }@inputs: let

host/Eclipse/modules/hyprland.nix

@@ -1,40 +1,27 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, ... }: {
-let
+  wayland.windowManager.hyprland = let
-  hyprLua = import ../../../modules/user/hyprland/lua.nix { inherit lib; };
     wallpaper = pkgs.fetchurl {
       name = "miku_wallpaper.jpg";
       url = "https://c.lair.moe/pub/miku_wallpaper.jpeg?raw";
       hash = "sha256-inK4X5KzQk5FHwDw2DYy43nm7XtXlC6I0S1PkYUv+3w=";
     };
-in {
+  in {
-  wayland.windowManager.hyprland.settings = {
+    settings = {
       monitor = [
-      {
+        "DP-3    , 1920x1080@165, 0x0    , 1"
-        output = "DP-3";
+        "HDMI-A-1, preferred    , -1080x0, 1, transform, 1"
-        mode = "1920x1080@165";
-        position = "0x0";
-        scale = 1;
-      }
-      {
-        output = "HDMI-A-1";
-        mode = "preferred";
-        position = "-1080x0";
-        scale = 1;
-        transform = 1;
-      }
       ];
 
-    workspace_rule = [
+      workspace = [
-      { workspace = "1"; monitor = "DP-3"; default = true; }
+        "1,  monitor:DP-3,     default:true"
-      { workspace = "10"; monitor = "HDMI-A-1"; default = true; }
+        "10, monitor:HDMI-A-1, default:true"
       ];
 
-    on = [
+      exec-once = [
-      (hyprLua.onStart [
+        "hyprctl dispatch workspace 1"
-        "hyprctl dispatch 'hl.dsp.focus({ workspace = 1 })'"
         "${lib.getExe pkgs.swww} img -o HDMI-A-1 ${wallpaper}"
         "${lib.getExe pkgs.linux-wallpaperengine} ~/.local/share/wpe/wallpaper --assets-dir ~/.local/share/wpe/assets --screen-root DP-3 --noautomute"
-      ])
       ];
     };
+  };
 }

host/Impreza/modules/hyprland.nix

@@ -1,15 +1,15 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, ... }: {
-let
+  wayland.windowManager.hyprland = let
-  hyprLua = import ../../../modules/user/hyprland/lua.nix { inherit lib; };
     wallpaper = pkgs.fetchurl {
       name = "miku_wallpaper.jpg";
       url = "https://c.lair.moe/pub/miku_wallpaper.jpeg?raw";
       hash = "sha256-inK4X5KzQk5FHwDw2DYy43nm7XtXlC6I0S1PkYUv+3w=";
     };
-in {
+  in {
-  wayland.windowManager.hyprland.settings.on = [
+    settings = {
-    (hyprLua.onStart [
+      exec-once = [
         "${lib.getExe pkgs.swww} img -o eDP-1 ${wallpaper}"
-    ])
       ];
+    };
+  };
 }

host/Inaho/modules/hyprland.nix

@@ -1,10 +1,9 @@
 {
-  wayland.windowManager.hyprland.settings.monitor = [
+  wayland.windowManager.hyprland = {
-    {
+    settings = {
-      output = "eDP-1";
+      monitor = [
-      mode = "1920x1080@60";
+        "eDP-1, 1920x1080@60, 0x0, 1"
-      position = "0x0";
-      scale = 1;
-    }
       ];
+    };
+  };
 }

host/Inaho/modules/syncthing.nix

@@ -26,11 +26,6 @@
           path = "/home/sweetbread/Documents/Obsidian";
           devices = [ "Rias" "Akeno" "Koneko" ];
         };
-
-        "Documents" = {
-          path = "/home/sweetbread/Documents";
-          devices = [ "Rias" ];
-        };
       };
     };
   };

host/Rias/hardware-configuration.nix

@@ -11,10 +11,6 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  environment.etc.crypttab.text = ''
-    storage UUID=9327148b-788a-4c23-ac73-28464ffabe1b none luks
-  '';
-
   fileSystems."/" = {
     device = "/dev/disk/by-label/NixOS";
     fsType = "ext4";
@@ -27,9 +23,9 @@
   };
 
   fileSystems."/mnt/D" = {
-    device = "/dev/mapper/storage";
+    device = "/dev/disk/by-label/Data";
-    fsType = "ext4";
+    fsType = "ntfs3";
-    options = [ "noatime" "nofail" ];
+    options = ["umask=0022" "gid=100" "uid=1000" "nofail" ];
   };
 
   swapDevices = [ ];

host/Rias/modules/hyprland.nix

@@ -1,50 +1,44 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, ...}: {
-let
+  wayland.windowManager.hyprland = let
-  hyprLua = import ../../../modules/user/hyprland/lua.nix { inherit lib; };
-
     monitor-switcher = pkgs.writers.writeBashBin "monitor_switcher" /*bash*/ ''
       MODE=$1
 
       case $MODE in
         "tv")
-        hyprctl eval 'hl.monitor({ output = "DP-3", mode = "1920x1080@60", position = "3840x0", scale = 1 })'
+          hyprctl keyword monitor "DP-3, 1920x1080@60, 3840x0, 1"
-        hyprctl eval 'hl.monitor({ output = "HDMI-A-1", mode = "3840x2160@60", position = "0x0", scale = 1 })'
+          hyprctl keyword monitor "HDMI-A-1, 3840x2160@60, 0x0, 1"
           notify-send "TV mode"
         ;;
 
         "mirror")
-        hyprctl eval 'hl.monitor({ output = "HDMI-A-1", mode = "3840x2160@60", position = "0x0", scale = 1 })'
+          hyprctl keyword monitor "HDMI-A-1, 3840x2160@60, 0x0, 1"
-        hyprctl eval 'hl.monitor({ output = "DP-3", mode = "preferred", position = "auto", scale = 1, mirror = "HDMI-A-1" })'
+          hyprctl keyword monitor "DP-3, preferred, auto, 1, mirror, HDMI-A-1"
           notify-send "TV-only mode"
         ;;
 
         "display"|*)
-        hyprctl eval 'hl.monitor({ output = "HDMI-A-1", disabled = true })'
+          hyprctl keyword monitor "HDMI-A-1, disable"
-        hyprctl eval 'hl.monitor({ output = "DP-3", mode = "3440x1440@165", position = "0x0", scale = 1 })'
+          hyprctl keyword monitor "DP-3, 3440x1440@165, 0x0, 1"
           notify-send "Display mode"
         ;;
+
       esac
     '';
-in {
+  in {
-  wayland.windowManager.hyprland.settings = {
+    settings = {
       monitor = [
-      {
+        "DP-3, 3440x1440@165, auto-right, 1"
-        output = "DP-3";
+        # "HDMI-A-1, 3840x2160@60, auto-left, 2"
-        mode = "3440x1440@165";
+        "HDMI-A-1, disabled"
-        position = "auto-right";
-        scale = 1;
-      }
-      {
-        output = "HDMI-A-1";
-        disabled = true;
-      }
       ];
 
       bind = [
-      (hyprLua.bind "XF86Calculator" (hyprLua.exec "ghostty --title=pulsemixer -e pulsemixer"))
+        '', XF86Calculator, exec, ghostty --title=pulsemixer -e pulsemixer''
-      (hyprLua.bind "SUPER + F1" (hyprLua.exec "${lib.getExe monitor-switcher} tv"))
+
-      (hyprLua.bind "SUPER + F2" (hyprLua.exec "${lib.getExe monitor-switcher} mirror"))
+        ''$mainMod, F1, exec, ${lib.getExe monitor-switcher} tv''
-      (hyprLua.bind "SUPER + F3" (hyprLua.exec "${lib.getExe monitor-switcher}"))
+        ''$mainMod, F2, exec, ${lib.getExe monitor-switcher} mirror''
+        ''$mainMod, F3, exec, ${lib.getExe monitor-switcher}''
       ];
     };
+  };
 }

host/Rias/modules/syncthing.nix

@@ -11,9 +11,8 @@
 
     settings = {
       devices = {
-        Akeno.id = "QDW3WJX-J7ETS4R-32CUAIY-EGNM2RD-ZEHOUW2-CHOEOUG-USZOWTR-HHQS2QX";
+        Akeno = { id = "QDW3WJX-J7ETS4R-32CUAIY-EGNM2RD-ZEHOUW2-CHOEOUG-USZOWTR-HHQS2QX"; };
-        Koneko.id = "PJFWQRY-ZFUBGDR-NV7KVBL-UBDQ4HT-KPTYP34-MUDFPJU-4EZUHTT-ZLYRMAB";
+        Koneko = { id = "PJFWQRY-ZFUBGDR-NV7KVBL-UBDQ4HT-KPTYP34-MUDFPJU-4EZUHTT-ZLYRMAB"; };
-        Inaho.id = "GEHWQFQ-MPIMQ7R-QEWSOEB-BIZAHSZ-5YOFATK-KDIXFMV-JX3OF6G-ZPNZMA4";
       };
 
       folders = {
@@ -34,17 +33,7 @@
 
         "Music" = {
           path = "/home/sweetbread/Music";
-          devices = [ "Akeno" "Koneko" "Inaho" ];
+          devices = [ "Akeno" "Koneko" ];
-        };
-
-        "Obsidian" = {
-          path = "/mnt/D/Obsidian";
-          devices = [ "Koneko" "Inaho" ];
-        };
-
-        "Documents" = {
-          path = "/home/sweetbread/Documents";
-          devices = [ "Inaho" ];
         };
       };
     };

host/Senko/modules/hyprland.nix

@@ -1,10 +1,9 @@
 {
-  wayland.windowManager.hyprland.settings.monitor = [
+  wayland.windowManager.hyprland = {
-    {
+    settings = {
-      output = "eDP-1";
+      monitor = [
-      mode = "1920x1080@60";
+        "eDP-1, 1920x1080@60, 0x0, 1"
-      position = "0x0";
-      scale = 1;
-    }
       ];
+    };
+  };
 }

host/modules/common.nix

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

host/modules/thinkpad.nix

@@ -44,8 +44,8 @@
     fprintd.enable = true;
 
     logind.settings.Login = {
-      HandleLidSwitch = "suspend-then-hibernate";
+      HandleLidSwitch = "suspend";
-      HandleLidSwitchExternalPower = "suspend-then-hibernate";
+      HandleLidSwitchExternalPower = "suspend";
       HandlePowerKey = "poweroff";
     };
 

modules/host.nix

@@ -15,12 +15,12 @@
     ./host/virtmanager.nix
     ./host/vpn.nix
     ./host/yggdrasil.nix
-    ./host/mtp.nix
   ];
 
   programs = {
     dconf.enable = true;
     hyprland.enable = true;
+    fuse.enable = true;
   };
 
   xdg.portal = {
@@ -49,6 +49,7 @@
   };
 
   services = {
+    gvfs.enable = true;
     fstrim.enable = true;
     upower.enable = true;
   };

modules/host/gamemode.nix

@@ -9,7 +9,7 @@ lib.mkIf config.programs.gamemode.enable {
   environment.systemPackages = with pkgs; [
     mangohud
     protonup-ng
-    bottles
+    pkgs-stable.bottles
     pkgs-stable.heroic
     prismlauncher
   ];

modules/host/mtp.nix

@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = [ pkgs.glib ];
-  programs.fuse.enable = true;
-  services.gvfs.enable = true;
-}

modules/user/helix.nix

@@ -1,4 +1,4 @@
-{ inputs, pkgs, lib, config, ... }: let
+{ inputs, pkgs, ... }: let
   helixSteel =
     inputs.helix-steel.packages.${pkgs.system}.default.overrideAttrs (old: {
       cargoBuildFlags = (old.cargoBuildFlags or []) ++ [
@@ -71,19 +71,8 @@ in {
   home.packages = with pkgs; [
     asm-lsp
     fasm
-    steel
-    wakatime-cli
   ];
 
-  home.activation.installWakatimeHx = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-    export PATH="${pkgs.steel}/bin:$PATH"
-    export STEEL_HOME="${config.xdg.dataHome}/steel"
-
-    if [ ! -f "$STEEL_HOME/cogs/wakatime/wakatime.scm" ]; then
-      forge pkg install --git https://github.com/Xerxes-2/wakatime.hx.git
-    fi
-  '';
-
   programs.helix = {
     enable = true;
     package = helixSteel;
@@ -196,7 +185,6 @@ in {
     '';
     "helix/init.scm".text = ''
       ;; Steel init file
-      (require "wakatime/wakatime.scm")
     '';
   };
 }

modules/user/hyprland.nix

@@ -1,26 +1,6 @@
-{ pkgs, lib, config, osConfig, inputs, username, ... }:
+{ pkgs, lib, config, osConfig, inputs, username, ... }: let
-let
   optImport = path: lib.optional (builtins.pathExists path) path;
   hostname = osConfig.networking.hostName;
-  hyprLua = import ./hyprland/lua.nix { inherit lib; };
-  inherit (hyprLua) bind bindWithFlags exec onStart;
-
-  direction = {
-    left = "l";
-    right = "r";
-    up = "u";
-    down = "d";
-  };
-
-  workspaceBinds = lib.concatMap (workspace:
-    let
-      key = if workspace == 10 then "0" else toString workspace;
-      workspaceValue = toString workspace;
-    in [
-      (bind "SUPER + ${key}" "hl.dsp.focus({ workspace = ${workspaceValue} })")
-      (bind "SUPER + SHIFT + ${key}" "hl.dsp.window.move({ workspace = ${workspaceValue}, follow = false })")
-    ]
-  ) (lib.range 1 10);
 in {
   imports = [
     ./hyprland/zoom.nix
@@ -37,11 +17,14 @@ in {
     xclip
     awww
     wifitui
+    ( pkgs.callPackage ./packages/drvs/yin.nix {} )
   ];
 
-  wayland.windowManager.hyprland = {
+  wayland.windowManager.hyprland = let
+    colors = config.lib.stylix.colors;
+  in {
     enable = true;
-    configType = "lua";
+    configType = "hyprlang";
     xwayland.enable = true;
 
     package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
@@ -50,34 +33,60 @@ in {
     ];
 
     settings = {
-      config = {
+      "$mainMod" = "SUPER";
+
       ecosystem = {
         no_donation_nag = true;
         no_update_news = true;
       };
 
-        cursor.no_hardware_cursors = 1;
+      env = [
+        "XDG_SESSION_TYPE,wayland"
+        "QT_QPA_PLATFORM,wayland"
+        "QT_QPA_PLATFORMTHEME,xdgdesktopportal"
+        "GTK_USE_PORTAL,1"
+        "TDESKTOP_USE_GTK_FILE_DIALOG,1"
+        "NIXOS_OZONE_WL,1"
+        "ELECTRON_OZONE_PLATFORM_HINT,auto"
+
+        "XDG_CURRENT_DESKTOP,Hyprland"
+        "XDG_SESSION_DESKTOP,Hyprland"
+
+        "XCURSOR_SIZE, ${toString config.stylix.cursor.size}"
+        "XCURSOR_THEME, ${config.stylix.cursor.name}"
+
+        "XDG_SCREENSHOTS_DIR,~/screens"
+      ];
+
+      cursor.no_hardware_cursors = true;
 
       debug = {
         disable_logs = false;
         enable_stdout_logs = true;
       };
 
-        general."col.inactive_border" = lib.mkForce "rgba(00000000)";
+      general = {
-
+        "col.inactive_border" = lib.mkForce "rgba(00000000)";
-        decoration = {
-          inactive_opacity = lib.mkDefault 0.95;
-          border_part_of_window = false;
       };
 
-        misc.focus_on_activate = true;
+      decoration.inactive_opacity = lib.mkDefault .95;
+      decoration.border_part_of_window = false;
+
+      misc = {
+        focus_on_activate = true;
+      };
 
       input = {
         kb_layout = "us,ru";
         kb_options = "grp:caps_toggle";
         numlock_by_default = true;
+
         follow_mouse = 1;
-          touchpad.natural_scroll = false;
+
+        touchpad = {
+          natural_scroll = false;
+        };
+
         sensitivity = 0;
       };
 
@@ -86,59 +95,32 @@ in {
         workspace_swipe_distance = 200;
         workspace_swipe_forever = true;
       };
-      };
-
-      env = [
-        { _args = [ "XDG_SESSION_TYPE" "wayland" ]; }
-        { _args = [ "QT_QPA_PLATFORM" "wayland" ]; }
-        { _args = [ "QT_QPA_PLATFORMTHEME" "xdgdesktopportal" ]; }
-        { _args = [ "GTK_USE_PORTAL" "1" ]; }
-        { _args = [ "TDESKTOP_USE_GTK_FILE_DIALOG" "1" ]; }
-        { _args = [ "NIXOS_OZONE_WL" "1" ]; }
-        { _args = [ "ELECTRON_OZONE_PLATFORM_HINT" "auto" ]; }
-        { _args = [ "XDG_CURRENT_DESKTOP" "Hyprland" ]; }
-        { _args = [ "XDG_SESSION_DESKTOP" "Hyprland" ]; }
-        { _args = [ "XCURSOR_SIZE" (toString config.stylix.cursor.size) ]; }
-        { _args = [ "XCURSOR_THEME" config.stylix.cursor.name ]; }
-        { _args = [ "XDG_SCREENSHOTS_DIR" "~/screens" ]; }
-      ];
 
       gesture = [
-        {
+        "3, horizontal, workspace"
-          fingers = 3;
-          direction = "horizontal";
-          action = "workspace";
-        }
       ];
 
-      workspace_rule = [
+      workspace = [
-        {
+        "w[t1], gapsout:0"
-          workspace = "w[t1]";
-          gaps_out = 0;
-        }
       ];
 
-      window_rule = [
+      windowrule = [
-        { match.class = "imv"; float = true; }
+        "match:class imv,           float 1"
-        { match.class = "feh"; float = true; }
+        "match:class feh,           float 1"
-        { match.class = "mpv"; float = true; }
+        "match:class mpv,           float 1"
-        { match.title = "Список друзей"; float = true; }
+
-        { match.title = "wifitui"; float = true; }
+        "match:title Список друзей, float 1"
-        { match.title = "pulsemixer"; float = true; }
+        "match:title wifitui,       float 1"
-        { match.title = "clipse"; float = true; }
+        "match:title pulsemixer,    float 1"
-        { match.title = "clipse"; size = [ 622 652 ]; }
+
-        { match.focus = true; rounding = 0; }
+        "match:title clipse,        float 1"
-        {
+        "match:title clipse,   size 622 652"
-          match = {
+
-            float = false;
+        "match:focus 1, rounding 0"
-            workspace = "w[t1]";
+        "match:float 0, match:workspace w[t1], border_size 0"
-          };
-          border_size = 0;
-        }
       ];
 
-      on = lib.mkBefore [
+      exec-once = lib.mkBefore [
-        (onStart [
         "systemctl --user start plasma-polkit-agent"
         "${lib.getExe' pkgs.dbus "dbus-update-activation-environment"} --systemd --all"
         "systemctl --user import-environment XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE WAYLAND_DISPLAY DISPLAY GTK_USE_PORTAL QT_QPA_PLATFORMTHEME TDESKTOP_USE_GTK_FILE_DIALOG NIXOS_OZONE_WL ELECTRON_OZONE_PLATFORM_HINT"
@@ -146,62 +128,105 @@ in {
         "wl-clip-persist --clipboard both"
         "clipse -listen"
         "${lib.getExe' pkgs.udiskie "udiskie"}"
-        ])
       ];
 
       bind = [
-        (bind "SUPER + V" (exec "ghostty --title=clipse -e clipse"))
+        "$mainMod, V, exec, ghostty --title=clipse -e clipse"
-        (bind "SUPER + RETURN" (exec "ghostty"))
-        (bind "SUPER + Q" "hl.dsp.window.close()")
-        (bind "SUPER + M" "hl.dsp.exit()")
-        (bind "SUPER + E" (exec "ghostty -e sh -c yazi"))
-        (bind "SUPER + F" "hl.dsp.window.float({ action = \"toggle\" })")
-        (bind "SUPER + P" "hl.dsp.window.pseudo({ action = \"toggle\" })")
-        (bind "SUPER + J" "hl.dsp.layout(\"togglesplit\")")
-        (bind "SUPER + K" "hl.dsp.layout(\"swapsplit\")")
 
-        (bind "SUPER + LEFT" "hl.dsp.focus({ direction = \"${direction.left}\" })")
+        "$mainMod, Return, exec, ghostty"
-        (bind "SUPER + RIGHT" "hl.dsp.focus({ direction = \"${direction.right}\" })")
+        "$mainMod, Q, killactive,"
-        (bind "SUPER + UP" "hl.dsp.focus({ direction = \"${direction.up}\" })")
+        "$mainMod, M, exit,"
-        (bind "SUPER + DOWN" "hl.dsp.focus({ direction = \"${direction.down}\" })")
+        "$mainMod, E, exec, ghostty -e sh -c yazi"
+        "$mainMod, F, togglefloating,"
+        "$mainMod, P, pseudo, # dwindle"
+        "$mainMod, J, layoutmsg, togglesplit"
+        "$mainMod, K, layoutmsg, swapsplit"
 
-        (bind "SUPER + SHIFT + LEFT" "hl.dsp.window.swap({ direction = \"${direction.left}\" })")
+        # Move focus with mainMod + arrow keys
-        (bind "SUPER + SHIFT + RIGHT" "hl.dsp.window.swap({ direction = \"${direction.right}\" })")
+        "$mainMod, left,  movefocus, l"
-        (bind "SUPER + SHIFT + UP" "hl.dsp.window.swap({ direction = \"${direction.up}\" })")
+        "$mainMod, right, movefocus, r"
-        (bind "SUPER + SHIFT + DOWN" "hl.dsp.window.swap({ direction = \"${direction.down}\" })")
+        "$mainMod, up,    movefocus, u"
+        "$mainMod, down,  movefocus, d"
 
-        (bind "SUPER + CTRL + LEFT" "hl.dsp.window.resize({ x = -60, y = 0, relative = true })")
+        # Moving windows
-        (bind "SUPER + CTRL + RIGHT" "hl.dsp.window.resize({ x = 60, y = 0, relative = true })")
+        "$mainMod SHIFT, left,  swapwindow, l"
-        (bind "SUPER + CTRL + UP" "hl.dsp.window.resize({ x = 0, y = -60, relative = true })")
+        "$mainMod SHIFT, right, swapwindow, r"
-        (bind "SUPER + CTRL + DOWN" "hl.dsp.window.resize({ x = 0, y = 60, relative = true })")
+        "$mainMod SHIFT, up,    swapwindow, u"
-      ] ++ workspaceBinds ++ [
+        "$mainMod SHIFT, down,  swapwindow, d"
-        (bind "SUPER + SHIFT + F" "hl.dsp.window.fullscreen({ action = \"toggle\", mode = \"fullscreen\" })")
-        (bind "SUPER + mouse_down" "hl.dsp.focus({ workspace = \"e-1\" })")
-        (bind "SUPER + mouse_up" "hl.dsp.focus({ workspace = \"e+1\" })")
 
-        (bind "SUPER + F3" (exec "${lib.getExe pkgs.brightnessctl} -d *::kbd_backlight set +33%"))
+        # Window resizing                     X  Y
-        (bind "SUPER + F2" (exec "${lib.getExe pkgs.brightnessctl} -d *::kbd_backlight set 33%-"))
+        "$mainMod CTRL, left,  resizeactive, -60 0"
+        "$mainMod CTRL, right, resizeactive,  60 0"
+        "$mainMod CTRL, up,    resizeactive,  0 -60"
+        "$mainMod CTRL, down,  resizeactive,  0  60"
 
-        (bind "XF86AudioMute" (exec "pamixer -t"))
+        # Switch workspaces with mainMod + [0-9]
-        (bind "XF86AudioMicMute" (exec "pamixer --default-source -m"))
+        "$mainMod, 1, workspace, 1"
-        (bind "XF86AudioPlay" (exec "${lib.getExe pkgs.playerctl} play-pause"))
+        "$mainMod, 2, workspace, 2"
-        (bind "XF86Explorer" (exec "ghostty -e sh -c yazi"))
+        "$mainMod, 3, workspace, 3"
-        (bind "XF86Mail" (exec "thunderbird"))
+        "$mainMod, 4, workspace, 4"
-        (bind "XF86WWW" (exec "google-chrome-stable"))
+        "$mainMod, 5, workspace, 5"
+        "$mainMod, 6, workspace, 6"
+        "$mainMod, 7, workspace, 7"
+        "$mainMod, 8, workspace, 8"
+        "$mainMod, 9, workspace, 9"
+        "$mainMod, 0, workspace, 10"
 
-        (bind "XF86MonBrightnessDown" (exec "${lib.getExe pkgs.brightnessctl} set 5%-"))
+        # Move active window to a workspace with mainMod + SHIFT + [0-9]
-        (bind "XF86MonBrightnessUp" (exec "${lib.getExe pkgs.brightnessctl} set +5%"))
+        "$mainMod SHIFT, 1, movetoworkspacesilent, 1"
+        "$mainMod SHIFT, 2, movetoworkspacesilent, 2"
+        "$mainMod SHIFT, 3, movetoworkspacesilent, 3"
+        "$mainMod SHIFT, 4, movetoworkspacesilent, 4"
+        "$mainMod SHIFT, 5, movetoworkspacesilent, 5"
+        "$mainMod SHIFT, 6, movetoworkspacesilent, 6"
+        "$mainMod SHIFT, 7, movetoworkspacesilent, 7"
+        "$mainMod SHIFT, 8, movetoworkspacesilent, 8"
+        "$mainMod SHIFT, 9, movetoworkspacesilent, 9"
+        "$mainMod SHIFT, 0, movetoworkspacesilent, 10"
 
-        (bindWithFlags "XF86AudioRaiseVolume" (exec "pamixer -i 5") { repeating = true; })
+        "$mainMod SHIFT, F, fullscreen"
-        (bindWithFlags "XF86AudioLowerVolume" (exec "pamixer -d 5") { repeating = true; })
 
-        (bindWithFlags "XF86AudioPrev" (exec "${lib.getExe pkgs.playerctl} position 5-") { click = true; })
+        # Scroll through existing workspaces with mainMod + scroll
-        (bindWithFlags "XF86AudioNext" (exec "${lib.getExe pkgs.playerctl} position 5+") { click = true; })
+        "$mainMod, mouse_down, workspace, e-1"
-        (bindWithFlags "XF86AudioPrev" (exec "${lib.getExe pkgs.playerctl} previous") { long_press = true; })
+        "$mainMod, mouse_up,   workspace, e+1"
-        (bindWithFlags "XF86AudioNext" (exec "${lib.getExe pkgs.playerctl} next") { long_press = true; })
 
-        (bindWithFlags "SUPER + mouse:272" "hl.dsp.window.drag()" { mouse = true; })
+        # Keyboard backlight
-        (bindWithFlags "SUPER + mouse:273" "hl.dsp.window.resize()" { mouse = true; })
+        "$mainMod, F3, exec, ${lib.getExe pkgs.brightnessctl} -d *::kbd_backlight set +33%"
+        "$mainMod, F2, exec, ${lib.getExe pkgs.brightnessctl} -d *::kbd_backlight set 33%-"
+
+        # Volume and Media Control
+        ", XF86AudioMute, exec, pamixer -t"
+        ", XF86AudioMicMute, exec, pamixer --default-source -m"
+        ", XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} play-pause"
+
+        ", XF86Explorer, exec, ghostty -e sh -c yazi"
+        ", XF86Mail, exec, thunderbird"
+        ", XF86WWW, exec, google-chrome-stable"  # TODO: Replace hard-code to some variable
+
+        # Brightness control
+        ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} set 5%- "
+        ", XF86MonBrightnessUp,   exec, ${lib.getExe pkgs.brightnessctl} set +5% "
+      ];
+
+      binde = [
+        ", XF86AudioRaiseVolume, exec, pamixer -i 5 "
+        ", XF86AudioLowerVolume, exec, pamixer -d 5 "
+      ];
+
+      bindc = [
+        ", XF86AudioPrev, exec, ${lib.getExe pkgs.playerctl} position 5-"
+        ", XF86AudioNext, exec, ${lib.getExe pkgs.playerctl} position 5+"
+      ];
+
+      bindo = [
+        ", XF86AudioPrev, exec, ${lib.getExe pkgs.playerctl} previous"
+        ", XF86AudioNext, exec, ${lib.getExe pkgs.playerctl} next"
+      ];
+
+      # Move/resize windows with mainMod + LMB/RMB and dragging
+      bindm = [
+        "$mainMod, mouse:272, movewindow"
+        "$mainMod, mouse:273, resizewindow"
       ];
     };
   };

modules/user/hyprland/lua.nix

@@ -1,35 +0,0 @@
-{ lib }:
-let
-  inline = lib.generators.mkLuaInline;
-  quote = builtins.toJSON;
-in rec {
-  inherit inline;
-
-  exec = command: "hl.dsp.exec_cmd(${quote command})";
-
-  bind = keys: dispatcher: {
-    _args = [
-      keys
-      (inline dispatcher)
-    ];
-  };
-
-  bindWithFlags = keys: dispatcher: flags: {
-    _args = [
-      keys
-      (inline dispatcher)
-      flags
-    ];
-  };
-
-  onStart = commands: {
-    _args = [
-      "hyprland.start"
-      (inline (
-        "function()\n"
-        + lib.concatMapStringsSep "\n" (command: "  hl.exec_cmd(${quote command})") commands
-        + "\nend"
-      ))
-    ];
-  };
-}

modules/user/hyprland/zoom.nix

@@ -1,32 +1,21 @@
-{ lib, ... }:
+{
-let
+  wayland.windowManager.hyprland.settings = {
-  hyprLua = import ./lua.nix { inherit lib; };
+    bind = [
-  inherit (hyprLua) bind bindWithFlags;
+      # "$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')"
 
-  resetZoom = ''function()
+      "$mainMod SHIFT, mouse_up   , exec, hyprctl -q keyword cursor:zoom_factor 1"
-    hl.config({ cursor = { zoom_factor = 1 } })
+      "$mainMod SHIFT, mouse_down , exec, hyprctl -q keyword cursor:zoom_factor 1"
-  end'';
+      "$mainMod SHIFT, minus      , exec, hyprctl -q keyword cursor:zoom_factor 1"
-
+      "$mainMod SHIFT, KP_SUBTRACT, exec, hyprctl -q keyword cursor:zoom_factor 1"
-  zoomIn = ''function()
+      "$mainMod SHIFT, 0          , exec, hyprctl -q keyword cursor:zoom_factor 1"
-    local current = hl.get_config("cursor.zoom_factor")
-    hl.config({ cursor = { zoom_factor = current * 1.1 } })
-  end'';
-
-  zoomOut = ''function()
-    local current = hl.get_config("cursor.zoom_factor")
-    hl.config({ cursor = { zoom_factor = math.max(1, current * 0.9) } })
-  end'';
-in {
-  wayland.windowManager.hyprland.settings.bind = [
-    (bind "SUPER + SHIFT + mouse_up" resetZoom)
-    (bind "SUPER + SHIFT + mouse_down" resetZoom)
-    (bind "SUPER + SHIFT + minus" resetZoom)
-    (bind "SUPER + SHIFT + KP_SUBTRACT" resetZoom)
-    (bind "SUPER + SHIFT + 0" resetZoom)
-
-    (bindWithFlags "SUPER + equal" zoomIn { repeating = true; })
-    (bindWithFlags "SUPER + minus" zoomOut { repeating = true; })
-    (bindWithFlags "SUPER + KP_ADD" zoomIn { repeating = true; })
-    (bindWithFlags "SUPER + KP_SUBTRACT" zoomOut { repeating = true; })
     ];
+
+    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/hyprlock.nix

@@ -1,11 +1,7 @@
 { config, pkgs, lib, ... }:
-let
+
-  hyprLua = import ./hyprland/lua.nix { inherit lib; };
-in
 lib.mkIf config.programs.hyprlock.enable {
-  wayland.windowManager.hyprland.settings.on = [
+  wayland.windowManager.hyprland.settings.exec-once = [ "hyprlock" ];
-    (hyprLua.onStart [ "hyprlock" ])
-  ];
 
   programs.hyprlock = let
     image = pkgs.fetchurl {

modules/user/packages/desktop.nix

@@ -10,6 +10,5 @@
     thunderbird
     libreoffice
     pear-desktop
-    ( pkgs.callPackage ../../../drv/mumble.nix {} )
   ];
 }

modules/user/packages/drvs/yin.nix

@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  meson,
+  ninja,
+  pkg-config,
+  python3,
+
+  wayland,
+  wayland-scanner,
+  wayland-protocols,
+
+  ffmpeg,
+  libva,
+  libglvnd,
+}:
+
+stdenv.mkDerivation {
+  pname = "yin";
+  version = "unstable-2026-08-01";
+
+  src = fetchFromGitHub {
+    owner = "SaverinOnRails";
+    repo = "yin";
+    rev = "e1690636a606f83382fc79aa90379efd80d1768d";
+    hash = "sha256-TYVUL0o+bwP4S2e8mO2+sLspMzlZa6LINsOYF6CC86I=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    python3
+
+    wayland-scanner
+  ];
+
+  buildInputs = [
+    wayland
+    wayland-protocols
+
+    ffmpeg
+    libva
+    libglvnd
+  ];
+
+  configurePhase = ''
+    runHook preConfigure
+
+    meson setup build \
+      --buildtype=release \
+      --prefix=$out
+
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    meson compile -C build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    install -Dm755 build/yin $out/bin/yin
+    install -Dm755 build/yinctl $out/bin/yinctl
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Lightweight hardware-accelerated Wayland wallpaper daemon";
+    homepage = "https://github.com/SaverinOnRails/yin";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    mainProgram = "yin";
+  };
+}

modules/user/packages/tex.nix

@@ -0,0 +1,32 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    texstudio
+    (texlive.combine {
+      inherit (texlive)
+        babel-russian
+        cm-super
+        cyrillic
+        hyphen-russian
+        hyphenat
+        titlesec
+        caption
+        float
+        xcolor
+        listings
+        pagecolor
+        moresize
+        raleway
+        fontawesome5
+        luatexbase
+        fontspec
+        ragged2e
+        enumitem
+        extsizes
+        multirow
+        varwidth
+        paracol
+        anyfontsize
+        scheme-basic;
+    })
+  ];
+}

modules/user/walker.nix

@@ -1,7 +1,4 @@
-{ lib, ... }:
+{
-let
-  hyprLua = import ./hyprland/lua.nix { inherit lib; };
-in {
   services = {
     walker = {
       enable = true;
@@ -12,6 +9,6 @@ in {
   };
 
   wayland.windowManager.hyprland.settings.bind = [
-    (hyprLua.bind "SUPER + D" (hyprLua.exec "walker"))
+    "$mainMod, D, exec, walker"
   ];
 }

modules/user/wob.nix

@@ -18,8 +18,6 @@
     percent="$(${lib.getExe pkgs.brightnessctl} -m | ${lib.getExe' pkgs.coreutils "cut"} -d, -f4 | ${lib.getExe' pkgs.coreutils "tr"} -d '%')"
     printf '%s brightness\n' "$percent" > ${wobSocket}
   '';
-
-  hyprLua = import ./hyprland/lua.nix { inherit lib; };
 in {
   systemd.user = {
     services.wob.Install.WantedBy = lib.mkForce [ ];
@@ -55,23 +53,16 @@ in {
     };
   };
 
-  wayland.windowManager.hyprland.settings.bind = [
+  wayland.windowManager.hyprland.settings = {
-    (hyprLua.bindWithFlags "XF86AudioRaiseVolume" (hyprLua.exec "${lib.getExe volumeStep}") {
+    bindel = [
-      repeating = true;
+      ", XF86AudioRaiseVolume,  exec, ${lib.getExe volumeStep}"
-      locked = true;
+      ", XF86AudioLowerVolume,  exec, ${lib.getExe volumeStep}"
-    })
+      ", XF86MonBrightnessUp,   exec, ${lib.getExe brightnessStep}"
-    (hyprLua.bindWithFlags "XF86AudioLowerVolume" (hyprLua.exec "${lib.getExe volumeStep}") {
+      ", XF86MonBrightnessDown, exec, ${lib.getExe brightnessStep}"
-      repeating = true;
-      locked = true;
-    })
-    (hyprLua.bindWithFlags "XF86MonBrightnessUp" (hyprLua.exec "${lib.getExe brightnessStep}") {
-      repeating = true;
-      locked = true;
-    })
-    (hyprLua.bindWithFlags "XF86MonBrightnessDown" (hyprLua.exec "${lib.getExe brightnessStep}") {
-      repeating = true;
-      locked = true;
-    })
-    (hyprLua.bind "XF86AudioMute" (hyprLua.exec "${lib.getExe volumeStep} mute"))
     ];
+
+    bind = [
+      ", XF86AudioMute,         exec, ${lib.getExe volumeStep}     mute"
+    ];
+  };
 }

modules/user/yazi.nix

@@ -188,22 +188,10 @@ in {
     Exec=${lib.getExe fileManager1}
   '';
 
-  wayland.windowManager.hyprland.settings.window_rule = [
+  wayland.windowManager.hyprland.settings.windowrule = [
-    {
+    "match:class dragon-drop, move cursor_x-window_w/2 cursor_y-window_h/2"
-      match.class = "dragon-drop";
+    "match:title Yazi File Picker, float 1"
-      move = [
+    "match:title Yazi File Picker, size 1200 800"
-        "(cursor_x-(window_w*0.5))"
-        "(cursor_y-(window_h*0.5))"
-      ];
-    }
-    {
-      match.title = "Yazi File Picker";
-      float = true;
-    }
-    {
-      match.title = "Yazi File Picker";
-      size = [ 1200 800 ];
-    }
   ];
 
   programs.yazi = {
@@ -278,7 +266,7 @@ in {
       };
 
       git = {
-        package = yaziPlugin "git";
+        package = git;
         setup = true;
       };
     };

modules/user/zsh.nix

@@ -74,7 +74,6 @@
         eval "$(zoxide init zsh)"
         source "$(fzf-share)/key-bindings.zsh"
         source "$(fzf-share)/completion.zsh"
-        nr() { nix run "nixpkgs#$1" -- "''${@:2}" }
       '';
 
       envExtra = ''

user/chest/modules/hyprland.nix

@@ -1,22 +1,16 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, lib, config, inputs, ... }: {
-let
+  wayland.windowManager.hyprland = let
     colors = config.lib.stylix.colors;
     accent = colors.${config.stylix.accent};
-  hyprLua = import ../../../modules/user/hyprland/lua.nix { inherit lib; };
+  in {
-in {
+    settings = {
-  wayland.windowManager.hyprland.settings = {
-    config = {
       general = {
         gaps_in = 5;
         gaps_out = 5;
         border_size = 2;
-        "col.active_border" = lib.mkForce {
+        "col.active_border" = "rgba(${accent}ee) rgba(${colors.base0C}ee) 45deg";
-          colors = [
+        "col.inactive_border" = "rgba(${colors.base05}aa)";
-            "rgba(${accent}ee)"
+
-            "rgba(${colors.base0C}ee)"
-          ];
-          angle = 45;
-        };
         layout = "dwindle";
       };
 
@@ -38,9 +32,25 @@ in {
         };
       };
 
-      animations.enabled = true;
+      animations = {
+        enabled = true;
+
+        bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
+
+        animation = [
+          "windows,     1, 7,  myBezier"
+          "windowsOut,  1, 7,  default, popin 80%"
+          "border,      1, 10, default"
+          "borderangle, 1, 8,  default"
+          "fade,        1, 7,  default"
+          "workspaces,  1, 6,  default"
+        ];
+      };
+
+      dwindle = {
+        smart_split = true;
+      };
 
-      dwindle.smart_split = true;
       master.new_status = "master";
 
       misc = {
@@ -48,32 +58,10 @@ in {
         animate_mouse_windowdragging = true;
         enable_swallow = true;
       };
-    };
-
-    curve = {
-      _args = [
-        "myBezier"
-        {
-          type = "bezier";
-          points = [
-            [ 0.05 0.9 ]
-            [ 0.1 1.05 ]
-          ];
-        }
-      ];
-    };
-
-    animation = [
-      { leaf = "windows"; enabled = true; speed = 7; bezier = "myBezier"; }
-      { leaf = "windowsOut"; enabled = true; speed = 7; bezier = "default"; style = "popin 80%"; }
-      { leaf = "border"; enabled = true; speed = 10; bezier = "default"; }
-      { leaf = "borderangle"; enabled = true; speed = 8; bezier = "default"; }
-      { leaf = "fade"; enabled = true; speed = 7; bezier = "default"; }
-      { leaf = "workspaces"; enabled = true; speed = 6; bezier = "default"; }
-    ];
 
       bind = [
-      (hyprLua.bind "SUPER + SHIFT + S" (hyprLua.exec ''${lib.getExe pkgs.grim} -g "$(${lib.getExe pkgs.slurp})" - | ${lib.getExe pkgs.swappy} -f -''))
+        ''$mainMod Shift, S, exec, ${lib.getExe pkgs.grim} -g "$(${lib.getExe pkgs.slurp})" - | ${lib.getExe pkgs.swappy} -f -''
       ];
     };
+  };
 }

user/chest/modules/waybar.nix

@@ -1,11 +1,4 @@
-{
+{ osConfig, config, pkgs, lib, ... }: {
-  osConfig,
-  config,
-  inputs,
-  pkgs,
-  lib,
-  ...
- }: {
   home.packages = with pkgs; [
     font-awesome
     nerd-fonts.symbols-only
@@ -17,7 +10,6 @@
   programs.waybar = {
     enable = true;
     systemd.enable = true;
-    package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.default;
 
     settings.mainBar = {
       modules-center = [

user/sweetbread/home.nix

@@ -1,4 +1,7 @@
 { pkgs, ... }: {
+  imports = [
+    ../../modules/user/packages/tex.nix
+  ];
   programs.hyprlock.enable = true;
   home.packages = with pkgs; [
     android-studio
@@ -7,7 +10,6 @@
       enableWidevine = true;
     })
     weechat
-    insomnia
   ];
 
   xdg.mimeApps = {

user/sweetbread/modules/hyprland.nix

@@ -2,7 +2,6 @@
   wayland.windowManager.hyprland = let
     colors = config.lib.stylix.colors;
     accent = colors.${config.stylix.accent};
-    hyprLua = import ../../../modules/user/hyprland/lua.nix { inherit lib; };
 
     wallpaper_changer = pkgs.writers.writePython3Bin "wallpaper_changer" {
       libraries = [ pkgs.python3Packages.requests ];
@@ -127,18 +126,12 @@
     '';
   in {
     settings = {
-      config = {
       general = {
         gaps_in = 2;
         gaps_out = 10;
         border_size = 3;
-          "col.active_border" = lib.mkForce {
+        "col.active_border" = lib.mkForce "rgba(${colors.base0C}aa) rgba(${accent}aa) 45deg";
-            colors = [
+
-              "rgba(${colors.base0C}aa)"
-              "rgba(${accent}aa)"
-            ];
-            angle = 45;
-          };
         layout = "dwindle";
       };
 
@@ -155,8 +148,25 @@
         shadow.enabled = false;
       };
 
-        animations.enabled = true;
+      animations = {
-        dwindle.smart_split = true;
+        enabled = true;
+
+        bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
+
+        animation = [
+          "windows,     1, 7,  myBezier"
+          "windowsOut,  1, 7,  default, popin 80%"
+          "border,      1, 10, default"
+          "borderangle, 1, 8,  default"
+          "fade,        1, 7,  default"
+          "workspaces,  1, 6,  default"
+        ];
+      };
+
+      dwindle = {
+        smart_split = true;
+      };
+
       master.new_status = "master";
 
       misc = {
@@ -164,46 +174,21 @@
         animate_mouse_windowdragging = true;
         enable_swallow = true;
       };
-      };
 
-      curve = {
+      exec-once = [
-        _args = [
+        "${lib.getExe wallpaper_changer}"
-          "myBezier"
-          {
-            type = "bezier";
-            points = [
-              [ 0.05 0.9 ]
-              [ 0.1 1.05 ]
-            ];
-          }
-        ];
-      };
-
-      animation = [
-        { leaf = "windows"; enabled = true; speed = 7; bezier = "myBezier"; }
-        { leaf = "windowsOut"; enabled = true; speed = 7; bezier = "default"; style = "popin 80%"; }
-        { leaf = "border"; enabled = true; speed = 10; bezier = "default"; }
-        { leaf = "borderangle"; enabled = true; speed = 8; bezier = "default"; }
-        { leaf = "fade"; enabled = true; speed = 7; bezier = "default"; }
-        { leaf = "workspaces"; enabled = true; speed = 6; bezier = "default"; }
       ];
 
-      on = [
+      workspace = [
-        (hyprLua.onStart [ "${lib.getExe wallpaper_changer}" ])
+        "2, layout:scrolling"
-      ];
-
-      workspace_rule = [
-        {
-          workspace = "2";
-          layout = "scrolling";
-        }
       ];
 
       bind = [
-        (hyprLua.bind "Print" (hyprLua.exec "${lib.getExe pkgs.hyprshot} -z -o ~/Screenshots -m active -m output"))
+        "    , Print, exec, ${lib.getExe pkgs.hyprshot} -z -o ~/Screenshots -m active -m output"
-        (hyprLua.bind "CTRL + Print" (hyprLua.exec "${lib.getExe pkgs.hyprshot} -z -o ~/Screenshots -m region"))
+        "CTRL, Print, exec, ${lib.getExe pkgs.hyprshot} -z -o ~/Screenshots -m region"
-        (hyprLua.bind "ALT + Print" (hyprLua.exec "${lib.getExe pkgs.hyprshot} -z -o ~/Screenshots -m active -m window"))
+        "ALT , Print, exec, ${lib.getExe pkgs.hyprshot} -z -o ~/Screenshots -m active -m window"
-        (hyprLua.bind "SUPER + W" (hyprLua.exec "${lib.getExe wallpaper_changer}"))
+
+        "$mainMod, W, exec, ${lib.getExe wallpaper_changer}"
       ];
     };
   };

user/sweetbread/modules/waybar.nix

@@ -1,11 +1,4 @@
-{
+{ osConfig, config, pkgs, lib, ... }: {
-  osConfig,
-  config,
-  inputs,
-  pkgs,
-  lib,
-  ...
-}: {
   home.packages = with pkgs; [
     playerctl
     cava
@@ -22,7 +15,6 @@
   in {
     enable = true;
     systemd.enable = true;
-    package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.default;
 
     settings.mainBar = {
       spacing = 8;
@@ -351,10 +343,7 @@
     in builtins.readFile cssFile;
   };
 
-  wayland.windowManager.hyprland.settings.layer_rule = [
+  wayland.windowManager.hyprland.settings.layerrule = [
-    {
+    "blur on, match:namespace waybar"
-      match.namespace = "waybar";
-      blur = true;
-    }
   ];
 }