diff --git a/home-manager/roles/hotkeys.nix b/home-manager/roles/hotkeys.nix
index 373357f2..1234681d 100644
--- a/home-manager/roles/hotkeys.nix
+++ b/home-manager/roles/hotkeys.nix
@@ -1,5 +1,6 @@
 {pkgs, ...}: let
   fork = cmd: "fork ${cmd}";
+  edit_dir = dir: "sh -c 'cd ${dir}; vim ${dir}'";
 in [
   {
     Orga = [
@@ -9,7 +10,7 @@ in [
       {Tasks = "tasksh";}
       {Meditate = "meditate";}
       {Pythia = "pythia";}
-      {Notes = "vim ~/git/notes";}
+      {Notes = edit_dir "~/git/notes";}
     ];
   }
   {
@@ -18,7 +19,7 @@ in [
       Open = fork "evince ~/git/promotion/out/print.pdf";
       Build = "sh -c 'cd ~/git/promotion; flix develop -c flix run'";
       Directory = fork "footclient -d ~/git/promotion";
-      Edit = "vim ~/git/promotion";
+      Edit = edit_dir "~/git/promotion";
     };
   }
   {
@@ -67,7 +68,7 @@ in [
   {
     Apps = {
       Editor = fork "codium";
-      Config = "vim ~/git/config";
+      Config = edit_dir "~/git/config";
       Files = fork "nautilus";
       DarkTerminal = fork "footclient -o 'color.background=000000' -o 'foreground=ffffff'";
       Accounting = {
diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix
index 70a17db9..717ecd4a 100644
--- a/overlays/pkgSets.nix
+++ b/overlays/pkgSets.nix
@@ -115,6 +115,9 @@ self: super: {
       window-is-ready-remover
       nothing-to-say
       notification-banner-position
+      windownavigator
+      user-themes
+      removable-drive-menu
       gtile
       caffeine
       dash-to-panel
@@ -130,7 +133,6 @@ self: super: {
       (self.gnome)
       dconf-editor
       gnome-tweaks
-      gnome-shell-extensions
       adwaita-icon-theme
       gnome-session
       ;