Modularize desktop service and remove desktop.wms from machine opts.

services/desktop/i3.nix

@@ -1,17 +1,21 @@
-{ pkgs }:
+{ config, lib, pkgs, ... }:
 
-#with lib;
+with lib;
 
-#mkIf (elem "i3" cfg.xserver.wms) {
-#    i3 =
-{
-        enable = true;
-        configFile =  (import ../../config/etc/i3/config.nix { inherit pkgs; });
-        extraPackages = with pkgs; [
-          dmenu
-          file
-          i3lock
-          i3status
-          xdg-user-dirs
-        ];
+mkIf (elem "desktop::i3" config.machine.services) {
+  services.xserver = {
+    enable = true;
+    windowManager.i3 = {
+      enable = true;
+      configFile =  (import ../../config/etc/i3/config.nix { inherit pkgs; });
+      extraPackages = with pkgs; [
+        dmenu
+        file
+        i3lock
+        i3status
+        xdg-user-dirs
+      ];
+    };
+  };
+  machine.pkgsets.python3.pkgs = with pkgs.python310Packages; [ py3status pytz tzlocal ];
 }

services/desktop/sway.nix

@@ -1,6 +1,9 @@
-{ pkgs }:
+{ config, lib, pkgs, ... }:
 
-{
+with lib;
+
+mkIf (elem "desktop::sway" config.machine.services) {
+  programs.sway = {
     enable = true;
     extraPackages = with pkgs; [
       xwayland
@@ -26,4 +29,5 @@
       # use this if they aren't displayed properly:
       export _JAVA_AWT_WM_NONREPARENTING=1
     '';
-  }
+  };
+}