diff --git a/hosts/dunamis/users/user/programs.nix b/hosts/dunamis/users/user/programs.nix
index 09e7a73..fb9dd15 100644
--- a/hosts/dunamis/users/user/programs.nix
+++ b/hosts/dunamis/users/user/programs.nix
@@ -70,7 +70,7 @@
     rbw # bitwarden cli in rust
     silicon # create code pics in rust
     trashy # trash cli in rust
-    vial # qmk keyboard configuring app
+    # vial # qmk keyboard configuring app
     virt-manager # libvirt gui
     waycheck # check wayland protocols
   ];
diff --git a/hosts/sarien/users/user/flatpak.nix b/hosts/sarien/users/user/flatpak.nix
index 53036c3..df97352 100644
--- a/hosts/sarien/users/user/flatpak.nix
+++ b/hosts/sarien/users/user/flatpak.nix
@@ -1,101 +1,3 @@
-{inputs, ...}: {
-  imports = with inputs; [
-    nix-flatpak.homeManagerModules.nix-flatpak
-  ];
-  services.flatpak = {
-    enable = true;
-    uninstallUnmanaged = true;
-    remotes = [
-      {
-        name = "flathub";
-        location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
-      }
-      {
-        name = "hero-persson";
-        location = "https://hero-persson.github.io/unmojang-flatpak/index.flatpakrepo";
-      }
-    ];
-    packages = [
-      # misc
-      "app.zen_browser.zen"
-      "io.github.ungoogled_software.ungoogled_chromium"
-      "net.mullvad.MullvadBrowser"
-      "com.bitwarden.desktop"
-      "com.github.tchx84.Flatseal"
-      "com.logseq.Logseq"
-      "com.obsproject.Studio"
-      "com.usebottles.bottles"
-      "de.haeckerfelix.Fragments"
-      "org.qbittorrent.qBittorrent"
-
-      # chatting
-      "im.riot.Riot"
-      "io.github.spacingbat3.webcord"
-      "org.mozilla.Thunderbird"
-      "org.signal.Signal"
-      "org.telegram.desktop"
-
-      # media
-      "io.bassi.Amberol"
-      "io.freetubeapp.FreeTube"
-      # "io.mpv.Mpv"
-      #"io.github.celluloid_player.Celluloid"
-
-      # gaming
-      #"com.github._0negal.Viper"
-      "com.heroicgameslauncher.hgl"
-      "net.lutris.Lutris"
-      {
-        appId = "org.unmojang.FjordLauncher";
-        origin = "hero-persson";
-      }
-      "org.freedesktop.Platform.VulkanLayer.MangoHud//24.08"
-      "org.freedesktop.Platform.VulkanLayer.gamescope//24.08"
-    ];
-    overrides = {
-      "global" = {
-        # Force Wayland by default
-        Context = {
-          sockets = ["wayland" "!x11" "!fallback-x11"];
-          filesystems = [
-            "!home"
-            "!host"
-            "!~/.ssh"
-            "/nix/store:ro"
-            "xdg-config/gtk-3.0:ro"
-            "xdg-config/gtk-4.0:ro"
-            "xdg-run/pipewire-0"
-            "~/.local/share/icons:ro"
-          ];
-        };
-        Environment = {
-          ELECTRON_OZONE_PLATFORM_HINT = "wayland";
-        };
-      };
-      "org.signal.Signal" = {
-        Environment.SIGNAL_PASSWORD_STORE = "gnome-libsecret";
-      };
-      "com.obsproject.Studio" = {
-        Context.filesystems = ["~/vids"];
-      };
-      "com.logseq.Logseq" = {
-        Context.filesystems = [
-          "~/docs/logseq"
-          "~/docs/nure/2025/logseq"
-          "~/syncthing/logseq"
-        ];
-      };
-      "net.lutris.Lutris".Context = {
-        sockets = ["x11" "wayland"];
-        filesystems = ["/storage/games/lutris" "~/games/lutris"];
-      };
-      "com.heroicgameslauncher.hgl".Context = {
-        sockets = ["x11" "wayland"];
-        filesystems = ["/storage/games/heroic" "~/games/heroic"];
-      };
-      "com.usebottles.Bottles" = {
-        Context.sockets = ["x11" "wayland"];
-      };
-    };
-  };
+{
+  imports = [../../../dunamis/users/user/flatpak.nix];
 }
diff --git a/modules/home/desktop/niri/default.nix b/modules/home/desktop/niri/default.nix
index 176364b..d1d986b 100644
--- a/modules/home/desktop/niri/default.nix
+++ b/modules/home/desktop/niri/default.nix
@@ -583,6 +583,7 @@ in {
             XF86AudioPrev         allow-when-locked=true { spawn "playerctl" "previous"; }
             XF86AudioNext         allow-when-locked=true { spawn "playerctl" "next"; }
 
+            XF86ScreenSaver            allow-when-locked=true { spawn "${lockscreen}"; }
             XF86MonBrightnessUp        allow-when-locked=true { spawn "brightnessctl" "s" "5%+"; }
             XF86MonBrightnessDown      allow-when-locked=true { spawn "brightnessctl" "s" "5%-"; }
             Alt+XF86MonBrightnessUp    allow-when-locked=true { spawn "brightnessctl" "s" "5%+" "-d" "${keyboard}::kbd_backlight"; }