Hosts: Start switch from river to sway wm

Sadly, river doesn't get many updates and wayland kind of requires
constant updates to the client.

4 files changed, 45 insertions, 35 deletions

diff --git a/dotfiles/.bash_profile b/dotfiles/.bash_profile
index 28c4efa..e43c2ff 100644
--- a/dotfiles/.bash_profile
+++ b/dotfiles/.bash_profile
@@ -3,15 +3,22 @@
 
 [[ -f ~/.bashrc ]] && . "$HOME/.bashrc"
 
-# Start River
+# Start Wayland*
 if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
+    #export LIBVA_DRIVER_NAME=nvidia
+    #export XDG_SESSION_TYPE=wayland
+    #export XDG_CURRENT_DESKTOP=sway
+    #export GBM_BACKEND=nvidia-drm
+    #export __GLX_VENDOR_LIBRARY_NAME=nvidia
+    #export WLR_NO_HARDWARE_CURSORS=1
+    #export GDK_BACKEND=nvidia
     export SDL_VIDEODRIVER=wayland
     export QT_QPA_PLATFORM=wayland
     export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
     export MOZ_ENABLE_WAYLAND=1
     export LIBSEAT_BACKEND="logind"
     export NIXOS_OZONE_WL=1
-    exec dbus-run-session river
+    exec dbus-run-session sway --unsupported-gpu
 fi
 
 # StartX
diff --git a/dotfiles/waybar/config b/dotfiles/waybar/config
index 9d31fb5..e61a7a4 100644
--- a/dotfiles/waybar/config
+++ b/dotfiles/waybar/config
@@ -5,32 +5,32 @@
     // "width": 1280, // Waybar width
     "spacing": 2, // Gaps between modules (4px)
     // Choose the order of the modules
-    "modules-left": ["river/tags", "custom/separator", "river/window"],
+    "modules-left": ["sway/workspaces", "custom/separator", "sway/window"],
     //"modules-center": ["river/window"],
     "modules-right": ["custom/weather", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "battery#bat2", "clock", "tray"],
     // Modules configuration
-     //"sway/workspaces": {
-      //   "disable-scroll": true,
-       //  "all-outputs": true,
-        // "format": "{name}",
-        // "persistent_workspaces": {
-        //     "1": [],
-         //    "2": [],
-          //   "3": [],
-           //  "4": [],
-          //   "5": [],
-          //   "6": [],
-          //   "7": [],
-          //   "8": [],
-          //   "9": []
-         //}
-     //},
-    "river/tags": {
-      "tag-labels": ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
-    },
-    "river/window": {
-      "max-length": 99
-    },
+     "sway/workspaces": {
+         "disable-scroll": true,
+         "all-outputs": true,
+         "format": "{name}",
+         "persistent_workspaces": {
+             "1": [],
+             "2": [],
+             "3": [],
+             "4": [],
+             "5": [],
+             "6": [],
+             "7": [],
+             "8": [],
+             "9": []
+         }
+     },
+   // "river/tags": {
+   //   "tag-labels": ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+   // },
+    //"river/window": {
+    //  "max-length": 99
+    //},
     "keyboard-state": {
         "numlock": true,
         "capslock": true,
diff --git a/dotfiles/waybar/style.css b/dotfiles/waybar/style.css
index fe01a14..a36cc04 100644
--- a/dotfiles/waybar/style.css
+++ b/dotfiles/waybar/style.css
@@ -19,24 +19,24 @@ window#waybar {
 }
 
 #window,
-#tags {
+#workspaces {
 	padding: 0 0;
 	margin: 0 0;
 }
 
-#tags button {
+#workspaces button {
 	padding: 0 7px;
 	margin: 0;
 	color: #bbbbbb;
 }
 
-#tags button.occupied {
+#workspaces button.occupied {
 	border-top: 4px solid #bbbbbb;
 	margin: 0;
 	padding: 0 7px;
 }
 
-#tags button.focused {
+#workspaces button.focused {
 	border-top: 0;
 	margin: 0;
 	padding: 0 7px;
@@ -44,7 +44,7 @@ window#waybar {
 	background: #bbbbbb;
 }
 
-#tags button:hover {
+#workspaces button:hover {
 	background: inherit;
 	color: inherit;
 	box-shadow: inherit;
diff --git a/hosts/configuration.nix b/hosts/configuration.nix
index 0c02bef..b0c552c 100644
--- a/hosts/configuration.nix
+++ b/hosts/configuration.nix
@@ -135,11 +135,14 @@
     extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
   };
 
-  #fix swaylock
-  security.pam.services.swaylock = {
-    text = ''
-      auth include login
-    '';
+  security = {
+    polkit.enable = true;
+    #fix swaylock
+    pam.services.swaylock = {
+      text = ''
+        auth include login
+      '';
+    };
   };
 
   services = {