From 78f614bd7b03b299ff9d26517a0d72a58b098138 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 15 Oct 2023 09:10:16 +0100
Subject: [PATCH] Disable plymouth, add theming to lightdm

Switch grim+slurp for watershot

Remove xdg-desktop-portal-gtk, use hyprland implementation only
---
 home/hyprland/config.nix |  2 +-
 system/default.nix       |  1 -
 system/desktop.nix       | 15 ++++++++++++++-
 system/hyprland.nix      |  6 +-----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 8f9f082b..b9d45327 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -118,7 +118,7 @@ in ''
   bind = SUPER ALT, G, exec, [workspace 9] steam
 
   # Misc useful binds
-  bind=,Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"
+  bind=,Print,exec,watershot
   bind=,XF86Calculator,exec,pkill anyrun || anyrun
 
   # Sound
diff --git a/system/default.nix b/system/default.nix
index 3f33d0dd..fa2e19b3 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -25,7 +25,6 @@ in {
       "steam-run"
       "nomachine-client"
     ];
-  boot.plymouth.enable = true;
   networking = {
     networkmanager.enable = true;
     nameservers = [ "9.9.9.9" ];
diff --git a/system/desktop.nix b/system/desktop.nix
index deefc089..897caaef 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -96,7 +96,20 @@
       enable = true;
       layout = "gb";
       xkbVariant = "";
-      displayManager.lightdm.enable = true;
+      displayManager.lightdm = {
+        enable = true;
+        greeters.gtk = {
+          enable = true;
+          cursorTheme = {
+            package = pkgs.catppuccin-cursors.macchiatoLavender;
+            name = "Catppuccin-Macchiato-Lavender-Cursors";
+          };
+          iconTheme = {
+            package = pkgs.papirus-icon-theme;
+            name = "Papirus-Dark";
+          };
+        };
+      };
     };
   };
   programs = {
diff --git a/system/hyprland.nix b/system/hyprland.nix
index 2f6e8906..1c272b51 100644
--- a/system/hyprland.nix
+++ b/system/hyprland.nix
@@ -20,7 +20,6 @@
     wl-clipboard
     watershot.packages.${pkgs.system}.default
     grim
-    slurp
     swayimg
     pamixer
     pavucontrol
@@ -33,10 +32,7 @@
     tumbler.enable = true;
     xserver.displayManager.defaultSession = "hyprland";
   };
-  xdg.portal = {
-    enable = true;
-    extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
-  };
+  xdg.portal.enable = true;
   programs = {
     hyprland = {
       enable = true;