diff --git a/components/yubikey.nix b/components/yubikey.nix
index deb808a..5c24dd3 100644
--- a/components/yubikey.nix
+++ b/components/yubikey.nix
@@ -16,8 +16,14 @@ with lib;
     services.pcscd.enable = true;
     services.udev.packages = [ pkgs.yubikey-personalization ];
 
+
     environment.systemPackages = [
 
+      pkgs.yubikey-personalization
+      pkgs.yubikey-personalization-gui
+      pkgs.yubikey-manager
+      pkgs.yubikey-manager-qt
+
       # for `gpg --export $keyid | hokey lint` to check keys
       #pkgs.haskellPackages.hopenpgp-tools
 
diff --git a/homes/common/default.nix b/homes/common/default.nix
index 4db163f..a32682e 100644
--- a/homes/common/default.nix
+++ b/homes/common/default.nix
@@ -1,6 +1,7 @@
 { lib, ... }:
 {
   imports = [
+    ./editor.nix
     ./oh-my-posh
     ./packages.nix
     ./terminal.nix
diff --git a/homes/palo/editor.nix b/homes/common/editor.nix
similarity index 62%
rename from homes/palo/editor.nix
rename to homes/common/editor.nix
index fe4e09e..af3fa26 100644
--- a/homes/palo/editor.nix
+++ b/homes/common/editor.nix
@@ -1,11 +1,10 @@
+{ lib, ... }:
 {
   programs.vim = {
     enable = true;
-    defaultEditor = true;
+    defaultEditor = lib.mkDefault true;
   };
-
   programs.helix = {
     enable = true;
-    # defaultEditor = true;
   };
 }
diff --git a/homes/palo/default.nix b/homes/palo/default.nix
index 27a7b7a..32946de 100644
--- a/homes/palo/default.nix
+++ b/homes/palo/default.nix
@@ -2,7 +2,6 @@
 
   imports = [
     ../common
-    ./editor.nix
     ./git.nix
     ./gpg.nix
     ./gui