Merge X stuff with hyprland

I would love to commit to hyprland and not use any other Wayland
compositor (at least until something better comes up). For this reason,
this commit assumes that X-specific settings are exclusive to hyprland.

desktop/default.nix

@@ -15,10 +15,7 @@
     ./swaylock
     ./udiskie
     ./waybar
-    ./xcursor
     ./xdg-user-dirs
-    ./xresources
-    ./xserver
   ];
 
   environment.systemPackages = with pkgs; [

desktop/hyprland/default.nix

@@ -1,6 +1,14 @@
+{ pkgs, ... }:
+
 {
   programs.hyprland.enable = true;
 
+  services.xserver = {
+    enable = true;
+    displayManager.lightdm.enable = false;
+    excludePackages = [ pkgs.xterm ];
+  };
+
   home-manager.sharedModules = [{
     xdg.configFile."hypr/hyprland.conf".text = ''
       env=XCURSOR_SIZE,24
@@ -188,5 +196,20 @@
     '';
     xdg.configFile."hypr/swapmaster.sh".source = ./swapmaster.sh;
     xdg.configFile."hypr/tags.sh".source = ./tags.sh;
+
+    home.file.".icons/default/index.theme".text = ''
+      [icon theme]
+      Inherits=phinger-cursors
+    '';
+
+    xresources.properties = {
+      "Xft.hinting" = true;
+      "Xft.antialias" = true;
+      "Xft.autohint" = false;
+      "Xft.lcdfilter" = "lcddefault";
+      "Xft.hintstyle" = "hintfull";
+      "Xft.rgba" = "rgb";
+    };
+
   }];
 }

desktop/xcursor/default.nix

@@ -1,8 +0,0 @@
-{
-  home-manager.sharedModules = [{
-    home.file.".icons/default/index.theme".text = ''
-      [icon theme]
-      Inherits=phinger-cursors
-    '';
-  }];
-}

desktop/xresources/default.nix

@@ -1,12 +0,0 @@
-{
-  home-manager.sharedModules = [{
-    xresources.properties = {
-      "Xft.hinting" = true;
-      "Xft.antialias" = true;
-      "Xft.autohint" = false;
-      "Xft.lcdfilter" = "lcddefault";
-      "Xft.hintstyle" = "hintfull";
-      "Xft.rgba" = "rgb";
-    };
-  }];
-}

desktop/xserver/default.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-
-{
-  services.xserver = {
-    enable = true;
-    displayManager.lightdm.enable = false;
-    excludePackages = [ pkgs.xterm ];
-  };
-}