added river

hosts/Puenktchen/default.nix

@@ -15,6 +15,7 @@
     hyprlock.enable = false;
     hypridle.enable = false;
     hyprpaper.enable = false;
+    wm.river.enable = true;
 
     hyprland = {
       hardware.Puenktchen.enable = true;

modules/default/home-manager/desktop/compositors/default.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+
+  imports = [
+    ./niri.nix
+    ./river.nix
+  ];
+}

modules/default/home-manager/desktop/compositors/niri.nix

@@ -1,8 +1,10 @@
-{ lib, config, pkgs, ... }:
+{ inputs, lib, config, pkgs, ... }:
 let
   SCRIPTS = "$XDG_CONFIG_HOME/desktop-utils/scripts";
 in
-lib.mkIf config.desktop.enable {
+lib.mkIf config.desktop.wm.niri.enable {
+
+  nixpkgs.overlays = [ inputs.niri.overlays.niri ];
 
   programs.niri.enable = true;
 

modules/default/home-manager/desktop/compositors/river.nix

@@ -0,0 +1,19 @@
+{ lib, config, ... }:
+lib.mkIf config.desktop.wm.river.enable {
+  home-manager.users.willifan = {
+    wayland.windowManager.river = {
+      enable = true;
+      settings = {
+        map = {
+          normal = {
+            "Super Q" = "spawn 'kitty'";
+            "Super R" = "spawn 'fuzzel'";
+            "Super E" = "spawn 'thunar'";
+
+            "Super C" = "close";
+          };
+        };
+      };
+    };
+  };
+}

modules/default/home-manager/desktop/default.nix

@@ -3,7 +3,7 @@
 
   imports = [
     ./hyprland
-    ./niri
+    ./compositors
 
     ./options.nix
     ./kitty.nix

modules/default/home-manager/desktop/hyprland/options.nix

@@ -17,7 +17,7 @@
 
       hyprland = {
         enable = lib.mkOption {
-          default = config.desktop.enable;
+          default = false;
           type = lib.types.bool;
         };
         hardware = {

modules/default/home-manager/desktop/niri/default.nix

@@ -1,8 +0,0 @@
-{ inputs, ... }:
-{
-  nixpkgs.overlays = [ inputs.niri.overlays.niri ];
-
-  imports = [
-    ./niri.nix
-  ];
-}

modules/default/home-manager/desktop/options.nix

@@ -10,6 +10,17 @@
         default = config.desktop.enable;
         type = lib.types.bool;
       };
+      wm = {
+        niri.enable = lib.mkOption {
+          default = false;
+          type = lib.types.bool;
+        };
+        river.enable = lib.mkOption {
+          default = false;
+          type = lib.types.bool;
+        };
+
+      };
     };
   };
 }