diff --git a/flake.lock b/flake.lock
index ae197b3..5698aee 100644
--- a/flake.lock
+++ b/flake.lock
@@ -344,6 +344,27 @@
         "type": "github"
       }
     },
+    "jovian": {
+      "inputs": {
+        "nix-github-actions": "nix-github-actions",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1730441026,
+        "narHash": "sha256-xmZQFGeIm2TzXv4jGaQ3nfBoUbt4gKbIv/SHVWw93ag=",
+        "owner": "Jovian-Experiments",
+        "repo": "Jovian-NixOS",
+        "rev": "bd1da5657b8903b293a0ff51eb896a91a544ebed",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Jovian-Experiments",
+        "repo": "Jovian-NixOS",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -365,6 +386,28 @@
         "type": "github"
       }
     },
+    "nix-github-actions": {
+      "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"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1728729581,
@@ -466,6 +509,7 @@
       "inputs": {
         "disko": "disko",
         "home-manager": "home-manager",
+        "jovian": "jovian",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nixvim": "nixvim",
diff --git a/flake.nix b/flake.nix
index 5edb6e6..1de6908 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,6 +31,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    jovian = {
+      url = "github:Jovian-Experiments/Jovian-NixOS";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
 #    # Secrets management. See ./docs/secretsmgmt.md
 #    sops-nix = {
 #      url = "github:mic92/sops-nix";
@@ -156,6 +161,7 @@
           attrs.disko.nixosModules.disko
           attrs.stylix.nixosModules.stylix
           attrs.nixvim.nixosModules.nixvim
+          attrs.jovian.nixosModules.default
           ./hosts
           ./users/willifan
         ];
diff --git a/users/willifan/Lillie/default.nix b/users/willifan/Lillie/default.nix
index 1c4f482..1469dd4 100644
--- a/users/willifan/Lillie/default.nix
+++ b/users/willifan/Lillie/default.nix
@@ -1,4 +1,7 @@
 { ... }:
 {
   
+  imports = [
+    ./jovian.nix
+  ];
 }
diff --git a/users/willifan/Lillie/jovian.nix b/users/willifan/Lillie/jovian.nix
new file mode 100644
index 0000000..33ac39d
--- /dev/null
+++ b/users/willifan/Lillie/jovian.nix
@@ -0,0 +1,17 @@
+{ ... }:
+{
+
+  jovian = {
+    decky-loader.enable = true;
+    devices.steamdeck = {
+      enable = true;
+      enableGyroDsuService = true;
+    };
+    hardware.has.amd = true;
+    steam = {
+      enable = true;
+      autoStart = true;
+      desktopSession = "Hyprland";
+    };
+  };
+}
diff --git a/users/willifan/desktop/default.nix b/users/willifan/desktop/default.nix
index 0fed962..c679959 100644
--- a/users/willifan/desktop/default.nix
+++ b/users/willifan/desktop/default.nix
@@ -10,7 +10,6 @@
     ./web
 
     ./applications.nix
-    ./autologin.nix
     ./kitty.nix
     ./thunar.nix
   ];
diff --git a/users/willifan/desktop/autologin.nix b/users/willifan/desktop/hyprland/Lenni/autologin.nix
similarity index 100%
rename from users/willifan/desktop/autologin.nix
rename to users/willifan/desktop/hyprland/Lenni/autologin.nix
diff --git a/users/willifan/desktop/hyprland/Lenni/default.nix b/users/willifan/desktop/hyprland/Lenni/default.nix
index ae71f3b..4e62637 100644
--- a/users/willifan/desktop/hyprland/Lenni/default.nix
+++ b/users/willifan/desktop/hyprland/Lenni/default.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ./autologin.nix
     ./hypridle.nix
     ./hyprlock.nix
     ./kanshi.nix
diff --git a/users/willifan/desktop/hyprland/Puenktchen/autologin.nix b/users/willifan/desktop/hyprland/Puenktchen/autologin.nix
new file mode 100644
index 0000000..2866ad1
--- /dev/null
+++ b/users/willifan/desktop/hyprland/Puenktchen/autologin.nix
@@ -0,0 +1,13 @@
+{ ... }:
+{
+  services.greetd = {
+    enable = true;
+     settings = rec {
+      initial_session = {
+        command = ''Hyprland'';
+        user = "willifan";
+      };
+      default_session = initial_session;
+    };
+  };
+}
diff --git a/users/willifan/desktop/hyprland/Puenktchen/default.nix b/users/willifan/desktop/hyprland/Puenktchen/default.nix
index 9913631..1e62ab8 100644
--- a/users/willifan/desktop/hyprland/Puenktchen/default.nix
+++ b/users/willifan/desktop/hyprland/Puenktchen/default.nix
@@ -1,4 +1,8 @@
 { ... }:
 {
+
+  imports = [
+    ./autologin.nix
+  ];
   
-}
\ No newline at end of file
+}