diff --git a/flake.lock b/flake.lock
index cdab8fa..634034d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -180,11 +180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710164657,
-        "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=",
+        "lastModified": 1710336510,
+        "narHash": "sha256-mT/Z1AseVhhiFooCu2J7wudx+FivkRrlRBW0iBC2V/o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2",
+        "rev": "383296ffa45b539c28bf79ec2a272f652838ddd1",
         "type": "github"
       },
       "original": {
@@ -296,11 +296,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709961763,
-        "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
+        "lastModified": 1710272261,
+        "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
+        "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
         "type": "github"
       },
       "original": {
@@ -411,6 +411,24 @@
         "type": "github"
       }
     },
+    "river": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1710341821,
+        "narHash": "sha256-cWFJv5QUmcBqnJGk9twjcndk3/dIAEZ5tOKVhRhQhAg=",
+        "ref": "refs/heads/master",
+        "rev": "fecfa89a9a8ba1d9704b4d07fe02c16cd20a1644",
+        "revCount": 1172,
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/riverwm/river"
+      },
+      "original": {
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/riverwm/river"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -422,6 +440,7 @@
         "nixpkgs": "nixpkgs",
         "pfersel": "pfersel",
         "purge": "purge",
+        "river": "river",
         "trucksimulatorbot": "trucksimulatorbot"
       }
     },
diff --git a/flake.nix b/flake.nix
index f2b7da7..45d3cef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,6 +43,13 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    river = {
+      url = "https://github.com/riverwm/river";
+      flake = false;
+      type = "git";
+      submodules = true;
+    };
+
   };
 
   outputs =
@@ -57,6 +64,7 @@
     , purge
     , trucksimulatorbot
     , pfersel
+    , river
     , ...
     }@attrs: {
       packages.x86_64-linux = {
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index dfc1a00..2d3316d 100755
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
 
   imports =
@@ -58,10 +58,6 @@
     blueman.enable = true; # bluetooth
     devmon.enable = true; # automount stuff
     upower.enable = true;
-    avahi = {
-      enable = true;
-      nssmdns4 = true;
-    };
     fwupd.enable = true; # firmware updates
     zfs.autoScrub.enable = true;
   };
@@ -96,5 +92,6 @@
     dev.enable = true;
     man.generateCaches = true;
   };
+  environment.systemPackages = [ pkgs.man-pages ];
   system.stateVersion = "22.11";
 }
diff --git a/shared/gpg.nix b/shared/gpg.nix
index 53a5a4a..bd31645 100644
--- a/shared/gpg.nix
+++ b/shared/gpg.nix
@@ -1,11 +1,11 @@
-{ ... }:
+{ pkgs, ... }:
 {
   programs.gnupg = {
     dirmngr.enable = true;
     agent = {
       enable = true;
       enableSSHSupport = true;
-      pinentryFlavor = "gnome3";
+      pinentryPackage = pkgs.pinentry-gnome3;
     };
   };
   services.pcscd.enable = true;
diff --git a/users/rouven/fixes.nix b/users/rouven/fixes.nix
index ba07825..0aa9434 100644
--- a/users/rouven/fixes.nix
+++ b/users/rouven/fixes.nix
@@ -58,7 +58,7 @@
   # global wrapper for ausweisapp
   programs.ausweisapp = {
     enable = true;
-    openFirewall = true;
+    # openFirewall = true;
   };
   # home manager steam is borderline broken
   programs.steam.enable = true;
diff --git a/users/rouven/modules/wayland/river.nix b/users/rouven/modules/wayland/river.nix
index 90ad809..35c7e33 100644
--- a/users/rouven/modules/wayland/river.nix
+++ b/users/rouven/modules/wayland/river.nix
@@ -1,8 +1,16 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, river, ... }:
 {
   wayland.windowManager.river = {
     enable = true;
-    systemd.extraCommands = [ "systemctl --user start river-session.target" ];
+    package = with pkgs; pkgs.river.overrideAttrs (old: {
+      src = river;
+      buildInputs = lib.lists.remove wlroots_0_16 old.buildInputs ++ [
+        (wlroots.overrideAttrs (_: {
+          version = "0.17.2";
+        }))
+      ];
+    });
+    systemd. extraCommands = [ "systemctl --user start river-session.target" ];
     settings = {
       focus-follows-cursor = "always";
       set-cursor-warp = "on-focus-change";
@@ -30,7 +38,6 @@
             K = "focus-view next";
             L = "focus-output next";
             O = "send-to-output next";
-            S = "send-to-output next";
           };
           "Super+Shift" = {
             Return = "zoom";