diff --git a/hosts/cityseventeen/apps.nix b/hosts/cityseventeen/apps.nix
index 464851f..743169e 100644
--- a/hosts/cityseventeen/apps.nix
+++ b/hosts/cityseventeen/apps.nix
@@ -22,6 +22,7 @@ in
         enable = true;
         wallpaper = inputs.wallpkgs.wallpapers.rose-pine.rose_pine-04.path;
       };
+      foot.enable = true;
       waybar.enable = true;
       mako.enable = true;
       direnv.enable = true;
diff --git a/hosts/cityseventeen/users/arturm/configs/niri/config.kdl b/hosts/cityseventeen/users/arturm/configs/niri/config.kdl
index 72fe364..30b5ded 100644
--- a/hosts/cityseventeen/users/arturm/configs/niri/config.kdl
+++ b/hosts/cityseventeen/users/arturm/configs/niri/config.kdl
@@ -300,14 +300,14 @@ binds {
     Mod+Shift+Slash { show-hotkey-overlay; }
 
     // Suggested binds for running programs: terminal, app launcher, screen locker.
-    Mod+E { spawn "emacsclient" "-c"; }
-    Mod+T { spawn "foot"; }
+    Mod+E hotkey-overlay-title="Spawn a new Emacs frame" { spawn "emacsclient" "-c"; }
+    Mod+T hotkey-overlay-title="Spawn a terminal" { spawn "footclient"; }
     Mod+D { spawn "fuzzel"; }
     // Super+Alt+L { spawn "swaylock"; }
 
     // You can also use a shell. Do this if you need pipes, multiple commands, etc.
     // Note: the entire command goes as a single argument in the end.
-    // Mod+T { spawn "basqh" "-c" "notify-send hello && exec alacritty"; }
+    // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
 
     // 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/hosts/cityseventeen/users/arturm/default.nix b/hosts/cityseventeen/users/arturm/default.nix
index b65ec8f..7596304 100644
--- a/hosts/cityseventeen/users/arturm/default.nix
+++ b/hosts/cityseventeen/users/arturm/default.nix
@@ -34,7 +34,6 @@
         evolution
         gh
         fuzzel
-        foot
         signal-desktop-bin
         dino
         polari
diff --git a/hosts/shared/foot.nix b/hosts/shared/foot.nix
new file mode 100644
index 0000000..8727af7
--- /dev/null
+++ b/hosts/shared/foot.nix
@@ -0,0 +1,22 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.alqueva.programs.foot;
+  inherit (lib.modules) mkIf;
+  inherit (lib.options) mkEnableOption mkPackageOption;
+in
+{
+  options.alqueva.programs.foot = {
+    enable = mkEnableOption "foot";
+    package = mkPackageOption pkgs "foot" { };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+    systemd.packages = [ cfg.package ];
+  };
+}