diff --git a/common/home_manager/common.nix b/common/home_manager/common.nix
index 5716732..b495aa5 100644
--- a/common/home_manager/common.nix
+++ b/common/home_manager/common.nix
@@ -38,7 +38,10 @@ in {
           pfusch = "push --force-with-lease";
           stat = "diff --compact-summary";
         };
-        extraConfig = { init = { defaultBranch = "mistress"; }; };
+        extraConfig = {
+          init = { defaultBranch = "mistress"; };
+          core = { editor = "hx"; };
+        };
       };
 
       starship = {
diff --git a/common/home_manager/helix.nix b/common/home_manager/helix.nix
index 270be56..ebe213b 100644
--- a/common/home_manager/helix.nix
+++ b/common/home_manager/helix.nix
@@ -2,7 +2,7 @@
 let
   unstable = import
     (builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master") {
-      config = config.nixpkgs.config;
+      inherit (config.nixpkgs) config;
     };
 in {
   home-manager.users.agatha = {