diff --git a/provision/nixos/hosts/bulwark/configuration.nix b/provision/nixos/hosts/bulwark/configuration.nix
index f585f117..51eaf5b1 100644
--- a/provision/nixos/hosts/bulwark/configuration.nix
+++ b/provision/nixos/hosts/bulwark/configuration.nix
@@ -1,5 +1,9 @@
 { config, lib, pkgs, pkgs-unstable, user, ... }:
 {
+  imports = [
+    ./steam-deck.nix
+  ];
+
   nix = {
     package = pkgs.nixFlakes;
     extraOptions = "experimental-features = nix-command flakes";
@@ -118,7 +122,6 @@
     };
     gaming = {
       steam.enable = true;
-      steam-deck.enable = true;
     };
   };
   
diff --git a/provision/nixos/modules/gaming/steam-deck.nix b/provision/nixos/hosts/bulwark/steam-deck.nix
similarity index 50%
rename from provision/nixos/modules/gaming/steam-deck.nix
rename to provision/nixos/hosts/bulwark/steam-deck.nix
index b81f69d6..cc937c1c 100644
--- a/provision/nixos/modules/gaming/steam-deck.nix
+++ b/provision/nixos/hosts/bulwark/steam-deck.nix
@@ -1,14 +1,9 @@
 { config, lib, pkgs, pkgs-unstable, user, jovian-nixos, home-manager, ... }:
-
-let
-  cfg = config.modules.gaming.steam-deck;
-in {
+{
   imports = [
     (jovian-nixos + "/modules")
     home-manager.nixosModule
   ];
-  options.modules.gaming.steam-deck.enable = lib.mkEnableOption "steam-deck";
-  config = lib.mkIf cfg.enable {
 
     jovian = {
       steam.desktopSession = "gnome-xorg";
@@ -20,10 +15,6 @@ in {
       };
     };
 
-    #services.xserver.displayManager.gdm.wayland = lib.mkForce true; # lib.mkForce is only required on my setup because I'm using some other NixOS configs that conflict with this value
-    #services.xserver.displayManager.defaultSession = "steam-wayland";
-    #services.xserver.displayManager.autoLogin.enable = true;
-    #services.xserver.displayManager.autoLogin.user = "${user}";
     services.xserver.enable = true;
     services.xserver.displayManager.gdm.enable = false;
     services.xserver.desktopManager.gnome.enable = true;
@@ -31,60 +22,6 @@ in {
     # Enable GNOME
     sound.enable = true;
     hardware.pulseaudio.enable = lib.mkForce false;
-	
-    # Create user
-    users.users.${user} = {
-      isNormalUser = true;
-    };
-
-    #systemd.services.gamescope-switcher = {
-    #  wantedBy = [ "graphical.target" ];
-    #  serviceConfig = {
-    #    User = 1000;
-    #    PAMName = "login";
-    #    WorkingDirectory = "~";
-
-    #    TTYPath = "/dev/tty7";
-    #    TTYReset = "yes";
-    #    TTYVHangup = "yes";
-    #    TTYVTDisallocate = "yes";
-
-    #    StandardInput = "tty-fail";
-    #    StandardOutput = "journal";
-    #    StandardError = "journal";
-
-    #    UtmpIdentifier = "tty7";
-    #    UtmpMode = "user";
-
-    #    Restart = "always";
-    #  };
-
-    #  script = ''
-    #    set-session () {
-    #      mkdir -p ~/.local/state
-    #      >~/.local/state/steamos-session-select echo "$1"
-    #    }
-    #    consume-session () {
-    #      if [[ -e ~/.local/state/steamos-session-select ]]; then
-    #        cat ~/.local/state/steamos-session-select
-    #        rm ~/.local/state/steamos-session-select
-    #      else58 closure
-    #        echo "gamescope"
-    #      fi
-    #    }
-    #    while :; do
-    #      session=$(consume-session)
-    #      case "$session" in
-    #        plasma)
-    #          dbus-run-session -- gnome-shell --display-server --wayland
-    #          ;;
-    #        gamescope)
-    #          steam-session
-    #          ;;
-    #      esac
-    #    done
-    #  '';
-    #};
 
     environment.systemPackages = with pkgs; [
       gnome.gnome-terminal
diff --git a/provision/nixos/hosts/kestrel/configuration.nix b/provision/nixos/hosts/kestrel/configuration.nix
index ffa86878..d35267bd 100644
--- a/provision/nixos/hosts/kestrel/configuration.nix
+++ b/provision/nixos/hosts/kestrel/configuration.nix
@@ -129,6 +129,6 @@
       sway.enable = true;
     };
   };
-  
+
   system.stateVersion = "23.05"; # Did you read the comment?
 }
diff --git a/provision/nixos/hosts/kestrel/home-configuration.nix b/provision/nixos/hosts/kestrel/home-configuration.nix
index d8ba8502..39f0af52 100644
--- a/provision/nixos/hosts/kestrel/home-configuration.nix
+++ b/provision/nixos/hosts/kestrel/home-configuration.nix
@@ -5,11 +5,11 @@
   programs.home-manager.enable = true;
 
   # Setup git
-  #programs.git = {
-  #    enable = true;
-  #    userName = "starr-dusT";
-  #    userEmail = "starrtyler88@gmail.com"
-  #};
+  programs.git = {
+      enable = true;
+      userName = "starr-dusT";
+      userEmail = "starrtyler88@gmail.com";
+  };
 
   home.packages = with pkgs; [
     chezmoi
diff --git a/provision/nixos/modules/gaming/default.nix b/provision/nixos/modules/gaming/default.nix
index cb30367e..11482080 100644
--- a/provision/nixos/modules/gaming/default.nix
+++ b/provision/nixos/modules/gaming/default.nix
@@ -1,4 +1,4 @@
 { ... }:
 {
-  imports = [ ./steam.nix ./steam-deck.nix ];
+  imports = [ ./steam.nix ];
 }