diff --git a/linux/protostar/configuration.nix b/linux/protostar/configuration.nix
index d64b1a7..2342a7a 100644
--- a/linux/protostar/configuration.nix
+++ b/linux/protostar/configuration.nix
@@ -6,10 +6,13 @@
 
 {
   # Configuration boot
-  boot.loader = {
-    efi.canTouchEfiVariables = true;
-    systemd-boot.enable = true;
-    timeout = 0;
+  boot = {
+    initrd.systemd.enable = true;
+    loader = {
+      efi.canTouchEfiVariables = true;
+      systemd-boot.enable = true;
+      timeout = 0;
+    };
   };
 
   # Change secrets file
diff --git a/linux/protostar/gui.nix b/linux/protostar/gui.nix
index a2e82f9..2b065d9 100644
--- a/linux/protostar/gui.nix
+++ b/linux/protostar/gui.nix
@@ -1,18 +1,29 @@
-{ config, ... }:
+{ config, inputs, pkgs, ... }:
 
-let usr = config.constants.userName; in {
+let 
+  usr = config.constants.userName;
+  jovianPkgs = pkgs.extend inputs.jovian.overlays.default;
+in {
+  home-manager.users.${usr}.home.packages = with jovianPkgs; [
+    (retroarch.override {
+      cores = with libretro; [
+        pcsx2
+        ppsspp
+      ];
+    })
+    yuzu
+  ];
   jovian = {
+    decky-loader = {
+      enable = true;
+      user = usr;
+    };
     devices.steamdeck.enable = true;
     steam = {
       enable = true;
       autoStart = true;
-      desktopSession = "plasma";
+      desktopSession = "gamescope-wayland";
       user = usr;
     };
   };
-
-  services.xserver = {
-    enable = true;
-    desktopManager.plasma6.enable = true;
-  };
 }
diff --git a/linux/protostar/network.nix b/linux/protostar/network.nix
index 2ef8d95..85cf799 100644
--- a/linux/protostar/network.nix
+++ b/linux/protostar/network.nix
@@ -1,10 +1,15 @@
-{ ... }:
+{ config, ... }:
 
 {
   networking = {
+    firewall.trustedInterfaces = [ config.services.tailscale.interfaceName ];
     hostId = "74247225";
-    networkmanager.enable = true;
+    networkmanager = {
+      enable = true;
+      wifi.backend = "iwd";
+    };
     nftables.enable = true;
+    wireless.iwd.enable = true;
   };
   services.openssh.enable = true;
 }