diff --git a/flake.lock b/flake.lock
index 177b17b..619c89e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -779,6 +779,27 @@
         "type": "github"
       }
     },
+    "jovian_2": {
+      "inputs": {
+        "nix-github-actions": "nix-github-actions_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1752755091,
+        "narHash": "sha256-H/k35QJLyQxkFnXR5ckMv/Z+ElNa5f22qNKdyGBMAn4=",
+        "owner": "Jovian-Experiments",
+        "repo": "Jovian-NixOS",
+        "rev": "0d09755fe1df1886e5f07dbb16f7ed373080f86a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Jovian-Experiments",
+        "repo": "Jovian-NixOS",
+        "type": "github"
+      }
+    },
     "matugen": {
       "inputs": {
         "nixpkgs": [
@@ -845,6 +866,28 @@
         "type": "github"
       }
     },
+    "nix-github-actions_2": {
+      "inputs": {
+        "nixpkgs": [
+          "jovian",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729697500,
+        "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
+        "owner": "zhaofengli",
+        "repo": "nix-github-actions",
+        "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "zhaofengli",
+        "ref": "matrix-name",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
     "nixovim": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -1088,6 +1131,7 @@
         "flake-utils": "flake-utils_2",
         "home-manager": "home-manager_2",
         "hyprland": "hyprland",
+        "jovian": "jovian_2",
         "matugen": "matugen",
         "nixovim": "nixovim",
         "nixpkgs": "nixpkgs_4",
diff --git a/flake.nix b/flake.nix
index cd00a82..757ac91 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    jovian = {
+      url = "github:Jovian-Experiments/Jovian-NixOS";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     hyprland.url = "github:hyprwm/Hyprland";
     hyprland.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -80,13 +85,6 @@
             ./hosts/hakase/configuration.nix
           ];
         };
-        steamos = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          specialArgs = mkArgs "x86_64-linux";
-          modules = [
-            ./hosts/steamos/configuration.nix
-          ];
-        };
       };
 
       homeConfigurations = {
diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix
index ad65e4d..fd5b18d 100644
--- a/hosts/hakase/configuration.nix
+++ b/hosts/hakase/configuration.nix
@@ -95,14 +95,15 @@
   };
 
   services = {
-    getty.autologinUser = "${myConfig.essentials.Username}";
-    greetd = {
-      enable = true;
-      settings.default_session = {
-        user = "${myConfig.essentials.Username}";
-        command = "steam-gamescope";
-      };
-    };
+    displayManager.sessionPackages = [inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland];
+    # getty.autologinUser = "${myConfig.essentials.Username}";
+    # greetd = {
+    #   enable = true;
+    #   settings.default_session = {
+    #     user = "${myConfig.essentials.Username}";
+    #     command = "Hyprland";
+    #   };
+    # };
 
     seatd.enable = true;
     upower.enable = true;
diff --git a/modules/default/desktop.nix b/modules/default/desktop.nix
index 268d643..2fcf661 100644
--- a/modules/default/desktop.nix
+++ b/modules/default/desktop.nix
@@ -12,5 +12,8 @@
     ++ [
       ../../packages/steam/default.nix
       ../../packages/bottles/default.nix
+    ]
+    ++ lib.optionals (myConfig.nixos.Gaming.enable == true) [
+      ../../packages/steam/jovian.nix
     ];
 }
diff --git a/packages/steam/jovian.nix b/packages/steam/jovian.nix
index 0c7dc06..3e85253 100644
--- a/packages/steam/jovian.nix
+++ b/packages/steam/jovian.nix
@@ -1,7 +1,16 @@
-{inputs, ...}: {
+{
+  inputs,
+  pkgs,
+  myConfig,
+  ...
+}: {
   imports = [
     inputs.jovian.nixosModules.default
   ];
-  jovian.steamAutostart = true;
-  jovian.steam.desktopSession = "Hyprland";
+  # environment.systemPackages = with pkgs; [inputs.jovian.packages.${system}.default];
+  jovian.steam.enable = true;
+  jovian.steam.autoStart = true;
+  jovian.steam.desktopSession = "hyprland";
+  jovian.steam.user = "${myConfig.essentials.Username}";
+  jovian.hardware.has.amd.gpu = true;
 }