niri stuff; remove hosts module

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;

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;
 }

modules/default.nix

@@ -2,6 +2,5 @@
 {
   imports = [
     ./backup.nix
-    ./niri.nix
   ];
 }

modules/niri.nix

@@ -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;
-  };
-}