Several hyprland updates:

plugins, new cursor, light/dark themes, new app launcher, ...

hosts/common/features/display/default.nix

@@ -2,7 +2,6 @@
 {
   imports = [
     ./wayland.nix
-    ./x11.nix
-    ./gdm.nix
+    ./sddm.nix
   ];
 }

hosts/common/features/display/sddm.nix

@@ -0,0 +1,31 @@
+{ inputs, pkgs, ... }:
+let
+  sddm-astronaut-theme = pkgs.callPackage ../../../../pkgs/sddm-astronaut-theme/package.nix { };
+in
+{
+  services.xserver = {
+    enable = true;
+    displayManager = {
+      startx.enable = true;
+    };
+    autoRepeatDelay = 250;
+    autoRepeatInterval = 30;
+  };
+
+  services.displayManager.sddm = {
+    enable = true;
+    wayland.enable = true;
+    theme = "sddm-astronaut-theme";
+    package = pkgs.kdePackages.sddm;
+    extraPackages = with pkgs.kdePackages; [
+      qtmultimedia
+      qtsvg
+      qtvirtualkeyboard
+      qt5compat
+    ];
+  };
+
+  environment.systemPackages = with pkgs; [
+    sddm-astronaut-theme
+  ];
+}

hosts/common/features/display/wayland.nix

@@ -2,24 +2,26 @@
 {
   environment.systemPackages = with pkgs; [
     wl-clipboard
-    hyprland
   ];
 
-  services.displayManager.sessionPackages = with pkgs; [
-    hyprland
-  ];
+  programs.hyprland = {
+    enable = true;
+    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+    portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+  };
 
-  # thumbnail support for images
-  services.tumbler.enable = true;
+  # GTK/GNOME services still useful on Wayland
+  programs.dconf.enable = true;
 
-  environment.etc."xdg/wayland-sessions/hyprland.desktop".text = ''
-    [Desktop Entry]
-    Name=Hyprland
-    Comment=Hyprland Wayland Compositor
-    Exec=Hyprland
-    Type=Application
-    DesktopNames=Hyprland
-  '';
+  services = {
+    # thumbnail support for images
+    tumbler.enable = true;
+
+    gnome = {
+      glib-networking.enable = true;
+      gnome-keyring.enable = true;
+    };
+  };
 
   nix.settings = {
     substituters = [ "https://hyprland.cachix.org" ];

hosts/common/features/display/x11.nix

@@ -1,54 +0,0 @@
-{ inputs, pkgs, ... }:
-{
-
-  services = {
-    desktopManager = {
-      gnome.enable = true;
-    };
-    xserver = {
-      windowManager.i3.enable = true;
-      xkb.options = "ctrl:nocaps";
-    };
-    sysprof.enable = true;
-    gnome = {
-      glib-networking.enable = true;
-      gnome-keyring.enable = true;
-      gnome-online-accounts.enable = true;
-    };
-  };
-
-  programs = {
-    i3lock.enable = true;
-    dconf.enable = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-    xclip
-  ];
-
-  environment.gnome.excludePackages =
-    (with pkgs; [
-      gnome-photos
-      gnome-tour
-      gnome-console
-      gnome-text-editor
-      gedit
-    ])
-    ++ (with pkgs; [
-      cheese # webcam tool
-      gnome-music
-      gnome-terminal
-      epiphany # web browser
-      geary # email reader
-      evince # document viewer
-      totem # video player
-      tali # poker game
-      iagno # go game
-      hitori # sudoku game
-      atomix # puzzle game
-      gnome-contacts
-      gnome-initial-setup
-      gnome-shell-extensions
-    ]);
-
-}

hosts/common/global/default.nix

@@ -39,5 +39,4 @@
   };
 
   services.dbus.packages = with pkgs; [ gcr ];
-  services.geoclue2.enable = true;
 }

hosts/desktop/default.nix

@@ -44,7 +44,11 @@
     TOP='DP-0'
     RIGHT='DP-2'
 
-    ${pkgs.xorg.xrandr}/bin/xrandr --output $BOTTOM --primary --mode 3840x2160 --pos 0x0 --rotate normal --output $TOP --mode 3840x2160 --above $BOTTOM --rotate normal --output $RIGHT --mode 3840x2160 --pos 3840x-1680 --rotate left
+    # Match Hyprland layout: TOP at 0x0, BOTTOM at 0x2160, RIGHT at 3840x180
+    ${pkgs.xorg.xrandr}/bin/xrandr \
+      --output $TOP --mode 3840x2160 --pos 0x0 --rotate normal \
+      --output $BOTTOM --primary --mode 3840x2160 --pos 0x2160 --rotate normal \
+      --output $RIGHT --mode 3840x2160 --pos 3840x180 --rotate left
     ${pkgs.xorg.xrandr}/bin/xrandr --dpi 160
   '';