More server changes and generalization of the waybar

modules/system/services/general/displaymanager/default.nix

@@ -1,34 +1,36 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 {
-  services.greetd = {
-    enable = config.system.desktop.enable;
-    restart = true;
-    settings = {
-      terminal = {
-        vt = 2;
-        switch = true;
+  config = lib.mkIf config.system.desktop.enable {
+    services.greetd = {
+      enable = true;
+      restart = true;
+      settings = {
+        terminal = {
+          vt = 2;
+          switch = true;
+        };
+        default_session.command = ''
+          ${pkgs.greetd.tuigreet}/bin/tuigreet --remember --remember-user-session --user-menu --asterisks --sessions /etc/greetd/environments
+        '';
       };
-      default_session.command = ''
-        ${pkgs.greetd.tuigreet}/bin/tuigreet --remember --remember-user-session --user-menu --asterisks --sessions /etc/greetd/environments
+    };
+
+    environment.etc = {
+      "greetd/environments/sway.desktop".text = ''
+        [Desktop Entry]
+        Name=Sway
+        Exec=sway --unsupported-gpu
+      '';
+      "greetd/environments/niri.desktop".text = ''
+        [Desktop Entry]
+        Name=Niri
+        Exec=niri-session
+      '';
+      "greetd/environments/hyprland.desktop".text = ''
+        [Desktop Entry]
+        Name=Hyprland
+        Exec=Hyprland
       '';
     };
   };
-
-  environment.etc = {
-    "greetd/environments/sway.desktop".text = ''
-      [Desktop Entry]
-      Name=Sway
-      Exec=sway --unsupported-gpu
-    '';
-    "greetd/environments/niri.desktop".text = ''
-      [Desktop Entry]
-      Name=Niri
-      Exec=niri-session
-    '';
-    "greetd/environments/hyprland.desktop".text = ''
-      [Desktop Entry]
-      Name=Hyprland
-      Exec=Hyprland
-    '';
-  };
 }

modules/system/services/general/gvfs/default.nix

@@ -1,7 +1,7 @@
-{ config, ... }:
+{ config, lib, ... }:
 {
-  services = {
-    gvfs.enable = config.system.desktop.enable;
-    udisks2.enable = config.system.desktop.enable;
+  services = lib.mkIf config.system.desktop.enable {
+    gvfs.enable = true;
+    udisks2.enable = true;
   };
 }

modules/system/services/general/portals/default.nix

@@ -1,17 +1,19 @@
 { config, pkgs, lib, ... }:
 {
-  xdg.portal = {
-    wlr = {
-      enable = lib.mkForce config.system.desktop.enable;
-      settings.screencast = {
-        max_fps = 60;
-        chooser_type = "simple";
-        chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or -B 00000066 -b 00000099";
+  config = lib.mkIf config.system.desktop.enable {
+    xdg.portal = {
+      wlr = {
+        enable = lib.mkForce true;
+        settings.screencast = {
+          max_fps = 60;
+          chooser_type = "simple";
+          chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or -B 00000066 -b 00000099";
+        };
       };
+      extraPortals = with pkgs; [
+        xdg-desktop-portal-gnome
+        xdg-desktop-portal-hyprland
+      ];
     };
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-gnome
-      xdg-desktop-portal-hyprland
-    ];
   };
 }

modules/system/services/general/tlp/default.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 {
   services.tlp.enable = true;
 }