Replace hyprexpo-plus with hyprexpo

This commit is contained in:
2026-05-15 00:16:32 -07:00
parent 1d701304fe
commit a44b21d681
7 changed files with 14 additions and 17 deletions

View File

@@ -214,7 +214,7 @@ function M.setup(ctx)
for i = 1, max_workspace do for i = 1, max_workspace do
local workspace_id = i local workspace_id = i
local key = tostring(i % 10) local key = tostring(i % 10)
bind(key, hyprexpo_dispatch("kb_selectn", workspace_id), desc("Select workspace " .. workspace_id)) bind(key, hyprexpo_dispatch("kb_selecti", workspace_id), desc("Select workspace " .. workspace_id))
end end
bind("Escape", hyprexpo("off"), desc("Close workspace expo")) bind("Escape", hyprexpo("off"), desc("Close workspace expo"))

View File

@@ -227,13 +227,12 @@ function M.setup(ctx)
plugin = { plugin = {
hyprexpo = { hyprexpo = {
columns = 3, columns = 3,
gaps_in = 5, gap_size = 5,
gaps_out = 0, gap_size_outer = 0,
bg_col = 0xff111111, bg_col = 0xff111111,
workspace_method = "center current", workspace_method = "center current",
skip_empty = false, skip_empty = false,
gesture_distance = 200, gesture_distance = 200,
keynav_enable = 1,
keynav_wrap_h = 1, keynav_wrap_h = 1,
keynav_wrap_v = 1, keynav_wrap_v = 1,
keynav_reading_order = 0, keynav_reading_order = 0,
@@ -257,7 +256,6 @@ function M.setup(ctx)
label_color_current = 0xff66ccff, label_color_current = 0xff66ccff,
label_bg_enable = 1, label_bg_enable = 1,
label_bg_color = 0xcc000000, label_bg_color = 0xcc000000,
label_bg_shape = "rounded",
label_bg_rounding = 10, label_bg_rounding = 10,
label_padding = 12, label_padding = 12,
label_font_bold = 1, label_font_bold = 1,

11
nixos/flake.lock generated
View File

@@ -819,17 +819,16 @@
"hyprexpo": { "hyprexpo": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1778816761, "lastModified": 1778829240,
"narHash": "sha256-+riuSr1jdxdhfYNtt6S5a6uUUDhYb67gDRKHpk7l1pg=", "narHash": "sha256-r+gsmmJM8cXuq1TDuaBUjl5g1HYMA357Rl+NH6svV8E=",
"owner": "colonelpanic8", "owner": "colonelpanic8",
"repo": "hyprexpo-plus", "repo": "hyprexpo",
"rev": "4d753224148c45153dbea95b3d6b1897bd71dfbb", "rev": "67adc97d818cf13fef7fa4a6ad7e94ab7d0c002a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "colonelpanic8", "owner": "colonelpanic8",
"ref": "codex/lua-config-api", "repo": "hyprexpo",
"repo": "hyprexpo-plus",
"type": "github" "type": "github"
} }
}, },

View File

@@ -116,7 +116,7 @@
}; };
hyprexpo = { hyprexpo = {
url = "github:colonelpanic8/hyprexpo-plus/codex/lua-config-api"; url = "github:colonelpanic8/hyprexpo";
flake = false; flake = false;
}; };

View File

@@ -26,7 +26,7 @@
hyprlang = inputs.hyprlang.packages.${system}.hyprlang; hyprlang = inputs.hyprlang.packages.${system}.hyprlang;
hyprutils = inputs.hyprutils.packages.${system}.hyprutils; hyprutils = inputs.hyprutils.packages.${system}.hyprutils;
}; };
hyprexpo = pkgs.callPackage ../packages/hyprexpo-plus { hyprexpo = pkgs.callPackage ../packages/hyprexpo {
src = inputs.hyprexpo; src = inputs.hyprexpo;
hyprland = inputs.hyprland.packages.${system}.hyprland; hyprland = inputs.hyprland.packages.${system}.hyprland;
aquamarine = inputs.aquamarine.packages.${system}.aquamarine; aquamarine = inputs.aquamarine.packages.${system}.aquamarine;

View File

@@ -115,7 +115,7 @@
./packages/hyprwobbly-safe-geometry-and-idle-timer.patch ./packages/hyprwobbly-safe-geometry-and-idle-timer.patch
]; ];
}); });
hyprexpo = pkgs.callPackage ./packages/hyprexpo-plus { hyprexpo = pkgs.callPackage ./packages/hyprexpo {
src = inputs.hyprexpo; src = inputs.hyprexpo;
hyprland = baseHyprlandPackage; hyprland = baseHyprlandPackage;
aquamarine = inputs.aquamarine.packages.${system}.aquamarine; aquamarine = inputs.aquamarine.packages.${system}.aquamarine;

View File

@@ -26,7 +26,7 @@
src, src,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "hyprexpo-plus"; pname = "hyprexpo";
version = "unstable-${src.shortRev or "unknown"}"; version = "unstable-${src.shortRev or "unknown"}";
inherit src; inherit src;
@@ -67,8 +67,8 @@ stdenv.mkDerivation {
''; '';
meta = { meta = {
description = "Enhanced Hyprland workspace overview plugin"; description = "Hyprland workspace overview plugin";
homepage = "https://github.com/sandwichfarm/hyprexpo-plus"; homepage = "https://github.com/colonelpanic8/hyprexpo";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
}; };