diff --git a/home/niri/default.nix b/home/niri/default.nix index 92f5701..0c72563 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -135,13 +135,16 @@ in "Mod+Shift+U".action = move-window-to-workspace-up; "Mod+Shift+I".action = move-window-to-workspace-down; "Mod+W".action = maximize-column; + "Mod+E".action = set-column-width "50%"; + "Mod+R".action = set-column-width "75%"; + "Mod+Q".action = set-column-width "25%"; "Mod+C".action = center-column; "Mod+Shift+Space".action = toggle-window-floating; "Mod+Space".action = switch-focus-between-floating-and-tiling; "Print".action = screenshot; "Alt+Print".action = screenshot-window; "Ctrl+Print".action = screenshot-screen; - "Mod+R".action = switch-preset-column-width; + # "Mod+R".action = switch-preset-column-width; "Mod+Shift+R".action = switch-preset-window-height; "Mod+Ctrl+R".action = reset-window-height; "Mod+F".action = fullscreen-window; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 0024c40..c2a670a 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -311,8 +311,7 @@ services.trezord.enable = true; - my.niri = { - enable = true; - package = pkgs.niri-unstable; - }; + programs.niri.enable = true; + programs.niri.package = pkgs.niri-unstable; + programs.xwayland.enable = true; } diff --git a/modules/default.nix b/modules/default.nix index bde6e96..2155137 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -2,6 +2,5 @@ { imports = [ ./backup.nix - ./niri.nix ]; } diff --git a/modules/niri.nix b/modules/niri.nix deleted file mode 100644 index b5a6ef4..0000000 --- a/modules/niri.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: -let - cfg = config.my.niri; -in -{ - options.my.niri = { - enable = lib.mkEnableOption "niri"; - package = lib.mkPackageOption pkgs "niri" { }; - }; - - config = lib.mkIf cfg.enable { - programs.niri.package = cfg.package; - programs.niri.enable = true; - programs.xwayland.enable = true; - }; -}