diff --git a/hosts/nb/modules/desktop/flatpak-packages.nix b/hosts/nb/modules/desktop/flatpak-packages.nix
index 199a4be..021a33b 100644
--- a/hosts/nb/modules/desktop/flatpak-packages.nix
+++ b/hosts/nb/modules/desktop/flatpak-packages.nix
@@ -17,7 +17,12 @@
       flatpak install --system -y --noninteractive --or-update flathub io.github.yuki_iptv.yuki-iptv
 
       flatpak install --system -y --noninteractive --or-update flathub com.google.AndroidStudio
-      flatpak run --command=bash com.google.AndroidStudio -c 'curl -fsSL https://claude.ai/install.sh | bash'
+
+      # Only run claude.ai install script once
+      STAMP_FILE="/var/lib/flatpak-android-studio-claude-installed"
+      if [ ! -f "$STAMP_FILE" ]; then
+        flatpak run --command=bash com.google.AndroidStudio -c 'curl -fsSL https://claude.ai/install.sh | bash' && touch "$STAMP_FILE"
+      fi
     '';
   };
 
diff --git a/hosts/nb/modules/development/coding.nix b/hosts/nb/modules/development/coding.nix
index 32185f0..e31fd93 100644
--- a/hosts/nb/modules/development/coding.nix
+++ b/hosts/nb/modules/development/coding.nix
@@ -12,6 +12,11 @@ in {
     # android-tools
   ];
 
+  # Electron apps Wayland optimizations for better performance
+  environment.sessionVariables = {
+    ELECTRON_OZONE_PLATFORM_HINT = "auto";
+  };
+
   nixpkgs.config.android_sdk.accept_license = true;
 
   programs.adb.enable = true;                     # sets up udev + adb group
diff --git a/hosts/nb/modules/sway/sway.conf b/hosts/nb/modules/sway/sway.conf
index 7995b52..f060e9e 100644
--- a/hosts/nb/modules/sway/sway.conf
+++ b/hosts/nb/modules/sway/sway.conf
@@ -302,20 +302,20 @@ exec cryptomator
 exec swayidle \
  before-sleep 'loginctl lock-session $XDG_SESSION_ID' \
  lock 'swaylock -c 252525 -s center -i ~/.wallpaper.png' \
- timeout 180 'swaylock -c 252525 -s center -i ~/.wallpaper.png' \
+ timeout 300 'swaylock -c 252525 -s center -i ~/.wallpaper.png' \
  timeout 1800 'systemctl suspend'
 exec dunst
 #exec --no-startup-id swaybg -c "#000000" -m fill -i ~/.config/wallpaper/wot.jpg
 # exec --no-startup-id gnome-keyring-daemon --start --components=pkcs11,secrets,ssh
-exec 'sleep 2; swaymsg workspace "$ws8"; swaymsg layout tabbed'
+exec 'sleep 1; swaymsg workspace "$ws8"; swaymsg layout tabbed'
 exec mako --default-timeout=5000
 
-# Battery low warning every minute
-exec_always sh -c 'while :; do battery-alert-swaynag; sleep 60; done' &
+# Battery low warning every 2 minutes
+exec_always sh -c 'while :; do battery-alert-swaynag; sleep 120; done' &
 
 # wallpaper
-# output eDP-1 scale 2 scale_filter linear
-output eDP-1 mode 2880x1920 scale 2 scale_filter linear
+# output eDP-1 scale 2 scale_filter nearest
+output eDP-1 mode 2880x1920 scale 2 scale_filter nearest
 output eDP-1 bg #282a36 solid_color
 output eDP-1 bg ~/.wallpaper.png center
 output DP-2 position 0 0
diff --git a/hosts/nb/modules/sway/sway.nix b/hosts/nb/modules/sway/sway.nix
index 873598e..6fc071d 100644
--- a/hosts/nb/modules/sway/sway.nix
+++ b/hosts/nb/modules/sway/sway.nix
@@ -10,8 +10,6 @@ let
 
     text = ''
       dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
-      systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
-      systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
       systemctl --user import-environment DISPLAY
       export STEAM_RUNTIME=0
     '';
@@ -76,9 +74,11 @@ in {
   programs.sway = {
     enable = true;
     wrapperFeatures.gtk = true;
-    extraOptions = [
-      "--unsupported-gpu"
-    ];
+    extraOptions = [ ];
+    extraSessionCommands = ''
+      export WLR_NO_HARDWARE_CURSORS=1
+      export WLR_RENDERER=vulkan
+    '';
   };
 
   environment.etc = {