diff --git a/homes/x86_64-linux/zack@earth/default.nix b/homes/x86_64-linux/zack@earth/default.nix index 476fe15..1971b34 100644 --- a/homes/x86_64-linux/zack@earth/default.nix +++ b/homes/x86_64-linux/zack@earth/default.nix @@ -5,7 +5,7 @@ lib, ... }: { - wms.river.enable = true; + wms.hyprland.enable = true; apps = { web.firefox.enable = true; diff --git a/modules/home/wms/river/default.nix b/modules/home/wms/river/default.nix index 1b1378b..24b01e2 100644 --- a/modules/home/wms/river/default.nix +++ b/modules/home/wms/river/default.nix @@ -7,6 +7,8 @@ with lib; with lib.custom; let cfg = config.wms.river; + + super = "Super"; in { options.wms.river = with types; { enable = mkBoolOpt false "Enable River WM"; @@ -20,6 +22,27 @@ in { "firefox" "kitty" ]; + + map = { + normal = { + "${super} Return" = "spawn kitty"; + "${super} Q" = "close"; + "${super} M" = "exit"; + "${super} D" = "spawn anyrun"; + "${super} J" = "focus-view next"; + "${super} K" = "focus-view previous"; + "${super}+Shift J" = "swap next"; + "${super}+Shift K" = "swap previous"; + }; + }; + + map-pointer = { + normal = { + "${super} BTN_LEFT" = "move-view"; + "${super} BTN_RIGHT" = "resize-view"; + "${super} BTN_MIDDLE" = "toggle-float"; + }; + }; }; }; }; diff --git a/modules/nixos/protocols/wayland/default.nix b/modules/nixos/protocols/wayland/default.nix index 0374d54..9fc7e71 100644 --- a/modules/nixos/protocols/wayland/default.nix +++ b/modules/nixos/protocols/wayland/default.nix @@ -26,7 +26,7 @@ in { enable = true; settings = rec { initial_session = { - command = "river"; + command = "Hyprland"; user = "zack"; }; default_session = initial_session;