diff --git a/hosts/common/graphical/default.nix b/hosts/common/graphical/default.nix
index 6b3a42c..8cb4b63 100644
--- a/hosts/common/graphical/default.nix
+++ b/hosts/common/graphical/default.nix
@@ -53,6 +53,8 @@
   programs = {
     hyprland.enable = true;
 
+    river.enable = true;
+
     steam = {
       enable = true;
     };
diff --git a/users/configs/desktop/default.nix b/users/configs/desktop/default.nix
index cef3114..11cb903 100644
--- a/users/configs/desktop/default.nix
+++ b/users/configs/desktop/default.nix
@@ -4,6 +4,7 @@
     # ./i3status-rust
     # ./polybar
     ./hyprland
+    ./river
     ./waybar
     ./tofi
   ];
diff --git a/users/configs/desktop/river/default.nix b/users/configs/desktop/river/default.nix
new file mode 100644
index 0000000..90a36ed
--- /dev/null
+++ b/users/configs/desktop/river/default.nix
@@ -0,0 +1,48 @@
+{
+  config,
+  lib,
+  pkgs,
+  hostname,
+  ...
+}: {
+  home.packages = with pkgs; [
+    wlr-randr
+  ];
+  wayland.windowManager.river = {
+    enable = true;
+
+    extraConfig = ''
+      MAINMOD="Super"
+
+      riverctl map normal $MAINMOD D spawn 'tofi-drun --drun-launch=true'
+      riverctl map normal $MAINMOD Return spawn 'kitty'
+      riverctl map normal $MAINMOD+Shift p exit
+      riverctl map normal $MAINMOD q close
+
+      riverctl map normal $MAINMOD l focus-view next
+      riverctl map normal $MAINMOD h focus-view previous
+
+      riverctl map normal $MAINMOD+Shift l swap next
+      riverctl map normal $MAINMOD+Shift h swap previous
+
+
+      riverctl map -repeat normal None XF86AudioLowerVolume spawn 'wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%-'
+      riverctl map -repeat normal None XF86AudioRaiseVolume spawn 'wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+'
+      riverctl map normal None XF86AudioMute spawn 'wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle'
+
+      riverctl map -repeat normal None XF86MonBrightnessUp spawn 'xbacklight -inc 10'
+      riverctl map -repeat normal None XF86MonBrightnessDown spawn 'xbacklight -dec 10'
+
+      riverctl spawn rivertile
+      riverctl output-layout rivertile
+
+      riverctl input 'pointer-2362-628-PIXA3854:00_093A:0274_Touchpad' accel-profile flat
+      riverctl input 'pointer-2362-628-PIXA3854:00_093A:0274_Touchpad' natural-scroll enabled
+      riverctl input 'pointer-2362-628-PIXA3854:00_093A:0274_Touchpad' tap enabled
+
+      riverctl keyboard-layout -options caps:escape gb
+
+      wlr-randr --output eDP-1 --scale 1.33
+    '';
+  };
+}
diff --git a/users/configs/desktop/waybar/config.json b/users/configs/desktop/waybar/config.json
index 91fcb01..247aae0 100644
--- a/users/configs/desktop/waybar/config.json
+++ b/users/configs/desktop/waybar/config.json
@@ -2,7 +2,11 @@
 	"layer": "top",
 	"modules-left": [
 		"hyprland/workspaces",
-		"hyprland/window"
+		"hyprland/window",
+		"river/tags",
+		"river/mode",
+		"river/layout",
+		"river/window"
 	],
 	"modules-center": [
 		"clock"