diff --git a/hosts/nb/modules/desktop/signal-work.nix b/hosts/nb/modules/desktop/signal-work.nix
index 88d44b3..50ec0a7 100644
--- a/hosts/nb/modules/desktop/signal-work.nix
+++ b/hosts/nb/modules/desktop/signal-work.nix
@@ -2,16 +2,24 @@
 { pkgs, ... }:
 
 let
+  signalDesktopItem = pkgs.makeDesktopItem {
+    name = "signal-desktop";
+    desktopName = "Signal";
+    icon = "signal-desktop";
+    exec = "signal-desktop --ozone-platform=x11 --enable-features=VaapiVideoDecoder -- %u";
+  };
+
   signalWorkDesktopItem = pkgs.makeDesktopItem {
     name = "signal-work";
     desktopName = "Signal with work profile";
     icon = "signal-desktop";
-    exec = "signal-desktop --enable-dev-tools --enable-features=VaapiVideoDecoder --user-data-dir=/home/dominik/.config/Signal-work -- %u";
+    exec = "signal-desktop --ozone-platform=x11 --enable-features=VaapiVideoDecoder --enable-dev-tools --user-data-dir=/home/dominik/.config/Signal-work -- %u";
   };
 in {
-  environment.systemPackages = [ 
+  environment.systemPackages = [
     pkgs.signal-cli
     pkgs.signal-desktop
+    signalDesktopItem
     pkgs.zbar
     signalWorkDesktopItem
   ];
diff --git a/hosts/nb/modules/development/nvim/config/terminal.lua b/hosts/nb/modules/development/nvim/config/terminal.lua
index 1949be6..41ab650 100644
--- a/hosts/nb/modules/development/nvim/config/terminal.lua
+++ b/hosts/nb/modules/development/nvim/config/terminal.lua
@@ -37,10 +37,13 @@ local config = {
   -- lvim.builtin.terminal.execs[#lvim.builtin.terminal.execs+1] = {"gdb", "tg", "GNU Debugger"}
   -- TODO: pls add mappings in which key and refactor this
   execs = {
-    { vim.o.shell, "<M-1>", "Horizontal Terminal", "horizontal", 0.3 },
-    { vim.o.shell, "<M-2>", "Vertical Terminal", "vertical", 0.4 },
-    { vim.o.shell, "<M-3>", "Float Terminal", "float", nil },
-    { vim.o.shell, "<C-a>", "AI Agent Terminal", "float", nil },
+    -- { vim.o.shell, "<M-1>", "Horizontal Terminal", "horizontal", 0.3 },
+    -- { vim.o.shell, "<M-2>", "Vertical Terminal", "vertical", 0.4 },
+    { vim.o.shell, "<M-1>", "Float Terminal 1", "float", nil },
+    { vim.o.shell, "<M-2>", "Float Terminal 2", "float", nil },
+    { vim.o.shell, "<M-3>", "Float Terminal 3", "float", nil },
+    { vim.o.shell, "<M-4>", "Float Terminal 4", "float", nil },
+    { vim.o.shell, "<M-5>", "Float Terminal 5", "float", nil },
   },
 }
 
@@ -81,7 +84,7 @@ Add_exec = function(opts)
   end
 
   vim.keymap.set({ "n", "t" }, opts.keymap, function()
-    M._exec_toggle { cmd = opts.cmd, count = opts.count, direction = opts.direction, size = opts.size() }
+    _exec_toggle { cmd = opts.cmd, count = opts.count, direction = opts.direction, size = opts.size() }
   end, { desc = opts.label, noremap = true, silent = true })
 end
 
diff --git a/utils/modules/autoupgrade.nix b/utils/modules/autoupgrade.nix
index aabfc06..8c34a37 100644
--- a/utils/modules/autoupgrade.nix
+++ b/utils/modules/autoupgrade.nix
@@ -1,6 +1,13 @@
-{ config, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   system.autoUpgrade.enable = true;
   system.autoUpgrade.allowReboot = false;
+
+  # Skip auto-upgrade when on battery to save power
+  systemd.services.nixos-upgrade = {
+    unitConfig = {
+      ConditionACPower = true;
+    };
+  };
 }