diff --git a/dotfiles/config/hypr/hyprland/binds.lua b/dotfiles/config/hypr/hyprland/binds.lua index 52e2e153..f75adb59 100644 --- a/dotfiles/config/hypr/hyprland/binds.lua +++ b/dotfiles/config/hypr/hyprland/binds.lua @@ -214,7 +214,7 @@ function M.setup(ctx) for i = 1, max_workspace do local workspace_id = i 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 bind("Escape", hyprexpo("off"), desc("Close workspace expo")) diff --git a/dotfiles/config/hypr/hyprland/core.lua b/dotfiles/config/hypr/hyprland/core.lua index b81d61e5..cd94ab28 100644 --- a/dotfiles/config/hypr/hyprland/core.lua +++ b/dotfiles/config/hypr/hyprland/core.lua @@ -227,13 +227,12 @@ function M.setup(ctx) plugin = { hyprexpo = { columns = 3, - gaps_in = 5, - gaps_out = 0, + gap_size = 5, + gap_size_outer = 0, bg_col = 0xff111111, workspace_method = "center current", skip_empty = false, gesture_distance = 200, - keynav_enable = 1, keynav_wrap_h = 1, keynav_wrap_v = 1, keynav_reading_order = 0, @@ -257,7 +256,6 @@ function M.setup(ctx) label_color_current = 0xff66ccff, label_bg_enable = 1, label_bg_color = 0xcc000000, - label_bg_shape = "rounded", label_bg_rounding = 10, label_padding = 12, label_font_bold = 1, diff --git a/nixos/flake.lock b/nixos/flake.lock index 81d90913..8aedb0f9 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -819,17 +819,16 @@ "hyprexpo": { "flake": false, "locked": { - "lastModified": 1778816761, - "narHash": "sha256-+riuSr1jdxdhfYNtt6S5a6uUUDhYb67gDRKHpk7l1pg=", + "lastModified": 1778829240, + "narHash": "sha256-r+gsmmJM8cXuq1TDuaBUjl5g1HYMA357Rl+NH6svV8E=", "owner": "colonelpanic8", - "repo": "hyprexpo-plus", - "rev": "4d753224148c45153dbea95b3d6b1897bd71dfbb", + "repo": "hyprexpo", + "rev": "67adc97d818cf13fef7fa4a6ad7e94ab7d0c002a", "type": "github" }, "original": { "owner": "colonelpanic8", - "ref": "codex/lua-config-api", - "repo": "hyprexpo-plus", + "repo": "hyprexpo", "type": "github" } }, diff --git a/nixos/flake.nix b/nixos/flake.nix index 3213c3d5..1bb9275f 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -116,7 +116,7 @@ }; hyprexpo = { - url = "github:colonelpanic8/hyprexpo-plus/codex/lua-config-api"; + url = "github:colonelpanic8/hyprexpo"; flake = false; }; diff --git a/nixos/flake/per-system.nix b/nixos/flake/per-system.nix index f24d04ad..701de0b7 100644 --- a/nixos/flake/per-system.nix +++ b/nixos/flake/per-system.nix @@ -26,7 +26,7 @@ hyprlang = inputs.hyprlang.packages.${system}.hyprlang; hyprutils = inputs.hyprutils.packages.${system}.hyprutils; }; - hyprexpo = pkgs.callPackage ../packages/hyprexpo-plus { + hyprexpo = pkgs.callPackage ../packages/hyprexpo { src = inputs.hyprexpo; hyprland = inputs.hyprland.packages.${system}.hyprland; aquamarine = inputs.aquamarine.packages.${system}.aquamarine; diff --git a/nixos/hyprland.nix b/nixos/hyprland.nix index 3104ed6e..82d715e0 100644 --- a/nixos/hyprland.nix +++ b/nixos/hyprland.nix @@ -115,7 +115,7 @@ ./packages/hyprwobbly-safe-geometry-and-idle-timer.patch ]; }); - hyprexpo = pkgs.callPackage ./packages/hyprexpo-plus { + hyprexpo = pkgs.callPackage ./packages/hyprexpo { src = inputs.hyprexpo; hyprland = baseHyprlandPackage; aquamarine = inputs.aquamarine.packages.${system}.aquamarine; diff --git a/nixos/packages/hyprexpo-plus/default.nix b/nixos/packages/hyprexpo/default.nix similarity index 85% rename from nixos/packages/hyprexpo-plus/default.nix rename to nixos/packages/hyprexpo/default.nix index 6b940ef5..c1880876 100644 --- a/nixos/packages/hyprexpo-plus/default.nix +++ b/nixos/packages/hyprexpo/default.nix @@ -26,7 +26,7 @@ src, }: stdenv.mkDerivation { - pname = "hyprexpo-plus"; + pname = "hyprexpo"; version = "unstable-${src.shortRev or "unknown"}"; inherit src; @@ -67,8 +67,8 @@ stdenv.mkDerivation { ''; meta = { - description = "Enhanced Hyprland workspace overview plugin"; - homepage = "https://github.com/sandwichfarm/hyprexpo-plus"; + description = "Hyprland workspace overview plugin"; + homepage = "https://github.com/colonelpanic8/hyprexpo"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; };