diff --git a/flake.nix b/flake.nix
index f6549e4..83b4d1f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,6 +47,7 @@
     nixpkgs,
     nixpkgs-unstable,
     home-manager,
+    nixvim,
     ...
   } @ inputs: let
     inherit (self) outputs;
@@ -69,6 +70,9 @@
     # Other options beside 'alejandra' include 'nixpkgs-fmt'
     formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
 
+    nixpkgs.overlays = [
+      nixvim.overlays.default
+    ];
     # Your custom packages and modifications, exported as overlays
     overlays = import ./overlays {inherit inputs;};
     # Reusable nixos modules you might want to export
diff --git a/home-manager/home.nix b/home-manager/home.nix
index ef5db96..6279877 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -144,6 +144,15 @@
       "pkcs11"
     ];
   };
+  
+  #programs.keychain = {
+  #  enable = true;
+  #  enableZshIntegration = true;
+  #  keys = [
+  #    "id_rsa"
+  #  ];
+  #  enableXsessionIntegration = true;
+  #};
 
   systemd.user.sessionVariables.SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh";
 
diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix
index 3b7f48e..f56baad 100644
--- a/hosts/common/packages.nix
+++ b/hosts/common/packages.nix
@@ -20,7 +20,7 @@
   };
 
   environment.systemPackages = with pkgs; [
-    # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     # wget
     ntfs3g
     dosfstools
diff --git a/hosts/common/services.nix b/hosts/common/services.nix
index f6097e3..d3ed722 100644
--- a/hosts/common/services.nix
+++ b/hosts/common/services.nix
@@ -44,7 +44,7 @@
   programs.mtr.enable = true;
   programs.gnupg.agent = {
     enable = true;
-    enableSSHSupport = true;
+    # enableSSHSupport = true;
   };
 
   # This setups a SSH server. Very important if you're setting up a headless system.
@@ -59,6 +59,12 @@
     };
   };
 
+  programs.ssh = {
+    startAgent = true;
+    forwardX11 = true;
+    enableAskPassword = true;
+  };
+
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];