nixos76: fixes for laptop

config/hosts/nixos76/default.nix

@@ -153,7 +153,7 @@
 
   # Syncthing
   services = {
-    syncthing = {
+    syncthing = lib.mkForce {
       enable = true;
       user = "alex";
       dataDir = "/home/alex/Sync";

config/modules/bspwm/bspwm.nix

@@ -1,6 +1,12 @@
 { pkgs, ... }:
 {
-  xsession.windowManager.bspwm = let theme = import ../theme.nix "light"; in {
+  xsession.windowManager.bspwm =
+    let
+      theme = import ../theme.nix "light";
+      primaryMonitor = "eDP-1"; # = "DP-2" for thelio
+      windowGap = 2; # = "theme.sizing.xl" for thelio
+    in
+    {
       enable = true;
       settings = {
         normal_border_color = theme.colors.disabled;
@@ -8,14 +14,14 @@
         focused_border_color = theme.colors.primary;
 
         border_width = theme.sizing.m;
-      window_gap = theme.sizing.xl;
+        window_gap = windowGap;
 
         focus_follows_pointer = true;
         single_monocle = true;
         honor_size_hints = true;
       };
       extraConfig = ''
-      bspc monitor DP-2 -d I II III IV V
+        bspc monitor ${primaryMonitor} -d I II III IV V
         bspc monitor HDMI-1 -d VI VII VIII IX X
 
         # Set mouse 1 to move floating windows:

config/modules/bspwm/polybar.nix

@@ -7,6 +7,7 @@
       let
         theme = import ../theme.nix "light";
         colors = theme.colors;
+        primaryMonitor = "eDP-1"; # = "DP-2" for thelio
       in
       rec {
         common-bar = {
@@ -53,9 +54,9 @@
         };
 
         "bar/primary" = lib.recursiveUpdate common-bar {
-          monitor = "DP-2";
+          monitor = primaryMonitor;
           modules-left = "xworkspaces xwindow";
-          modules-right = "filesystem memory cpu wlan date";
+          modules-right = "filesystem memory cpu wlan systray date";
         };
 
         "bar/secondary" = lib.recursiveUpdate common-bar {