diff --git a/machines/common/linux/greeter.nix b/machines/common/linux/greeter.nix
index 2c7df95..474fc92 100644
--- a/machines/common/linux/greeter.nix
+++ b/machines/common/linux/greeter.nix
@@ -4,6 +4,15 @@
   pkgs,
   ...
 }: let
+  catppuccin-gtk = pkgs.catppuccin-gtk.overrideAttrs (final: rec {
+    version = "0.6.0";
+    src = pkgs.fetchFromGitHub {
+      owner = "catppuccin";
+      repo = "gtk";
+      rev = "v${version}";
+      sha256 = "sha256-3HplAmlj8hK9Myy8mgvR88sMa2COmYAU75Fk1JuKtMc=";
+    };
+  });
   greetdConfig = pkgs.writeText "greetd-config" ''
     output "*" {
       scale 2
@@ -62,35 +71,26 @@ in {
       };
     };
   };
-  environment.systemPackages = with pkgs; let
-    gtk = pkgs.catppuccin-gtk.overrideAttrs (final: rec {
-      version = "0.6.0";
-      src = pkgs.fetchFromGitHub {
-        owner = "catppuccin";
-        repo = "gtk";
-        rev = "v${version}";
-        sha256 = "sha256-3HplAmlj8hK9Myy8mgvR88sMa2COmYAU75Fk1JuKtMc=";
-      };
-    });
-  in [
-    (gtk.override {
+  environment.systemPackages = with pkgs; [
+    (catppuccin-gtk.override {
       accents = ["pink"];
       variant = "mocha";
       size = "compact";
     })
-    (gtk.override {
+    (catppuccin-gtk.override {
       accents = ["pink"];
       variant = "latte";
       size = "compact";
     })
-    (pkgs.nur.repos.nekowinston.papirus-folders-catppuccin.override {
-      flavour = "mocha";
+    (catppuccin-papirus-folders.override {
+      flavor = "mocha";
       accent = "pink";
     })
-    (pkgs.nur.repos.nekowinston.papirus-folders-catppuccin.override {
-      flavour = "latte";
+    (catppuccin-papirus-folders.override {
+      flavor = "latte";
       accent = "pink";
     })
     numix-cursor-theme
+    # nur.repos.nekowinston.posy-improved-cursor
   ];
 }