xserver.nix is now desktop.nix; WM's can now be added/removed through machine options. Added sway and some fonts.

services/desktop/i3.nix

@@ -0,0 +1,16 @@
+{ pkgs }:
+
+#with lib;
+
+#mkIf (elem "i3" cfg.xserver.wms) {
+#    i3 =
+{
+        enable = true;
+        configFile = ../../config/etc/i3/config;
+        extraPackages = with pkgs; [ 
+          dmenu
+          file
+          i3lock
+          i3status
+        ];
+}

services/desktop/sway.nix

@@ -0,0 +1,29 @@
+{ pkgs }:
+
+{
+    enable = true;
+    extraPackages = with pkgs; [
+      xwayland
+      file i3status dmenu
+      qt5.qtwayland
+      grim slurp
+      swaylock
+      swayidle
+      light
+      mako
+      wl-clipboard
+      wf-recorder
+    ];
+    extraSessionCommands = ''
+      export GDK_BACKEND=wayland
+      export CLUTTER_BACKEND=wayland
+      export SDL_VIDEODRIVER=wayland
+      # needs qt5.qtwayland in systemPackages
+      export QT_QPA_PLATFORM=wayland-egl
+      export QT_WAYLAND_FORCE_DPI=physical
+      export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+      # Fix for some Java AWT applications (e.g. Android Studio),
+      # use this if they aren't displayed properly:
+      export _JAVA_AWT_WM_NONREPARENTING=1
+    '';
+  }