From e1e8f5636715b034c68139ca58d53dad66f1e9e6 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 17 Sep 2023 17:57:24 +0100
Subject: [PATCH] Switch to using sddm for hyprland

Add catppuccin-corners theme
---
 system/desktop.nix  |  7 +++++++
 system/hyprland.nix | 15 +++------------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/system/desktop.nix b/system/desktop.nix
index 5c4423a1..aca83c40 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -6,6 +6,7 @@
     libnotify
     glib
     gsettings-desktop-schemas
+    catppuccin-sddm-corners
   ];
   security.rtkit.enable = true;
   sound.enable = true;
@@ -21,8 +22,14 @@
       pulse.enable = true;
     };
     xserver = {
+      enable = true;
       layout = "gb";
       xkbVariant = "";
+      displayManager.sddm = {
+        enable = true;
+        theme = "catppuccin";
+        settings = { General = { InputMethod = ""; }; };
+      };
     };
   };
   console.keyMap = "uk";
diff --git a/system/hyprland.nix b/system/hyprland.nix
index 580ee1e9..9b8f6011 100644
--- a/system/hyprland.nix
+++ b/system/hyprland.nix
@@ -22,18 +22,9 @@
     blueman.enable = true;
     gvfs.enable = true;
     tumbler.enable = true;
-    greetd = {
-      enable = true;
-      settings = {
-        default_session = {
-          inherit user;
-          command = "Hyprland";
-        };
-        initial_session = {
-          inherit user;
-          command = "Hyprland";
-        };
-      };
+    xserver.displayManager = {
+      sessionPackages = [ hyprland.packages.${pkgs.system}.hyprland ];
+      defaultSession = "hyprland";
     };
   };
   fonts = {