diff --git a/hosts/Vanguard/configuration.nix b/hosts/Vanguard/configuration.nix
index 5307c81a..afb6132c 100644
--- a/hosts/Vanguard/configuration.nix
+++ b/hosts/Vanguard/configuration.nix
@@ -5,7 +5,7 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../hyprland.nix
+    ../gamescope.nix
   ];
 
   # Bootloader.
diff --git a/hosts/Vanguard/home.nix b/hosts/Vanguard/home.nix
index 3714aba6..d99bae28 100644
--- a/hosts/Vanguard/home.nix
+++ b/hosts/Vanguard/home.nix
@@ -1,18 +1,16 @@
 { user, shellConfig, ... }:
 let homeDirectory = "/home/${user}";
 in {
-  imports = [ shellConfig ../../home ];
+  imports = [
+    shellConfig
+    ../../home/git
+    ../../home/ssh
+    ../../home/tui
+  ];
   home = {
     inherit homeDirectory;
     username = user;
     stateVersion = "22.11";
   };
   programs.home-manager.enable = true;
-  xdg.configFile."hypr/extra.conf".text = ''
-    misc {
-      vrr = 2
-    }
-
-    monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,0x0,1
-  '';
 }
diff --git a/hosts/gamescope.nix b/hosts/gamescope.nix
index cc26093a..fba8aaa9 100644
--- a/hosts/gamescope.nix
+++ b/hosts/gamescope.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, user ? "xenia", ... }:
 let
   sessionCommand = ''
     gamescope\
@@ -11,9 +11,16 @@ in {
   imports = [ ./desktop.nix ];
   services = {
     blueman.enable = true;
+    greetd.enable = true;
     greetd.settings = {
-      default_session.command = sessionCommand;
-      initial_session.command = sessionCommand;
+      default_session = {
+        inherit user;
+        command = sessionCommand;
+      };
+      initial_session = {
+        inherit user;
+        command = sessionCommand;
+      };
     };
   };
   programs = {