diff --git a/common/default.nix b/common/default.nix
index 7fe6eda..6a203ff 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -37,6 +37,9 @@
   environment.enableAllTerminfo = true;
   environment.variables.COLORTERM = "truecolor";
 
+  # Set editor
+  environment.variables.EDITOR = "hx";
+
   # Packages used on all systems
   environment.systemPackages = with pkgs; [
     git
@@ -47,6 +50,9 @@
     sqlite-interactive
   ];
 
+  # 🥺
+  # security.please.enable = true;
+
   ## Locale/Timezone
 
   time.timeZone = "Europe/Berlin";
diff --git a/common/home_manager/common.nix b/common/home_manager/common.nix
index b495aa5..9022d55 100644
--- a/common/home_manager/common.nix
+++ b/common/home_manager/common.nix
@@ -14,6 +14,7 @@ in {
     home.packages = with pkgs; [
       bat
       btop
+      choose
       exa
       fzf
       gnupg
@@ -37,6 +38,7 @@ in {
             "log --graph --pretty=format:'%h -%d %s -%an %n' --abbrev-commit --date=relative --branches";
           pfusch = "push --force-with-lease";
           stat = "diff --compact-summary";
+          undo = "reset --soft HEAD~";
         };
         extraConfig = {
           init = { defaultBranch = "mistress"; };
@@ -107,6 +109,12 @@ in {
           }
         ];
       };
+
+      command-not-found.enable = false;
+      nix-index = {
+        enable = true;
+        enableFishIntegration = true;
+      };
     };
   };
 }
diff --git a/common/home_manager/helix.nix b/common/home_manager/helix.nix
index ebe213b..8c737e3 100644
--- a/common/home_manager/helix.nix
+++ b/common/home_manager/helix.nix
@@ -48,6 +48,11 @@ in {
               newline = "none";
             };
 
+            whitespace.characters = {
+              tab = "·";
+              tabpad = "·";
+            };
+
             indent-guides = {
               render = true;
               character = "┊";
@@ -64,6 +69,8 @@ in {
             normal = {
               "C-left" = [ "move_prev_word_start" "collapse_selection" ];
               "C-right" = [ "move_next_word_start" "collapse_selection" ];
+              "A-d" = "delete_selection";
+              "d" = "delete_selection_noyank";
             };
           };
         };