diff --git a/flake.lock b/flake.lock
index b82a732f..a3867eb5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,29 +1,5 @@
 {
   "nodes": {
-    "avf": {
-      "locked": {
-        "lastModified": 1745286281,
-        "narHash": "sha256-pkbIduXLW85yB5wV6j72Gpxz5JJhuJBZxhXWsJ4BMd8=",
-        "type": "tarball",
-        "url": "https://github.com/nix-community/nixos-avf/releases/download/nixos-24.11/avf-channel-24.11-aarch64.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/nix-community/nixos-avf/releases/download/nixos-24.11/avf-channel-24.11-aarch64.tar.xz"
-      }
-    },
-    "avf-channel": {
-      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-56qCMHw9q2hkyh6qlbrTKTN102OfZPkXVI4YGLa5Wgc=",
-        "type": "tarball",
-        "url": "https://github.com/nix-community/nixos-avf/releases/download/nixos-24.11/nixos-channel-24.11-aarch64.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/nix-community/nixos-avf/releases/download/nixos-24.11/nixos-channel-24.11-aarch64.tar.xz"
-      }
-    },
     "blender": {
       "inputs": {
         "nixpkgs": "nixpkgs"
@@ -509,8 +485,6 @@
     },
     "root": {
       "inputs": {
-        "avf": "avf",
-        "avf-channel": "avf-channel",
         "blender": "blender",
         "disko": "disko",
         "hm": "hm",
diff --git a/hosts/jupiter/boot/default.nix b/hosts/jupiter/boot/default.nix
index 3cf63f7f..2b11c5a3 100644
--- a/hosts/jupiter/boot/default.nix
+++ b/hosts/jupiter/boot/default.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }:
 {
   boot = {
-    kernelPackages = pkgs.linuxPackages_latest;
     loader.systemd-boot.enable = true;
     plymouth.enable = true;
   };
diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix
index 4188f63f..95305ca3 100644
--- a/hosts/jupiter/default.nix
+++ b/hosts/jupiter/default.nix
@@ -13,7 +13,7 @@
 
   networking = {
     hostName = "jupiter";
-    wireless.enable = true;
+    networkmanager.enable = true;
   };
 
   system = {
diff --git a/hosts/jupiter/filesystems/default.nix b/hosts/jupiter/filesystems/default.nix
index af599539..7c1feb2d 100644
--- a/hosts/jupiter/filesystems/default.nix
+++ b/hosts/jupiter/filesystems/default.nix
@@ -1,8 +1,8 @@
 { config, ... }:
 {
   fileSystems."/mnt/Games" = {
-    device = "/dev/disk/by-uuid/a026c6c7-04a0-4f34-82bb-ea7e4f3e85c5";
-    fsType = "ext4";
+    device = "/dev/disk/by-uuid/cb109a85-846d-4417-9c50-a2279bd20803";
+    fsType = "btrfs";
     options = [
       "nofail"
       "nosuid"
diff --git a/hosts/jupiter/jovian/default.nix b/hosts/jupiter/jovian/default.nix
index 1580f669..fb0d119c 100644
--- a/hosts/jupiter/jovian/default.nix
+++ b/hosts/jupiter/jovian/default.nix
@@ -1,17 +1,28 @@
-{ config, jovian, ... }:
+{ config, lib, jovian, ... }:
 {
   imports = [ jovian.nixosModules.jovian ];
 
   jovian = {
     steam = {
       enable = true;
+      autoStart = true;
+      desktopSession = "sway";
       user = config.sysusers.main;
     };
     devices.steamdeck.enable = true;
-    hardware.has.amd.gpu = true;
     decky-loader.enable = true;
   };
 
+  services = {
+    displayManager.ly.enable = lib.mkForce false;
+    keyd.enable = lib.mkForce false;
+  };
+
+  environment.persistence."/persist" = {
+    directories = [ "/etc/NetworkManager/system-connections" ];
+    users.${config.sysusers.main}.directories = [ ".steam" ];
+  };
+
   nixpkgs.allowUnfreePackages = [
     "steam"
     "steam-jupiter-unwrapped"
diff --git a/hosts/jupiter/users/main/default.nix b/hosts/jupiter/users/main/default.nix
index d36388c0..73b8eb2b 100644
--- a/hosts/jupiter/users/main/default.nix
+++ b/hosts/jupiter/users/main/default.nix
@@ -2,6 +2,7 @@
 {
   home-manager.users."${config.sysusers.main}".home = {
     desktop.enable = true;
+    gaming.enable = true;
     remote-desktop.enable = true;
     enableNixpkgsReleaseCheck = false;
     stateVersion = lib.mkForce config.system.stateVersion;
diff --git a/modules/home/programs/misc/gaming/emulators/default.nix b/modules/home/programs/misc/gaming/emulators/default.nix
index 1a83bdd1..e78c9b9a 100644
--- a/modules/home/programs/misc/gaming/emulators/default.nix
+++ b/modules/home/programs/misc/gaming/emulators/default.nix
@@ -1,11 +1,12 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, pkgsUnstable, ... }:
 {
-  home.packages = with pkgs; lib.mkIf config.home.gaming.enable [
-    dolphin-emu-beta
-    cemu
-    ryujinx
-    lime3ds
-    duckstation
-    pcsx2
-  ];
+  config = lib.mkIf config.home.desktop.enable {
+    home.packages = (with pkgs; [
+      cemu
+      dolphin-emu-beta
+      duckstation
+      pcsx2
+      ryujinx
+    ]) ++ (with pkgsUnstable; [ azahar ]);
+  };
 }
diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix
index ed1319d1..49c33f86 100644
--- a/modules/home/programs/terminal/ranger/default.nix
+++ b/modules/home/programs/terminal/ranger/default.nix
@@ -1,7 +1,8 @@
-{ config, pkgs, ... }:
+{ config, pkgsStable, ... }:
 {
   programs.ranger = {
     enable = true;
+    package = pkgsStable.ranger;
     settings = {
       preview_images = true;
       preview_images_method = "sixel";
@@ -115,7 +116,7 @@
         P:/home/${config.home.username}/Network/Midas/Photos
       '';
     };
-    packages = with pkgs; [
+    packages = with pkgsStable; [
       imagemagick
       poppler_utils
     ];
diff --git a/modules/system/users/main/default.nix b/modules/system/users/main/default.nix
index ae271dbd..52ed203f 100644
--- a/modules/system/users/main/default.nix
+++ b/modules/system/users/main/default.nix
@@ -18,15 +18,12 @@
         ../../../../hosts/intuos/id_ed25519.pub
         ../../../../hosts/redmond/id_ed25519.pub
 
-        ../../../../hosts/droid/id_ed25519.pub
-
         ../../../../hosts/midas/id_ed25519.pub
         ../../../../hosts/kitty/id_ed25519.pub
         ../../../../hosts/prophet/id_ed25519.pub
       ];
-      openssh.authorizedKeys.keys = [
+      openssh.authorizedKeys.keys = [ 
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEM2jFVBmlYLLuWp8zfkzrdB+LpiTBuO2cc/jqu9wMrS Wired"
       ];
       extraGroups = [
         "wheel"