diff --git a/Luana-X670E/configuration.nix b/Luana-X670E/configuration.nix
index bf809c3..08685d9 100644
--- a/Luana-X670E/configuration.nix
+++ b/Luana-X670E/configuration.nix
@@ -148,9 +148,9 @@
   environment.systemPackages = [
     pkgs.curl
     pkgs.git
-    pkgs.jdk22
+    pkgs.jdk23
     # pkgs.pkgsOld.authy
-    # pkgs.bitwarden-desktop # TODO: reenable when on newer commit
+    pkgs.bitwarden-desktop
     pkgs.libsecret
     # inputs.compiz-reloaded.packages.${pkgs.system}.default # Compiz
     inputs.compiz.packages.${pkgs.system}.default
@@ -288,30 +288,29 @@
     XRT_COMPOSITOR_COMPUTE = "1";
     WMR_HANDTRACKING = "0";
   };
-  # TODO: Reenable when back to newer commit
-  #services.wivrn.enable = true;
-  #services.wivrn.openFirewall = true;
-  #services.wivrn.package = pkgs.wivrn;
-  #services.wivrn.defaultRuntime = true;
-  #services.wivrn.config = {
-  #  enable = true;
-  #  json = {
-  #    scale = 1.0;
-  #   # bitrate = 100000000;
-  #    encoders = [
-  #      {
-  #        encoder = "nvenc";
-  #        codec = "h265";
-  #   #     width = 1.0;
-  #     #   height = 1.0;
-  #      #  offset_x = 0.0;
-  #       # offset_y = 0.0;
-  #      }
-  #    ];
-  #    # application = [ pkgs.wlx-overlay-s ]; # TODO: reenable - broken
-  #    #tcp_only = false;
-  #  };
-  #};
+  services.wivrn.enable = true;
+  services.wivrn.openFirewall = true;
+  services.wivrn.package = pkgs.wivrn;
+  services.wivrn.defaultRuntime = true;
+  services.wivrn.config = {
+    enable = true;
+    json = {
+      scale = 1.0;
+     # bitrate = 100000000;
+      encoders = [
+        {
+          encoder = "nvenc";
+          codec = "h265";
+     #     width = 1.0;
+       #   height = 1.0;
+        #  offset_x = 0.0;
+         # offset_y = 0.0;
+        }
+      ];
+      # application = [ pkgs.wlx-overlay-s ]; # TODO: reenable - broken
+      #tcp_only = false;
+    };
+  };
   
   # Run normal binaries
   programs.nix-ld.enable = true;
diff --git a/flake.lock b/flake.lock
index 87a46b2..2801446 100644
--- a/flake.lock
+++ b/flake.lock
@@ -371,17 +371,17 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1728372924,
-        "narHash": "sha256-/1SD054lXYhZjJmCPtkvphL/vVUhndQ3kGj1BpMZiik=",
-        "owner": "NixOS",
+        "lastModified": 1730224311,
+        "narHash": "sha256-1nhG6ngLWBufMUWUPjHjFnf8xmIwACiGxnNeAg10Egg=",
+        "owner": "K900",
         "repo": "nixpkgs",
-        "rev": "273673e839189c26130d48993d849a84199523e6",
+        "rev": "cd796cf4a4042d68022f20687892bb4c72427e30",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "K900",
+        "ref": "awful-steamage",
         "repo": "nixpkgs",
-        "rev": "273673e839189c26130d48993d849a84199523e6",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index f152aea..e6a08d8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
       "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
     ];
   };
-  inputs = { nixpkgs.url = "github:NixOS/nixpkgs/273673e839189c26130d48993d849a84199523e6"; # TODO: go back to upstream when SteamVR/ALVR Fixed
+  inputs = { nixpkgs.url = "github:K900/nixpkgs/awful-steamage"; # TODO: go back to unstable when SteamVR/ALVR fixed (NixOS/nixpkgs#352304)
     pkgs-old.url = "github:nixos/nixpkgs/nixos-23.11";
     pkgs-mndvlknlyrs.url = "github:Scrumplex/nixpkgs/nixos/monado/vulkan-layers"; # TODO: remove when merged
     pkgs-alvr.url = "github:jopejoe1/nixpkgs/alvr-src"; # TODO: remove when merged