diff --git a/nixos/flake.lock b/nixos/flake.lock
index d97bcefa..c9930115 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -1148,16 +1148,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1781534922,
-        "narHash": "sha256-jmzKIyRmpZLpxnR7DsWZ42bMzt+WeYDk+/x3FKSkovM=",
-        "owner": "yerlotic",
+        "lastModified": 1782607986,
+        "narHash": "sha256-7CvSvTEk6rAX/K56QoPbWe7tr+9KGBAugXYJGc6eOEg=",
+        "owner": "raybbian",
         "repo": "hyprtasking",
-        "rev": "1a82ca1ac79602e3bfd5ecb0a52c40c2bf818586",
+        "rev": "765575445ce34989575a99f304d0b279e6a980b6",
         "type": "github"
       },
       "original": {
-        "owner": "yerlotic",
-        "ref": "chase_v55",
+        "owner": "raybbian",
         "repo": "hyprtasking",
         "type": "github"
       }
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 8a5af167..57004ce5 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -143,8 +143,8 @@
     };
 
     hyprtasking = {
-      # PR #114 tracks Hyprland 0.55 and adds Lua plugin functions.
-      url = "github:yerlotic/hyprtasking/chase_v55";
+      # Upstream default branch; the Hyprland 0.55 support PR has been merged.
+      url = "github:raybbian/hyprtasking";
       inputs = {
         hyprland.follows = "hyprland";
         nixpkgs.follows = "nixpkgs";
diff --git a/nixos/flake/hyprland-stuff.nix b/nixos/flake/hyprland-stuff.nix
index 1d039e47..f9f4ee1e 100644
--- a/nixos/flake/hyprland-stuff.nix
+++ b/nixos/flake/hyprland-stuff.nix
@@ -107,6 +107,14 @@
         };
       postBuild = ''
         mkdir -p "$out/bin" "$out/share/wayland-sessions"
+
+        rm -f "$out/bin/Hyprland"
+        printf '%s\n' \
+          '#!${pkgs.runtimeShell}' \
+          'exec ${pkgs.runtimeShell} "${package}/bin/Hyprland" "$@"' \
+          > "$out/bin/Hyprland"
+        chmod +x "$out/bin/Hyprland"
+
         printf '%s\n' \
           '#!${pkgs.runtimeShell}' \
           'nvidia_drm_device="/dev/dri/by-path/pci-0000:01:00.0-card"' \
@@ -115,8 +123,9 @@
           '  export AQ_DRM_DEVICES="$nvidia_drm_device:$intel_drm_device"' \
           'fi' \
           'config_path="''${XDG_CONFIG_HOME:-$HOME/.config}/hypr/hyprland.lua"' \
-          'exec "${package}/bin/start-hyprland" --path "${package}/bin/Hyprland" -- --config "$config_path" "$@"' \
+          'exec "${package}/bin/start-hyprland" --path "@out@/bin/Hyprland" -- --config "$config_path" "$@"' \
           > "$out/bin/start-hyprland-lua"
+        substituteInPlace "$out/bin/start-hyprland-lua" --replace-fail "@out@" "$out"
         chmod +x "$out/bin/start-hyprland-lua"
 
         printf '%s\n' \
@@ -293,8 +302,8 @@
       hyprNStack
       hyprwinview
       hyprWorkspaceHistory
-      # Disabled 2026-06-19: enabling the plugin correlates with frozen Hyprland
-      # sessions even though startup reaches the uwsm session target.
+      # Disabled 2026-06-28: enabling the plugin freezes Hyprland shortly after
+      # startup on ryzen-shine.
       # hyprtasking
       hyprDynamicCursors
       hyprwobbly
diff --git a/nixos/flake/per-system.nix b/nixos/flake/per-system.nix
index 951a998c..b30e7480 100644
--- a/nixos/flake/per-system.nix
+++ b/nixos/flake/per-system.nix
@@ -41,6 +41,7 @@ in {
       hyprexpo-lua = hyprlandStuffPackages.hyprexpo;
       hyprwinview = hyprlandStuffPackages.hyprwinview;
       hypr-workspace-history = hyprlandStuffPackages.hyprWorkspaceHistory;
+      hyprtasking = hyprlandStuffPackages.hyprtasking;
       hyprglass = hyprlandStuffPackages.hyprglass;
     };
 
@@ -59,6 +60,7 @@ in {
       hyprexpo-lua = hyprlandStuffPackages.hyprexpo;
       hyprwinview = hyprlandStuffPackages.hyprwinview;
       hypr-workspace-history = hyprlandStuffPackages.hyprWorkspaceHistory;
+      hyprtasking = hyprlandStuffPackages.hyprtasking;
       hyprglass = hyprlandStuffPackages.hyprglass;
       hyprland-config-syntax = hyprlandStuffPackages.hyprlandConfigSyntax;
       hyprland-stuff = hyprlandStuffPackages.hyprlandStuff;
diff --git a/nixos/hyprland.nix b/nixos/hyprland.nix
index e5896081..11c652da 100644
--- a/nixos/hyprland.nix
+++ b/nixos/hyprland.nix
@@ -97,9 +97,11 @@
       name = "${package.name}-lua-config";
       inherit (package) version;
       paths = [package];
-      meta = builtins.removeAttrs (package.meta or {}) ["outputsToInstall"] // {
-        mainProgram = package.meta.mainProgram or "Hyprland";
-      };
+      meta =
+        builtins.removeAttrs (package.meta or {}) ["outputsToInstall"]
+        // {
+          mainProgram = package.meta.mainProgram or "Hyprland";
+        };
       passthru =
         (package.passthru or {})
         // {
@@ -107,6 +109,14 @@
         };
       postBuild = ''
         mkdir -p "$out/bin" "$out/share/wayland-sessions"
+
+        rm -f "$out/bin/Hyprland"
+        printf '%s\n' \
+          '#!${pkgs.runtimeShell}' \
+          'exec ${pkgs.runtimeShell} "${package}/bin/Hyprland" "$@"' \
+          > "$out/bin/Hyprland"
+        chmod +x "$out/bin/Hyprland"
+
         printf '%s\n' \
           '#!${pkgs.runtimeShell}' \
           'nvidia_drm_device="/dev/dri/by-path/pci-0000:01:00.0-card"' \
@@ -115,8 +125,9 @@
           '  export AQ_DRM_DEVICES="$nvidia_drm_device:$intel_drm_device"' \
           'fi' \
           'config_path="''${XDG_CONFIG_HOME:-$HOME/.config}/hypr/hyprland.lua"' \
-          'exec "${package}/bin/start-hyprland" --path "${package}/bin/Hyprland" -- --config "$config_path" "$@"' \
+          'exec "${package}/bin/start-hyprland" --path "@out@/bin/Hyprland" -- --config "$config_path" "$@"' \
           > "$out/bin/start-hyprland-lua"
+        substituteInPlace "$out/bin/start-hyprland-lua" --replace-fail "@out@" "$out"
         chmod +x "$out/bin/start-hyprland-lua"
 
         printf '%s\n' \
@@ -208,11 +219,13 @@
       substituteInPlace src/layout/layout_base.cpp \
         --replace-fail 'e.element->passName()' 'e->element->passName()'
     '';
-    nativeBuildInputs = [
-      pkgs.pkg-config
-      pkgs.meson
-      pkgs.ninja
-    ] ++ baseHyprlandPackage.nativeBuildInputs;
+    nativeBuildInputs =
+      [
+        pkgs.pkg-config
+        pkgs.meson
+        pkgs.ninja
+      ]
+      ++ baseHyprlandPackage.nativeBuildInputs;
     buildInputs = [baseHyprlandPackage] ++ baseHyprlandPackage.buildInputs;
 
     meta = {
@@ -234,7 +247,7 @@
         baseHyprlandPackage
         pkgs.pkg-config
       ];
-    buildInputs = [ (lib.getDev baseHyprlandPackage) ] ++ baseHyprlandPackage.buildInputs;
+    buildInputs = [(lib.getDev baseHyprlandPackage)] ++ baseHyprlandPackage.buildInputs;
 
     dontConfigure = true;
     dontUseCmakeConfigure = true;
@@ -297,8 +310,8 @@
       hyprNStack
       hyprwinview
       hyprWorkspaceHistory
-      # Disabled 2026-06-19: enabling the plugin correlates with frozen Hyprland
-      # sessions even though startup reaches the uwsm session target.
+      # Disabled 2026-06-28: enabling the plugin freezes Hyprland shortly after
+      # startup on ryzen-shine.
       # hyprtasking
       hyprDynamicCursors
       hyprwobbly