diff --git a/.gitmodules b/.gitmodules
index ad019b7..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "leon"]
-	path = leon
-	url = git@git.libre.moe:leon/home-manager.git
-	branch = main
diff --git a/configuration.nix b/configuration.nix
index 78c1046..fe5d689 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -148,7 +148,7 @@ services.displayManager.sddm =
 	enable = true;
 	autoNumlock = true; # Enable NumLock at login
 	wayland.enable = true;
-	#theme = "catppuccin-mocha";
+	theme = "catppuccin-mocha";
 	package = pkgs.kdePackages.sddm;
 };
 
@@ -247,9 +247,6 @@ systemd.tmpfiles.rules = [
 	shell = pkgs.zsh;
   };
 
-  home-manager.useUserPackages = true;
-  home-manager.useGlobalPkgs = true;
-
 # Font Config
 fonts =  {
 	enableDefaultPackages = true;
@@ -310,6 +307,14 @@ environment.etc.crypttab = {
 		home-manager								# Nix's Home-Manager
 		egl-wayland									# NVIDIA compat
 		nvidia-vaapi-driver							# NVIDIA compat
+		catppuccin-cursors.mochaDark # Catppuccin Mouse Cursors
+		(catppuccin-sddm.override {
+      		flavor = "mocha";
+      		font  = "Fira Sans";
+      		fontSize = "9";
+      		#backgroundbin = "$XDG_PICTURES_DIR/Wallpapers/current";
+      		loginBackground = true;
+      		})
 	];
 	
 	programs = {
diff --git a/flake.lock b/flake.lock
index c33e3c8..8e0d0cd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -74,26 +74,6 @@
         "type": "github"
       }
     },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1732482255,
-        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
@@ -180,7 +160,6 @@
     },
     "root": {
       "inputs": {
-        "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
         "nixpkgs": "nixpkgs"
       }
diff --git a/flake.nix b/flake.nix
index d172c4a..b2af994 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,8 +3,6 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     lanzaboote = {
       url = "github:nix-community/lanzaboote";
 
@@ -13,7 +11,7 @@
     };
   };
 
-  outputs = inputs@{ nixpkgs, home-manager, lanzaboote, ... }: {
+  outputs = inputs@{ nixpkgs, lanzaboote, ... }: {
     nixosConfigurations = {
       Zuse1 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -38,15 +36,6 @@
               pkiBundle = "/etc/secureboot";
             };
           })
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.leon = import ./leon/home.nix;
-
-            # Optionally, use home-manager.extraSpecialArgs to pass
-            # arguments to home.nix
-          }
         ];
       };
     };
diff --git a/leon b/leon
deleted file mode 160000
index 8adfd3a..0000000
--- a/leon
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8adfd3a36b347e6ab54a29ec1584281856d8679f