diff --git a/homeManagerModules/desktop/hyprland/default.nix b/homeManagerModules/desktop/hyprland/default.nix index e66ed2dc..8fb84fb8 100644 --- a/homeManagerModules/desktop/hyprland/default.nix +++ b/homeManagerModules/desktop/hyprland/default.nix @@ -43,7 +43,7 @@ in { ${ lib.strings.concatMapStringsSep "\n" (x: "bind = , ${toString x}, movetoworkspace, ${toString x}") - cfg.desktop.hyprland.workspaces + [1 2 3 4 5 6 7 8 9] } # hyprnome diff --git a/homeManagerModules/desktop/hyprland/vars.nix b/homeManagerModules/desktop/hyprland/vars.nix index 2b29d2ac..89319221 100644 --- a/homeManagerModules/desktop/hyprland/vars.nix +++ b/homeManagerModules/desktop/hyprland/vars.nix @@ -93,8 +93,8 @@ in { "CTRL ALT,M,submap,move" "CTRL ALT,R,submap,resize" ] - ++ builtins.map (x: "$mod, ${toString x}, workspace, ${toString x}") cfg.desktop.hyprland.workspaces - ++ builtins.map (x: "$mod SHIFT, ${toString x}, movetoworkspace, ${toString x}") cfg.desktop.hyprland.workspaces + ++ builtins.map (x: "$mod, ${toString x}, workspace, ${toString x}") [1 2 3 4 5 6 7 8 9] + ++ builtins.map (x: "$mod SHIFT, ${toString x}, movetoworkspace, ${toString x}") [1 2 3 4 5 6 7 8 9] ++ lib.attrsets.mapAttrsToList (key: direction: "$mod, ${key}, movefocus, ${direction}") cfg.desktop.hyprland.windowManagerBinds ++ lib.attrsets.mapAttrsToList (key: direction: "$mod SHIFT, ${key}, movewindow, ${direction}") cfg.desktop.hyprland.windowManagerBinds ++ lib.attrsets.mapAttrsToList (key: direction: "$mod CONTROL SHIFT, ${key}, movecurrentworkspacetomonitor, ${direction}") cfg.desktop.hyprland.windowManagerBinds; diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix index 97863a30..65212a60 100644 --- a/homeManagerModules/options.nix +++ b/homeManagerModules/options.nix @@ -151,12 +151,6 @@ in { type = lib.types.bool; }; - workspaces = lib.mkOption { - description = "Default numbered workspaces to create."; - default = [1 2 3 4 5 6 7 8 9]; - type = lib.types.listOf lib.types.int; - }; - windowManagerBinds = lib.mkOption { description = "Default binds for window management."; default = {