diff --git a/flake.nix b/flake.nix
index f9f8756..8495fe1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,13 @@
 {
     inputs = {
         nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
-        nixpkgs-wayland  = { 
-            url = "github:nix-community/nixpkgs-wayland"; 
+# For Wayfire #
+#        nixpkgs-wayland  = { 
+#            url = "github:nix-community/nixpkgs-wayland"; 
+#            inputs.nixpkgs.follows = "nixpkgs";
+#        };
+        home-manager = {
+            url = "github:nix-community/home-manager/release-22.11";
             inputs.nixpkgs.follows = "nixpkgs";
         };
         nixos-generators = {
@@ -10,7 +15,7 @@
             inputs.nixpkgs.follows = "nixpkgs";
         };
     };
-    outputs = { self, nixos-generators, nixpkgs, ... }@inputs:
+    outputs = { self, home-manager, nixos-generators, nixpkgs, ... }@inputs:
     {
         proxmox = nixos-generators.nixosGenerate {
             system = "x86_64-linux";
@@ -25,15 +30,19 @@
                 modules = [
                     ./hosts/creatorforge.nix
                     ./.modules/base/proxmox-vm-hardware.nix
-                    ({pkgs, config, ...}:{
-                        config = {
-                            environment.systemPackages = with pkgs; [
-                                inputs.nixpkgs-wayland.packages.${system}.wayfire-unstable
-                            ];
-                        };
-                    })
                 ];
             };
         };
+        homeManagerConfiguration = {
+            speccon18 = {
+                username = "speccon18";
+                homeDirectory = "/home/speccon18";
+                configuration = {
+                    imports = [
+                        ./.hm-modules/home-manager.nix
+                    ];
+                };
+            };
+        };
     };
 }
\ No newline at end of file
diff --git a/hosts/creatorforge.nix b/hosts/creatorforge.nix
index 8fa50d0..51af798 100644
--- a/hosts/creatorforge.nix
+++ b/hosts/creatorforge.nix
@@ -38,6 +38,8 @@
       tailscale
       firefox
       vscodium-fhs
+      alacritty
+      starship
       # Gnome Extensions
       gnomeExtensions.dock-from-dash
       gnomeExtensions.pop-shell