colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos: update hyprtasking packaging

Browse Source
This commit is contained in:
Ivan Malison
2026-06-28 11:47:19 -07:00
parent b22f112a39
commit 00708d4eac
5 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/flake.lock generated
View File

@@ -1148,16 +1148,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781534922, "lastModified": 1782607986,
"narHash": "sha256-jmzKIyRmpZLpxnR7DsWZ42bMzt+WeYDk+/x3FKSkovM=", "narHash": "sha256-7CvSvTEk6rAX/K56QoPbWe7tr+9KGBAugXYJGc6eOEg=",
"owner": "yerlotic", "owner": "raybbian",
"repo": "hyprtasking", "repo": "hyprtasking",
"rev": "1a82ca1ac79602e3bfd5ecb0a52c40c2bf818586", "rev": "765575445ce34989575a99f304d0b279e6a980b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "yerlotic", "owner": "raybbian",
"ref": "chase_v55",
"repo": "hyprtasking", "repo": "hyprtasking",
"type": "github" "type": "github"
} }

4
nixos/flake.nix
View File

@@ -143,8 +143,8 @@
}; };
hyprtasking = { hyprtasking = {
# PR #114 tracks Hyprland 0.55 and adds Lua plugin functions. # Upstream default branch; the Hyprland 0.55 support PR has been merged.
url = "github:yerlotic/hyprtasking/chase_v55"; url = "github:raybbian/hyprtasking";
inputs = { inputs = {
hyprland.follows = "hyprland"; hyprland.follows = "hyprland";
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";

15
nixos/flake/hyprland-stuff.nix
View File

@@ -107,6 +107,14 @@
}; };
postBuild = '' postBuild = ''
mkdir -p "$out/bin" "$out/share/wayland-sessions" 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' \ printf '%s\n' \
'#!${pkgs.runtimeShell}' \ '#!${pkgs.runtimeShell}' \
'nvidia_drm_device="/dev/dri/by-path/pci-0000:01:00.0-card"' \ '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"' \ ' export AQ_DRM_DEVICES="$nvidia_drm_device:$intel_drm_device"' \
'fi' \ 'fi' \
'config_path="''${XDG_CONFIG_HOME:-$HOME/.config}/hypr/hyprland.lua"' \ '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" > "$out/bin/start-hyprland-lua"
substituteInPlace "$out/bin/start-hyprland-lua" --replace-fail "@out@" "$out"
chmod +x "$out/bin/start-hyprland-lua" chmod +x "$out/bin/start-hyprland-lua"
printf '%s\n' \ printf '%s\n' \
@@ -293,8 +302,8 @@
hyprNStack hyprNStack
hyprwinview hyprwinview
hyprWorkspaceHistory hyprWorkspaceHistory
# Disabled 2026-06-19: enabling the plugin correlates with frozen Hyprland # Disabled 2026-06-28: enabling the plugin freezes Hyprland shortly after
# sessions even though startup reaches the uwsm session target. # startup on ryzen-shine.
# hyprtasking # hyprtasking
hyprDynamicCursors hyprDynamicCursors
hyprwobbly hyprwobbly

2
nixos/flake/per-system.nix
View File

@@ -41,6 +41,7 @@ in {
hyprexpo-lua = hyprlandStuffPackages.hyprexpo; hyprexpo-lua = hyprlandStuffPackages.hyprexpo;
hyprwinview = hyprlandStuffPackages.hyprwinview; hyprwinview = hyprlandStuffPackages.hyprwinview;
hypr-workspace-history = hyprlandStuffPackages.hyprWorkspaceHistory; hypr-workspace-history = hyprlandStuffPackages.hyprWorkspaceHistory;
hyprtasking = hyprlandStuffPackages.hyprtasking;
hyprglass = hyprlandStuffPackages.hyprglass; hyprglass = hyprlandStuffPackages.hyprglass;
}; };
@@ -59,6 +60,7 @@ in {
hyprexpo-lua = hyprlandStuffPackages.hyprexpo; hyprexpo-lua = hyprlandStuffPackages.hyprexpo;
hyprwinview = hyprlandStuffPackages.hyprwinview; hyprwinview = hyprlandStuffPackages.hyprwinview;
hypr-workspace-history = hyprlandStuffPackages.hyprWorkspaceHistory; hypr-workspace-history = hyprlandStuffPackages.hyprWorkspaceHistory;
hyprtasking = hyprlandStuffPackages.hyprtasking;
hyprglass = hyprlandStuffPackages.hyprglass; hyprglass = hyprlandStuffPackages.hyprglass;
hyprland-config-syntax = hyprlandStuffPackages.hyprlandConfigSyntax; hyprland-config-syntax = hyprlandStuffPackages.hyprlandConfigSyntax;
hyprland-stuff = hyprlandStuffPackages.hyprlandStuff; hyprland-stuff = hyprlandStuffPackages.hyprlandStuff;

37
nixos/hyprland.nix
View File

@@ -97,9 +97,11 @@
name = "${package.name}-lua-config"; name = "${package.name}-lua-config";
inherit (package) version; inherit (package) version;
paths = [package]; paths = [package];
meta = builtins.removeAttrs (package.meta or {}) ["outputsToInstall"] // { meta =
mainProgram = package.meta.mainProgram or "Hyprland"; builtins.removeAttrs (package.meta or {}) ["outputsToInstall"]
}; // {
mainProgram = package.meta.mainProgram or "Hyprland";
};
passthru = passthru =
(package.passthru or {}) (package.passthru or {})
// { // {
@@ -107,6 +109,14 @@
}; };
postBuild = '' postBuild = ''
mkdir -p "$out/bin" "$out/share/wayland-sessions" 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' \ printf '%s\n' \
'#!${pkgs.runtimeShell}' \ '#!${pkgs.runtimeShell}' \
'nvidia_drm_device="/dev/dri/by-path/pci-0000:01:00.0-card"' \ '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"' \ ' export AQ_DRM_DEVICES="$nvidia_drm_device:$intel_drm_device"' \
'fi' \ 'fi' \
'config_path="''${XDG_CONFIG_HOME:-$HOME/.config}/hypr/hyprland.lua"' \ '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" > "$out/bin/start-hyprland-lua"
substituteInPlace "$out/bin/start-hyprland-lua" --replace-fail "@out@" "$out"
chmod +x "$out/bin/start-hyprland-lua" chmod +x "$out/bin/start-hyprland-lua"
printf '%s\n' \ printf '%s\n' \
@@ -208,11 +219,13 @@
substituteInPlace src/layout/layout_base.cpp \ substituteInPlace src/layout/layout_base.cpp \
--replace-fail 'e.element->passName()' 'e->element->passName()' --replace-fail 'e.element->passName()' 'e->element->passName()'
''; '';
nativeBuildInputs = [ nativeBuildInputs =
pkgs.pkg-config [
pkgs.meson pkgs.pkg-config
pkgs.ninja pkgs.meson
] ++ baseHyprlandPackage.nativeBuildInputs; pkgs.ninja
]
++ baseHyprlandPackage.nativeBuildInputs;
buildInputs = [baseHyprlandPackage] ++ baseHyprlandPackage.buildInputs; buildInputs = [baseHyprlandPackage] ++ baseHyprlandPackage.buildInputs;
meta = { meta = {
@@ -234,7 +247,7 @@
baseHyprlandPackage baseHyprlandPackage
pkgs.pkg-config pkgs.pkg-config
]; ];
buildInputs = [ (lib.getDev baseHyprlandPackage) ] ++ baseHyprlandPackage.buildInputs; buildInputs = [(lib.getDev baseHyprlandPackage)] ++ baseHyprlandPackage.buildInputs;
dontConfigure = true; dontConfigure = true;
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
@@ -297,8 +310,8 @@
hyprNStack hyprNStack
hyprwinview hyprwinview
hyprWorkspaceHistory hyprWorkspaceHistory
# Disabled 2026-06-19: enabling the plugin correlates with frozen Hyprland # Disabled 2026-06-28: enabling the plugin freezes Hyprland shortly after
# sessions even though startup reaches the uwsm session target. # startup on ryzen-shine.
# hyprtasking # hyprtasking
hyprDynamicCursors hyprDynamicCursors
hyprwobbly hyprwobbly