diff --git a/dotfiles/dot_config/fish/functions/flakeup.fish b/dotfiles/dot_config/fish/functions/flakeup.fish
deleted file mode 100644
index ed53d26..0000000
--- a/dotfiles/dot_config/fish/functions/flakeup.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env fish
-
-function flakeup --description 'update flake sources'
-    nix flake update --flake /home/emenel/source/nixos-config
-end
diff --git a/dotfiles/dot_config/fish/functions/homeup.fish b/dotfiles/dot_config/fish/functions/homeup.fish
deleted file mode 100644
index 6f9f398..0000000
--- a/dotfiles/dot_config/fish/functions/homeup.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env fish
-
-function homeup --description 'update home manager'
-    home-manager switch --flake ~/source/nixos-config#emenel $argv
-end
diff --git a/dotfiles/dot_config/fish/functions/sysup.fish b/dotfiles/dot_config/fish/functions/sysup.fish
deleted file mode 100644
index dea64c4..0000000
--- a/dotfiles/dot_config/fish/functions/sysup.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env fish
-
-function sysup --description 'nix system rebuid'
-    sudo nixos-rebuild switch --flake ~/source/nixos-config/#eddie $argv
-end
diff --git a/dotfiles/dot_config/niri/config.kdl b/dotfiles/dot_config/niri/config.kdl
index fd23cea..a80ce18 100644
--- a/dotfiles/dot_config/niri/config.kdl
+++ b/dotfiles/dot_config/niri/config.kdl
@@ -102,6 +102,7 @@ spawn-at-startup "waybar"
 spawn-at-startup "eww" "daemon"
 spawn-at-startup "swayosd-server"
 spawn-at-startup "bitwarden"
+spawn-at-startup "plexamp"
 
 screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
 
@@ -123,6 +124,10 @@ window-rule {
     open-floating true
 }
 
+window-rule {
+    match app-id="launcher"
+    open-floating true
+}
 
 // Open the Firefox picture-in-picture player as floating by default.
 window-rule {
@@ -149,9 +154,11 @@ binds {
 
     // Suggested binds for running programs: terminal, app launcher, screen locker.
     Mod+T { spawn "wezterm"; }
-    Mod+E { spawn "emacsclient"; }
-    Mod+Space { spawn "fuzzel"; }
-    Super+Alt+L { spawn "swaylock"; }
+    Mod+E { spawn "emacsclient" "-r" "-n"; }
+    Mod+B { spawn "firefox"; }
+    //Mod+Space { spawn "fuzzel"; }
+    Mod+Space { spawn "wezterm" "--config-file" "/home/emenel/.config/wezterm/launcher.lua" "start" "--class" "launcher" "--always-new-process" "sway-launcher-desktop"; }
+    Super+Shift+L { spawn "swaylock"; }
 
     // Example volume keys mappings for PipeWire & WirePlumber.
     // The allow-when-locked=true property makes them work even when the session is locked.
diff --git a/dotfiles/dot_config/wezterm/launcher.lua b/dotfiles/dot_config/wezterm/launcher.lua
new file mode 100644
index 0000000..edc887b
--- /dev/null
+++ b/dotfiles/dot_config/wezterm/launcher.lua
@@ -0,0 +1,120 @@
+local wezterm = require 'wezterm'
+local config = wezterm.config_builder()
+local act = wezterm.action
+local io = require 'io'
+local os = require 'os'
+
+
+config.enable_wayland = false;
+-- config.front_end = "WebGpu";
+
+config.font_size = 14
+config.font = wezterm.font {
+  family = 'JetBrains Mono',
+  weight = 'Medium'
+}
+
+-- config.enable_scroll_bar = true
+
+config.color_scheme = 'Adventure'
+config.colors = {
+  background = "#111111",
+  tab_bar = {
+    background = "#111111",
+    inactive_tab = {
+      fg_color = "#444444",
+      bg_color = "#111111"
+    }
+  }
+}
+
+config.background = {
+  {
+    source = {
+      Color = '#111111'
+    },
+    width = "100%",
+    height = "100%",
+    opacity = 1
+  }
+}
+
+config.window_decorations = "RESIZE"
+
+config.window_padding = {
+  left = 12,
+  right = 12,
+  top = 6,
+  bottom = 6,
+}
+
+config.cursor_thickness = 2
+config.default_cursor_style = 'SteadyBar'
+config.enable_tab_bar = false;
+
+config.enable_kitty_keyboard = true
+
+config.unzoom_on_switch_pane = true
+
+config.keys = {
+  {
+    key = 'Enter',
+    mods = 'CTRL',
+    action = act.SplitVertical { domain = 'CurrentPaneDomain' },
+  },
+  {
+    key = 'Enter',
+    mods = 'CTRL|SHIFT',
+    action = act.SplitHorizontal { domain = 'CurrentPaneDomain' },
+  },
+  {
+    key = 'w',
+    mods = 'CTRL',
+    action = wezterm.action.CloseCurrentTab { confirm = true },
+  },
+  {
+    key = 'w',
+    mods = 'CTRL|SHIFT',
+    action = act.DetachDomain 'CurrentPaneDomain',
+  },
+  {
+    key = 'k',
+    mods = 'CTRL|SHIFT',
+    action = act.Multiple {
+      act.ClearScrollback 'ScrollbackAndViewport',
+      act.SendKey { key = 'L', mods = 'CTRL' },
+    },
+  },
+  {
+    key = 'z',
+    mods = 'CTRL|META',
+    action = wezterm.action.TogglePaneZoomState,
+  },
+  {
+    key = 'E',
+    mods = 'CTRL',
+    action = act.EmitEvent 'trigger-emacs-with-scrollback',
+  },
+  {
+    key = 'o',
+    mods = 'CTRL',
+    action = wezterm.action.ShowLauncher
+  },
+
+  { key="Backspace", mods="CTRL", action=act.SendKey { key="Backspace", mods="META" } },
+
+  { key='t', mods='CTRL', action=act { SpawnCommandInNewTab = { cwd = wezterm.home_dir } } },
+
+  { key="LeftArrow",  mods="CTRL|META", action=act.ActivateTabRelative(-1) },
+  { key="RightArrow",  mods="CTRL|META", action=act.ActivateTabRelative(1) },
+
+  { key="UpArrow",  mods="CTRL|META", action=act.ActivatePaneDirection("Prev") },
+  { key="DownArrow",  mods="CTRL|META", action=act.ActivatePaneDirection("Next") },
+
+  { key='h', mods='CTRL|META', action=wezterm.action{ActivatePaneDirection="Left"} },
+  { key='l', mods='CTRL|META', action=wezterm.action{ActivatePaneDirection="Right"} },
+  { key='j', mods='CTRL|META', action=wezterm.action{ActivatePaneDirection="Up"} },
+  { key='k', mods='CTRL|META', action=wezterm.action{ActivatePaneDirection="Down"} },
+}
+
+return config
diff --git a/dotfiles/dot_config/wezterm/wezterm.lua b/dotfiles/dot_config/wezterm/wezterm.lua
index 34936db..40826fc 100644
--- a/dotfiles/dot_config/wezterm/wezterm.lua
+++ b/dotfiles/dot_config/wezterm/wezterm.lua
@@ -41,7 +41,7 @@ local tabline = wezterm.plugin.require("https://github.com/michaelbrusegard/tabl
 local workspace_switcher = wezterm.plugin.require("https://github.com/MLFlexer/smart_workspace_switcher.wezterm")
 
 config.enable_wayland = false;
-config.front_end = "WebGpu";
+-- config.front_end = "WebGpu";
 
 config.font_size = 14
 config.font = wezterm.font {
diff --git a/flake.lock b/flake.lock
index bbde985..ccdf774 100644
--- a/flake.lock
+++ b/flake.lock
@@ -185,11 +185,11 @@
         "zig": "zig"
       },
       "locked": {
-        "lastModified": 1738250323,
-        "narHash": "sha256-Vk04Vlpp1TpSMT8uZpPS+b9inUQ6jwCSiZvzAAo9nrc=",
+        "lastModified": 1738275804,
+        "narHash": "sha256-n9cSCLlWjc8Bc5QyZYLo5+c6MfTZjgDpUGx/FGxBiY8=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "a62b26cd2fac4d3685aeec6aeebeaf2ad5300fc9",
+        "rev": "c5508e7d1922842ecd3160ea73b97da1282168b3",
         "type": "github"
       },
       "original": {
@@ -263,11 +263,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1738228963,
-        "narHash": "sha256-Ee5hVHM7AWxaq7XJN6xiZztTZX8csdXernjqaTW5r9I=",
+        "lastModified": 1738275749,
+        "narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d963ed335b890a70ed53eecf14cdb21528eda9b8",
+        "rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9",
         "type": "github"
       },
       "original": {
@@ -349,11 +349,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1738246636,
-        "narHash": "sha256-01BwBqPiv0G9bx2oe2kyj1voSQJtc1nx+EWJZ1ZOirg=",
+        "lastModified": 1738348222,
+        "narHash": "sha256-SsDS/GdQOZ4z8hWOlOQAgQMC1ColTgCbl2G4tFpzKY4=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "a169e0335d2773edd31a1959a3ff4fca994a422a",
+        "rev": "a0e2a15c60162e4f0a589fb5f0ce0899bce213b5",
         "type": "github"
       },
       "original": {
@@ -712,11 +712,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737411508,
-        "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=",
+        "lastModified": 1738291974,
+        "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4",
+        "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
         "type": "github"
       },
       "original": {
diff --git a/home/home.nix b/home/home.nix
index efba34c..db5bb91 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -18,13 +18,10 @@
       inputs.affinity-nix.packages.x86_64-linux.photo
       inputs.affinity-nix.packages.x86_64-linux.publisher
       inputs.affinity-nix.packages.x86_64-linux.designer
-
       guix
-
       unstable.thonny
-
       inputs.isd.packages.x86_64-linux.default
-
+      wayback
       just
       yt-dlp
       erdtree
@@ -110,6 +107,8 @@
       python311Packages.pint
       python311Packages.babel
       python311Packages.requests
+      python311Packages.distutils-extra
+      python311Packages.distlib
       ruff
 
       (sbcl.withPackages (ps: with ps; [
@@ -250,6 +249,8 @@
         wine = wineWowPackages.stagingFull;
       })
 
+      chayang
+      sway-launcher-desktop
       unstable.swayosd
       spice
       spice-gtk
@@ -323,10 +324,10 @@
       impala
       unstable.playerctl
       mioctl
-      rmpc
       unstable.door-knocker
       unstable.hyprpicker
       unstable.halloy
+      paleta
 
       # Audio plugins (LV2, VST2, VST3, LADSPA)
       eq10q
@@ -607,6 +608,40 @@
     };
     swaylock = {
       enable = true;
+      settings = {
+        font-size = 24;
+        indicator-idle-visible = true;
+        indicator-radius = 200;
+        color="1e1e1e";
+        bs-hl-color="f5e0dc";
+        caps-lock-bs-hl-color="f5e0dc";
+        caps-lock-key-hl-color="a6e3a1";
+        inside-color="00000000";
+        inside-clear-color="00000000";
+        inside-caps-lock-color="00000000";
+        inside-ver-color="00000000";
+        inside-wrong-color="00000000";
+        key-hl-color="a6e3a1";
+        layout-bg-color="00000000";
+        layout-border-color="00000000";
+        layout-text-color="cdd6f4";
+        line-color="00000000";
+        line-clear-color="00000000";
+        line-caps-lock-color="00000000";
+        line-ver-color="00000000";
+        line-wrong-color="00000000";
+        ring-color="b4befe";
+        ring-clear-color="f5e0dc";
+        ring-caps-lock-color="fab387";
+        ring-ver-color="89b4fa";
+        ring-wrong-color="eba0ac";
+        separator-color="00000000";
+        text-color="cdd6f4";
+        text-clear-color="f5e0dc";
+        text-caps-lock-color="fab387";
+        text-ver-color="89b4fa";
+        text-wrong-color="eba0ac";
+      };
     };
     waybar = {
       enable = true;
@@ -673,8 +708,8 @@
       enable = true;
       extraArgs = [ "-w" ];
       timeouts = [
-        { timeout = 60; command = "${pkgs.swaylock}/bin/swaylock -fF"; }
-        { timeout = 90; command = "${pkgs.systemd}/bin/systemctl suspend"; }
+        { timeout = 120; command = "${pkgs.swaylock}/bin/swaylock -fF"; }
+        { timeout = 300; command = "${pkgs.systemd}/bin/systemctl suspend"; }
       ];
       events = [
         { event = "before-sleep"; command = "${pkgs.swaylock}/bin/swaylock -fF"; }
@@ -730,6 +765,7 @@
   services.flatpak.packages = [
     "com.github.tchx84.Flatseal"
     "nl.hjdskes.gcolor3"
+    "dev.qwery.AddWater"
   ];
 
   systemd.user = {
diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix
index 77d7971..480383a 100644
--- a/system/eddie/configuration.nix
+++ b/system/eddie/configuration.nix
@@ -169,6 +169,7 @@
 
   security.polkit.enable = true;
   security.rtkit.enable = true;
+  security.pam.services.swaylock = {};
 
   services.xserver.videoDrivers = [ "nvidia" "modesetting" ];