Update login and lock screens

Remove sddm/xserver to use greetd everywhere
Currently launching Hyprland directly and starting with lockscreen

Replace swaylock with gtklock for more consistency

Makefile

@@ -2,8 +2,6 @@
 
 test:
 	sudo nixos-rebuild test --flake .
-	-hyprctl reload
-	-pkill -HUP kanshi
 
 build:
 	sudo nixos-rebuild build --flake .

home/hyprland/config.nix

@@ -95,7 +95,7 @@ in ''
   }
 
   # See https://wiki.hyprland.org/Configuring/Keywords/ for more
-  bind = SUPER, F1, exec, swaylock
+  bind = SUPER, F1, exec, ${pkgs.gtklock}/bin/gtklock
   bind = SUPER, M, fullscreen, 0
   bind = SUPER, P, exec, pkill rofi || rofi-pass
   bind = SUPER, X, exec, swaync-client -t
@@ -254,4 +254,5 @@ in ''
   exec-once = ${pkgs.protonmail-bridge}/bin/protonmail-bridge -n
   exec-once = ${pkgs.dex}/bin/dex --autostart
   exec-once = kidex
+  exec-once = ${pkgs.gtklock}/bin/gtklock
 ''

home/hyprland/default.nix

@@ -7,12 +7,9 @@
     ./swaync/default.nix
     ./rofi/default.nix
     ./anyrun.nix
-    ./swaylock.nix
     ./gtk.nix
   ];
   home.packages = with pkgs; [
-    libsForQt5.polkit-kde-agent
-    mc
     signal-desktop
     ferdium
     libreoffice

system/desktop.nix

@@ -3,6 +3,7 @@
 {
   environment.systemPackages = with pkgs;
     with libsForQt5.qt5; [
+      gtklock
       dex
       mesa
       libnotify
@@ -11,18 +12,21 @@
       qtgraphicaleffects
       qtsvg
       qtquickcontrols2
-      catppuccin-sddm-corners
       protonvpn-cli
       protonvpn-gui
       qbittorrent
     ];
-  security.rtkit.enable = true;
+  security = {
+    rtkit.enable = true;
+    pam.services.gtklock = { };
+  };
   sound.enable = true;
   hardware = {
     pulseaudio.enable = false;
     bluetooth.enable = true;
   };
   services = {
+    greetd.enable = true;
     pipewire = {
       enable = true;
       alsa.enable = true;
@@ -30,15 +34,8 @@
       pulse.enable = true;
     };
     xserver = {
-      enable = true;
       layout = "gb";
       xkbVariant = "";
-      displayManager.sddm = {
-        enable = true;
-        theme = "catppuccin-sddm-corners";
-        autoNumlock = true;
-        settings = { General = { InputMethod = ""; }; };
-      };
     };
   };
   console.keyMap = "uk";

system/gamescope.nix

@@ -1,27 +1,17 @@
-{ config, lib, pkgs, user ? "xenia", ... }:
-let
-  sessionCommand = ''
-    gamescope\
-      --nested-refresh 60\
-      --scaler auto --filter fsr --fsr-sharpness 10\
-      --hide-cursor-delay 5 --steam -- steam -gamepadui
-  '';
-in {
+{ config, lib, pkgs, user, ... }:
+
+{
   imports = [ ./desktop.nix ./steam.nix ];
-  services = {
-    blueman.enable = true;
-    greetd = {
-      enable = true;
-      settings = {
-        default_session = {
-          inherit user;
-          command = sessionCommand;
-        };
-        initial_session = {
-          inherit user;
-          command = sessionCommand;
-        };
-      };
+  services.greetd.settings = rec {
+    default_session.command = ''
+      gamescope\
+        --nested-refresh 60\
+        --scaler auto --filter fsr --fsr-sharpness 10\
+        --hide-cursor-delay 5 --steam -- steam -gamepadui
+    '';
+    initial_session = {
+      inherit user;
+      inherit (default_session) command;
     };
   };
 }

system/hyprland.nix

@@ -1,4 +1,4 @@
-{ pkgs, user ? "xenia", ... }:
+{ config, lib, pkgs, user, ... }:
 
 {
   imports = [ ./desktop.nix ];
@@ -26,12 +26,17 @@
     playerctl
     brightnessctl
   ];
-  security.pam.services.swaylock = { };
   services = {
     blueman.enable = true;
     gvfs.enable = true;
     tumbler.enable = true;
-    xserver.displayManager.defaultSession = "hyprland";
+    greetd.settings = rec {
+      default_session.command = "Hyprland";
+      initial_session = {
+        inherit user;
+        inherit (default_session) command;
+      };
+    };
   };
   fonts = {
     packages = with pkgs; [