Massively simplify Waybar, remove unused remote desktop profile, other things I'm sure

hosts/jupiter/user/default.nix

@@ -4,7 +4,6 @@
     desktop.enable = true;
     gaming.enable = true;
     production.enable = true;
-    remote-desktop.enable = true;
     school.enable = true;
     enableNixpkgsReleaseCheck = false;
     stateVersion = lib.mkForce config.system.stateVersion;

hosts/redmond/user/default.nix

@@ -2,7 +2,6 @@
 {
   home-manager.users."${config.sysusers.main}".home = {
     desktop.enable = true;
-    remote-desktop.enable = true;
     stateVersion = lib.mkForce config.system.stateVersion;
   };
 }

modules/home/default.nix

@@ -14,7 +14,6 @@
     desktop.enable = mkEnableOption "Desktop programs and services";
     gaming.enable = mkEnableOption "Gaming apps and programs";
     production.enable = mkEnableOption "Apps for visual productivity";
-    remote-desktop.enable = mkEnableOption "Apps for remote desktop";
     school.enable = mkEnableOption "Apps for school and college";
   };
 

modules/home/programs/gui/default.nix

@@ -9,7 +9,6 @@
     ./mpv
     ./obs
     ./pcmanfm
-    ./rofi
     ./thunderbird
   ];
 }

modules/home/programs/gui/mpv/default.nix

@@ -8,9 +8,9 @@
       thumbnail
     ];
     config = {
-      volume = 60;
       loop-playlist = "inf";
       osc = "no";
+      volume = 60;
     };
   };
 }

modules/home/programs/gui/pcmanfm/default.nix

@@ -6,7 +6,8 @@
       file-roller
     ];
     xdg.configFile = {
-      "pcmanfm/default/pcmanfm.conf".text = ''
+      "pcmanfm/default/pcmanfm.conf" = {
+        text = ''
           [config]
           bm_open_method=0
           
@@ -34,8 +35,11 @@
           show_statusbar=1
           pathbar_mode_buttons=0
         '';
+        force = true;
+      };
 
-      "libfm/libfm.conf".text = ''
+      "libfm/libfm.conf" = {
+        text = ''
           [config]
           single_click=0
           use_trash=1
@@ -79,6 +83,8 @@
           places_network=0
           places_unmounted=1
         '';
+        force = true;
+      };
     };
   };
 }

modules/home/programs/misc/default.nix

@@ -6,7 +6,6 @@
     ./general
     ./headless
     ./production
-    ./remote-desktop
     ./school
   ];
 }

modules/home/programs/misc/remote-desktop/default.nix

@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  home.packages = with pkgs; lib.mkIf config.home.remote-desktop.enable [
-    moonlight-qt
-    rustdesk-flutter
-  ];
-}

modules/home/variables/displays/default.nix

@@ -9,6 +9,5 @@
     d2 = "DP-2";
     d3 = "DP-3";
     d4 = "HDMI-A-1";
-    dI = "eDP-1";
   };
 }

modules/home/wms/programs/default.nix

@@ -3,6 +3,7 @@
   imports = [
     ./kanshi
     ./mako
+    ./rofi
     ./swaylock
     ./waybar
     ./wlpicker

modules/home/wms/programs/waybar/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
   programs.waybar = let
     swayWorkspaceModule = {
@@ -28,7 +28,10 @@
       format-icons = {
         headphone = "󰋋 ";
         headset = "󰋋 ";
-        default = [ " " " " ];
+        default = [
+          " "
+          " "
+        ];
       };
       on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
       on-click-middle = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 100%";
@@ -111,8 +114,14 @@
       format-wifi = "";
       format-disconnected = "󰖪";
       format-linked = "";
-      tooltip-format-ethernet = "{ipaddr}\n{ifname} ";
+      tooltip-format-ethernet = lib.concatStrings [
-      tooltip-format-wifi = "{ipaddr}\n{essid} ({signalStrength}%)";
+        "{ipaddr}\n"
+        "{ifname} "
+      ];
+      tooltip-format-wifi = lib.concatStrings [
+        "{ipaddr}\n"
+        "{essid} ({signalStrength}%)"
+      ];
       tooltip-format-disconnected = "Disconnected";
     };
 
@@ -121,7 +130,10 @@
       format-disabled = "";
       format-no-controller = "";
       tooltip-format-on = "No devices connected.";
-      tooltip-format-connected = "{num_connections} connected\n{device_enumerate}";
+      tooltip-format-connected = lib.concatStrings [
+        "{num_connections} connected\n"
+        "{device_enumerate}"
+      ];
       tooltip-format-enumerate-connected = "{device_alias}";
       tooltip-format-enumerate-connected-battery = "{device_alias} {device_battery_percentage}%";
     };
@@ -190,7 +202,10 @@
     # Laptop modules
     backlightModule = {
       format = "{icon}  {percent}%";
-      format-icons = [ "" "󰖨" ];
+      format-icons = [
+        ""
+        "󰖨"
+      ];
       tooltip = false;
     };
 
@@ -201,133 +216,27 @@
         critical = 15;
       };
       format = "{icon}   {capacity}%";
-      format-icons = [ "" "" "" "" "" ];
+      format-icons = [
+        ""
+        ""
+        ""
+        ""
+        ""
+      ];
     };
   in {
     enable = config.home.desktop.enable;
     settings = {
-      display1 = {
+      displayPrimary = {
         name = "bar1";
         position = "top";
         layer = "top";
         output = [
-          config.displays.d1
-          "VGA-1"
-        ];
-        modules-left = [
-          "sway/workspaces"
-          "sway/window"
-          "niri/workspaces"
-          "niri/window"
-          "hyprland/workspaces"
-          "hyprland/window"
-        ];
-        modules-right = [
-          "pulseaudio"
-          "cpu"
-          "memory"
-          "custom/vram"
-          "custom/clock-long"
-          "gamemode"
-          "sway/scratchpad"
-          "privacy"
-          "tray"
-          "bluetooth"
-          "network"
-        ];
-        "sway/workspaces" = swayWorkspaceModule;
-        "sway/window" = windowModule;
-        "niri/window" = windowModule;
-        "hyprland/window" = windowModule;
-        "pulseaudio" = pulseModule;
-        "cpu" = cpuModule;
-        "memory" = ramModule;
-        "custom/vram" = vramModule;
-        "custom/clock-long" = longClockModule;
-        "gamemode" = gamemodeModule;
-        "privacy" = privacyModule;
-        "sway/scratchpad" = scratchpadModule;
-        "tray" = trayModule;
-        "bluetooth" = bluetoothModule;
-        "network" = networkModule;
-      };
-
-      display2 = {
-        name = "bar2";
-        position = "top";
-        layer = "top";
-        output = [ config.displays.d2 ];
-        modules-left = [
-          "sway/workspaces"
-          "sway/window"
-          "niri/workspaces"
-          "niri/window"
-          "hyprland/workspaces"
-          "hyprland/window"
-        ];
-        modules-right = [
-          "pulseaudio"
-          "mpd"
-          "custom/notifs"
-          "cpu"
-          "memory"
-          "custom/vram"
-          "custom/clock-long"
-        ];
-        "sway/workspaces" = swayWorkspaceModule;
-        "sway/window" = windowModule;
-        "niri/window" = windowModule;
-        "hyprland/window" = windowModule;
-        "pulseaudio" = pulseModule;
-        "mpd" = mpdModule;
-        "custom/notifs" = notificationModule;
-        "cpu" = cpuModule;
-        "memory" = ramModule;
-        "custom/vram" = vramModule;
-        "custom/clock-long" = longClockModule;
-      };
-
-      display3 = {
-        name = "bar3";
-        position = "top";
-        layer = "top";
-        output = [ config.displays.d3 ];
-        modules-left = [
-          "sway/workspaces"
-          "sway/window"
-          "niri/workspaces"
-          "niri/window"
-          "hyprland/workspaces"
-          "hyprland/window"
-        ];
-        modules-right = [
-          "pulseaudio"
-          "custom/weather"
-          "cpu"
-          "memory"
-          "custom/vram"
-          "custom/clock-short"
-        ];
-        "sway/workspaces" = swayWorkspaceModule;
-        "sway/window" = windowModule;
-        "niri/window" = windowModule;
-        "hyprland/window" = windowModule;
-        "pulseaudio" = pulseModule;
-        "custom/weather" = weatherModule;
-        "cpu" = cpuModule;
-        "memory" = ramModule;
-        "custom/vram" = vramModule;
-        "custom/clock-short" = shortClockModule;
-      };
-      displayLap = {
-        name = "laptop";
-        position = "top";
-        layer = "top";
-        output = [
-	  "eDP-1"
-	  "LVDS-1"
 	  "DSI-1"
 	  "HDMI-A-1"
+	  "LVDS-1"
+	  "eDP-1"
+          "DP-1"
 	];
         modules-left = [
           "sway/workspaces"
@@ -350,6 +259,7 @@
           "custom/clock-long"
           "gamemode"
           "sway/scratchpad"
+          "privacy"
           "tray"
           "bluetooth"
           "network"
@@ -369,10 +279,50 @@
         "battery" = batteryModule;
         "custom/clock-long" = longClockModule;
         "sway/scratchpad" = scratchpadModule;
+        "privacy" = privacyModule;
         "tray" = trayModule;
         "bluetooth" = bluetoothModule;
         "network" = networkModule;
       };
+
+      displaySecondary = {
+        name = "bar2";
+        position = "top";
+        layer = "top";
+        output = [
+	  "!DSI-1"
+	  "!HDMI-A-1"
+	  "!LVDS-1"
+	  "!eDP-1"
+          "!DP-1"
+        ];
+        modules-left = [
+          "sway/workspaces"
+          "sway/window"
+          "niri/workspaces"
+          "niri/window"
+          "hyprland/workspaces"
+          "hyprland/window"
+        ];
+        modules-right = [
+          "pulseaudio"
+          "cpu"
+          "memory"
+          "custom/vram"
+          "custom/clock-long"
+        ];
+        "sway/workspaces" = swayWorkspaceModule;
+        "sway/window" = windowModule;
+        "niri/window" = windowModule;
+        "hyprland/window" = windowModule;
+        "pulseaudio" = pulseModule;
+        "mpd" = mpdModule;
+        "custom/notifs" = notificationModule;
+        "cpu" = cpuModule;
+        "memory" = ramModule;
+        "custom/vram" = vramModule;
+        "custom/clock-long" = longClockModule;
+      };
     };
 
     style = ''