From 38d3e744ad1c095ea9303f48ac75ff0ef9bf6b27 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Sun, 17 Dec 2023 17:22:51 +0100
Subject: [PATCH] wayland: use river as default

---
 overlays/default.nix                     | 18 +++++++++---------
 users/rouven/fixes.nix                   |  9 +++++++++
 users/rouven/modules/ssh/default.nix     | 10 +++++-----
 users/rouven/modules/wayland/default.nix |  1 +
 users/rouven/modules/wayland/waybar.nix  | 12 ++++++------
 5 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/overlays/default.nix b/overlays/default.nix
index 3b2e7e0..7b51cea 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -4,18 +4,10 @@ let
   inherit (prev) python3Packages;
   inherit (prev) fetchFromGitHub;
   inherit (prev) fetchPypi;
+  inherit (prev) fetchpatch;
   inherit (prev) makeWrapper;
 in
 {
-  wpa_supplicant_gui = prev.wpa_supplicant_gui.overrideAttrs
-    (old: {
-      # better desktop application name. "wpa_gui" kinda sucks
-      postInstall = old.postInstall + ''
-
-        substituteInPlace $out/share/applications/wpa_gui.desktop --replace "Name=wpa_gui" "Name=Wireless connections"
-      '';
-    });
-
   pcmanfm = prev.pcmanfm.overrideAttrs (_: {
     # remove deskop preferences shortcut
     postInstall = ''
@@ -25,6 +17,14 @@ in
 
   pww = callPackage ../pkgs/pww { };
 
+  river = prev.river.overrideAttrs (_: {
+    patches = [
+      (fetchpatch {
+        url = "https://patch-diff.githubusercontent.com/raw/riverwm/river/pull/735.patch";
+        hash = "sha256-7pwQfXurgJej0NZ+kD2qBQdrqD6pYA1PbHxzG+5rGac=";
+      })
+    ];
+  });
 
   tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
 
diff --git a/users/rouven/fixes.nix b/users/rouven/fixes.nix
index 294dd10..f704d9c 100644
--- a/users/rouven/fixes.nix
+++ b/users/rouven/fixes.nix
@@ -18,6 +18,14 @@
     extraPortals = [
       pkgs.xdg-desktop-portal-wlr
     ];
+    config = {
+      common = {
+        default = [ "wlr" ];
+      };
+      "org.freedesktop.impl.portal.Secret" = {
+        default = [ "gnome-keyring" ];
+      };
+    };
   };
   # wayland keylogger needs setuid
   programs.wshowkeys.enable = true;
@@ -31,6 +39,7 @@
     # Authentication management.
 
     auth sufficient pam_unix.so nullok likeauth try_first_pass
+    auth sufficient ${pkgs.pam_u2f}/lib/security/pam_u2f.so
     auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so
     auth required pam_deny.so
 
diff --git a/users/rouven/modules/ssh/default.nix b/users/rouven/modules/ssh/default.nix
index ae67792..f7a980f 100644
--- a/users/rouven/modules/ssh/default.nix
+++ b/users/rouven/modules/ssh/default.nix
@@ -25,7 +25,7 @@ in
         hostname = "falkenstein.vpn.rfive.de";
         user = "root";
         extraOptions = {
-          VerifyHostKeyDNS = "ask";
+          VerifyHostKeyDNS = "yes";
         };
       };
       # used for nix remote building
@@ -58,10 +58,6 @@ in
         hostname = "tomate.ifsr.de";
         user = "root";
       };
-      "kaki" = {
-        hostname = "kaki.ifsr.de";
-        user = "root";
-      };
       "git@ifsr.de" = {
         match = "Host ifsr.de User git";
         identityFile = git;
@@ -71,11 +67,15 @@ in
       "dijkstra" = {
         hostname = "login.agdsn.tu-dresden.de";
         user = "r5";
+        extraOptions = {
+          VerifyHostKeyDNS = "yes";
+        };
       };
       "*.agdsn.network" = {
         user = "r5";
         extraOptions = {
           ProxyJump = "dijkstra";
+          VerifyHostKeyDNS = "yes";
         };
       };
       "git@git.agdsn.de" = {
diff --git a/users/rouven/modules/wayland/default.nix b/users/rouven/modules/wayland/default.nix
index a670402..b7c68b2 100644
--- a/users/rouven/modules/wayland/default.nix
+++ b/users/rouven/modules/wayland/default.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./sway.nix
+    ./river.nix
     ./breaktimer.nix
     ./waybar.nix
     ./shikane.nix
diff --git a/users/rouven/modules/wayland/waybar.nix b/users/rouven/modules/wayland/waybar.nix
index 0f56ffd..c5f5a0e 100644
--- a/users/rouven/modules/wayland/waybar.nix
+++ b/users/rouven/modules/wayland/waybar.nix
@@ -10,7 +10,7 @@
         layer = "top";
         position = "top";
         height = 26;
-        modules-left = [ "sway/workspaces" "custom/spotifytitle" "sway/window" ];
+        modules-left = [ "river/tags" "custom/spotifytitle" "river/window" ];
         modules-right = [ "network" "cpu" "pulseaudio" "battery" "tray" "custom/notification" "clock" ];
         network = {
           format-wifi = "  {essid} ({signalStrength}%)";
@@ -20,11 +20,11 @@
           format-disconnected = "Disconnected ⚠";
           format-alt = "{ifname}: {ipaddr}/{cidr}";
         };
-        "sway/workspaces" = {
+        "river/tags" = {
           format = "{icon}";
           on-click = "activate";
         };
-        "sway/window" = {
+        "river/window" = {
           format = "   {}";
           # separate-outputs = true;
         };
@@ -113,18 +113,18 @@
       background-color: transparent;
     }
 
-    #workspaces button {
+    #tags button {
         padding: 0 5px;
         background-color: transparent;
         color: #${config.colorScheme.colors.base05};
     }
 
-    #workspaces button.focused {
+    #tags button.focused {
         background-color: #${config.colorScheme.colors.base04};
         box-shadow: inset 0 -3px #${config.colorScheme.colors.base05};
     }
     
-    #workspaces button.urgent {
+    #tags button.urgent {
         background-color: #eb4d4b;
     }