From 0b69eff54b07db708431bbd1340764e19c1d6040 Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Wed, 23 Oct 2024 14:28:00 +0200
Subject: [PATCH] Update X11 configs (env, bspwm, polybar)

---
 .config/bspwm/bspwmrc                                       | 4 ++--
 .config/env.d/99-local##hostname.portalo                    | 4 ++++
 .../home-manager/home.nix##hostname.portalo,user.serguzim   | 1 +
 .config/polybar/bars.ini                                    | 6 +++---
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index fa1af02..b573b96 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -28,7 +28,7 @@ if [ "$hostname" = "portalo" ]; then
         xrandr --output "$secondary" --off
         bspc monitor "$primary" -d web terminal 3 4 5 6 focus side-view voip messenger
     else 
-        xrandr --output "$primary" --mode 2560x1440 --refresh 144
+        xrandr --output "$primary" --mode 1920x1080 --refresh 60
         xrandr --output "$secondary" --auto --left-of "$primary"
 
         bspc monitor "$primary" -d web terminal 3 4 5 6 focus
@@ -108,4 +108,4 @@ bspc rule -a 'Thunderbird:Mail' desktop='messenger' locked='true'
 bspc rule -a 'thunderbird-default:Mail' desktop='messenger' locked='true'
 bspc rule -a 'thunderbird' desktop='messenger' locked='true'
 
-autostart-manage run-xorg
+autostart-manage run-xorg &
diff --git a/.config/env.d/99-local##hostname.portalo b/.config/env.d/99-local##hostname.portalo
index 41441d3..76917f1 100755
--- a/.config/env.d/99-local##hostname.portalo
+++ b/.config/env.d/99-local##hostname.portalo
@@ -5,6 +5,10 @@ export AUTOSTART_DISPLAY="Hyprland"
 
 export KDE_CONNECT_DEVICE="Fairphone3"
 
+# X11
+#export MONITOR_PRIMARY="DisplayPort-0"
+#export MONITOR_SECONDARY="HDMI-A-0"
+# Wayland
 export MONITOR_PRIMARY="DP-1"
 export MONITOR_SECONDARY="HDMI-A-1"
 
diff --git a/.config/home-manager/home.nix##hostname.portalo,user.serguzim b/.config/home-manager/home.nix##hostname.portalo,user.serguzim
index 8e74115..f7145b8 100644
--- a/.config/home-manager/home.nix##hostname.portalo,user.serguzim
+++ b/.config/home-manager/home.nix##hostname.portalo,user.serguzim
@@ -10,6 +10,7 @@
 		./graphical.nix
 		./nvim.nix
 		./wayland.nix
+		./x11.nix
 	];
 
 	home.packages = with pkgs; [
diff --git a/.config/polybar/bars.ini b/.config/polybar/bars.ini
index b08be0e..0754b02 100644
--- a/.config/polybar/bars.ini
+++ b/.config/polybar/bars.ini
@@ -47,7 +47,7 @@
 [bar/portalo-base]
     inherit = bar/base
 
-    modules-left = bspwm title
+    modules-left = bspwm
     modules-right = openweather memory cpu temperature eth check-arch-updates date
 
     eth-interface = enp0s31f6
@@ -55,7 +55,7 @@
 [bar/portalo-primary]
     inherit = bar/portalo-base
 
-    modules-left = bspwm bsp-layout-primary title
+    modules-left = bspwm bsp-layout-primary
     modules-center = player-mpris-simple
 
     monitor = ${env:MONITOR_PRIMARY}
@@ -63,7 +63,7 @@
 [bar/portalo-secondary]
     inherit = bar/portalo-base
 
-    modules-left = bspwm bsp-layout-secondary title
+    modules-left = bspwm bsp-layout-secondary
 
     monitor = ${env:MONITOR_SECONDARY}
     tray-position = none