diff --git a/modules/_home/niri.nix b/modules/_home/niri.nix
index 51d8bab..7dd6123 100644
--- a/modules/_home/niri.nix
+++ b/modules/_home/niri.nix
@@ -1,4 +1,27 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+let
+  wallpaper = "${config.home.homeDirectory}/repos/nixos/wallpapers/astronaut.png";
+in {
+  services.swayidle = {
+    enable = true;
+    timeouts = [
+      {
+        timeout = 300;
+        command = "${pkgs.swaylock}/bin/swaylock -f -i ${wallpaper}";
+      }
+      {
+        timeout = 600;
+        command = "${pkgs.niri}/bin/niri msg action power-off-monitors";
+      }
+    ];
+    events = [
+      {
+        event = "before-sleep";
+        command = "${pkgs.swaylock}/bin/swaylock -f -i ${wallpaper}";
+      }
+    ];
+  };
+
   home.sessionVariables = {
     XDG_CURRENT_DESKTOP                 = "niri";
     XDG_SESSION_DESKTOP                 = "niri";
@@ -41,6 +64,16 @@
     '';
   };
 
+  home.file.".local/bin/swww-init" = {
+    executable = true;
+    text = ''
+      #!/usr/bin/env bash
+      swww-daemon &
+      sleep 0.5
+      swww img "${wallpaper}" --transition-type none
+    '';
+  };
+
   xdg.configFile."quickshell".source =
     config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/repos/nixos/quickshell";
 
@@ -75,6 +108,7 @@
     prefer-no-csd
 
     spawn-at-startup "quickshell"
+    spawn-at-startup "bash" "-c" "$HOME/.local/bin/swww-init"
 
     screenshot-path "${config.xdg.userDirs.pictures}/screenshots/%Y-%m-%d %H-%M-%S.png"
 
@@ -110,7 +144,7 @@
 
       // System
       Mod+Shift+E { quit; }
-      Mod+L       { spawn "swaylock"; }
+      Mod+L       { spawn "swaylock" "-i" "${wallpaper}"; }
 
       // Volume
       XF86AudioRaiseVolume { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "5%+"; }
diff --git a/modules/dev.nix b/modules/dev.nix
index c412c58..064aeb7 100644
--- a/modules/dev.nix
+++ b/modules/dev.nix
@@ -4,7 +4,10 @@ let
 in {
   den.aspects.dev.nixos = { pkgs, ... }:
   let
-    pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
+    pkgs-unstable = import inputs.nixpkgs-unstable {
+      system = pkgs.system;
+      config.allowUnfree = true;
+    };
   in {
     environment.systemPackages = with pkgs-unstable; [
       # CLI utilities
@@ -15,6 +18,7 @@ in {
       ripgrep
       chafa
       forgejo-cli
+      awscli2
 
       tracy
 
@@ -22,7 +26,7 @@ in {
       docker-compose
 
       # IDE
-      jetbrains.idea-oss
+      jetbrains.idea
 
       # Neovim
       vimPlugins.blink-cmp
@@ -56,11 +60,27 @@ in {
       maven
     ];
 
-    programs.java = {
-      enable = true;
-      package = pkgs-unstable.openjdk17;
+    environment.variables = {
+      JAVA_HOME = "${pkgs-unstable.openjdk8}";
     };
 
+    systemd.tmpfiles.rules = [
+      "d /var/lib/payara41 0755 ${username} users -"
+    ];
+
+    system.activationScripts.payaraJava = ''
+      asenv=/var/lib/payara41/glassfish/config/asenv.conf
+      if [ -f "$asenv" ]; then
+        ${pkgs.gnused}/bin/sed -i '/^AS_JAVA=/d' "$asenv"
+        echo 'AS_JAVA="${pkgs-unstable.openjdk8}"' >> "$asenv"
+      fi
+
+      domain_xml=/var/lib/payara41/glassfish/domains/domain1/config/domain.xml
+      if [ -f "$domain_xml" ]; then
+        ${pkgs.gnused}/bin/sed -i 's|java-home="[^"]*"|java-home="${pkgs-unstable.openjdk8}/lib/openjdk"|' "$domain_xml"
+      fi
+    '';
+
     virtualisation.docker.enable = true;
     users.users.${username}.extraGroups = [ "docker" ];
   };
diff --git a/wallpapers/astronaut.png b/wallpapers/astronaut.png
new file mode 100644
index 0000000..eae1d25
Binary files /dev/null and b/wallpapers/astronaut.png differ