From 6cb666709308a48709b9fa4aefe5a0569c93de66 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Mon, 22 Jan 2024 01:07:30 +0100
Subject: [PATCH] thinkpad: wayland and bluetooth fixes

---
 hosts/thinkpad/default.nix              | 9 ++++++++-
 overlays/default.nix                    | 9 ---------
 users/rouven/default.nix                | 2 +-
 users/rouven/fixes.nix                  | 4 ++++
 users/rouven/modules/packages.nix       | 1 +
 users/rouven/modules/wayland/waybar.nix | 9 ++++++++-
 6 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index 9f08ec6..c014fb7 100755
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -66,7 +66,14 @@
     fwupd.enable = true; # firmware updates
     zfs.autoScrub.enable = true;
   };
-  hardware.bluetooth.enable = true;
+  hardware.bluetooth = {
+    enable = true;
+    settings = {
+      General = {
+        Experimental = true;
+      };
+    };
+  };
 
   services.logind = {
     lidSwitch = "suspend-then-hibernate";
diff --git a/overlays/default.nix b/overlays/default.nix
index 84d89af..d97f598 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -18,15 +18,6 @@ in
   pww = callPackage ../pkgs/pww { };
   ianny = callPackage ../pkgs/ianny { };
 
-  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; };
 
   gnome-break-timer = callPackage ../pkgs/gnome-break-timer { };
diff --git a/users/rouven/default.nix b/users/rouven/default.nix
index 51f36c0..b1a1737 100644
--- a/users/rouven/default.nix
+++ b/users/rouven/default.nix
@@ -5,7 +5,7 @@
   users.users.rouven = {
     description = "Rouven Seifert";
     isNormalUser = true;
-    extraGroups = [ "wheel" "video" "libvirtd" "tss" "input" "wireshark" "etherape" ];
+    extraGroups = [ "wheel" "video" "dialout" "libvirtd" "tss" "input" "wireshark" "etherape" ];
     initialHashedPassword = "$6$X3XERQv28Nt1UUT5$MjdMBDuXyEwexkuKqmNFweez69q4enY5cjMXSbBxOc6Bq7Fhhp7OqmCm02k3OGjoZFXzPV9ZHuMSGKZOtwYIk1";
   };
   home-manager.useUserPackages = true;
diff --git a/users/rouven/fixes.nix b/users/rouven/fixes.nix
index c5879ac..ba07825 100644
--- a/users/rouven/fixes.nix
+++ b/users/rouven/fixes.nix
@@ -18,11 +18,15 @@
     enable = true;
     extraPortals = [
       pkgs.xdg-desktop-portal-wlr
+      pkgs.xdg-desktop-portal-gtk
     ];
     config = {
       common = {
         default = [ "wlr" ];
       };
+      "org.freedesktop.impl.portal.FileChooser" = {
+        default = [ "gtk" ];
+      };
       "org.freedesktop.impl.portal.Secret" = {
         default = [ "gnome-keyring" ];
       };
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index e43cf7e..e538165 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -52,6 +52,7 @@
     libreoffice
     mosh
     ansible
+    plover.dev
 
     # programming languages
     cargo
diff --git a/users/rouven/modules/wayland/waybar.nix b/users/rouven/modules/wayland/waybar.nix
index 47e4930..a7cdc3d 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 = [ "river/tags" "custom/spotifytitle" "river/window" ];
+        modules-left = [ "sway/workspaces" "river/tags" "custom/spotifytitle" "river/window" ];
         modules-right = [ "network" "cpu" "pulseaudio" "battery" "tray" "custom/notification" "clock" ];
         network = {
           format-wifi = "  {essid} ({signalStrength}%)";
@@ -24,6 +24,10 @@
           format = "{icon}";
           on-click = "activate";
         };
+        "sway/workspaces" = {
+          format = "{icon}";
+          on-click = "activate";
+        };
         "river/window" = {
           format = "   {}";
           # separate-outputs = true;
@@ -113,12 +117,14 @@
       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};
@@ -128,6 +134,7 @@
         box-shadow: inset 0 -3px #${config.colorScheme.colors.base05};
     }
     
+    #workspaces button.urgent,
     #tags button.urgent {
         background-color: #eb4d4b;
     }