diff --git a/machines/oracle/configuration.nix b/machines/oracle/configuration.nix
index e5840bf..bd029fe 100644
--- a/machines/oracle/configuration.nix
+++ b/machines/oracle/configuration.nix
@@ -15,7 +15,27 @@
     PasswordAuthentication = false;
   };
 
+  environment.systemPackages = with pkgs; [ wireguard-tools ];
+
+  # Wireguard tunnel
+  age.secrets.wireguardOracle.file = "../../secrets/wireguard-oracle.age";
+  networking.wg-quick.interfaces = {
+    wg0 = {
+      address = [ "10.0.10.1/24" ];
+      listenPort = 51820;
+      privateKeyFile = config.age.secrets.wireguardOracle.path;
+
+      peers = [
+        {
+          publicKey = "iKJO9Q8LsdCdApapTX9CJmrtAKn1TYhg4YUiBUBPzmo=";
+          allowedIPs = "10.0.10.2/32";
+        };
+      ];
+    };
+  };
+
   programs.zsh.enable = true;
+  environment.variables.EDITOR = "nvim";
 
   users.users.michael = {
     isNormalUser  = true;
diff --git a/machines/thinkcentre/configuration.nix b/machines/thinkcentre/configuration.nix
index db0b945..9553288 100644
--- a/machines/thinkcentre/configuration.nix
+++ b/machines/thinkcentre/configuration.nix
@@ -11,6 +11,24 @@
   networking.hostName = "venus"; # Define your hostname.
   networking.nameservers = ["1.1.1.1" "8.8.8.8"];
 
+  # Wireguard tunnel to oracle
+  age.secrets.wireguardThinkcentre.file = "../../secrets/wireguard-thinkcentre.age";
+  networking.wg-quick.interfaces = {
+    wg0 = {
+      address = [ "10.0.10.2/32" ];
+      listenPort = 51820;
+      privateKeyFile = config.age.secrets.wireguardThinkcentre.path;
+
+      peers = [
+        {
+          publicKey = "sdqT2l1HRe9rDYejJ+luQK8zdC+/KqDuQ1rpvZq/KlQ=";
+          endpoint = "150.136.162.107:51820";
+          allowedIPs = "10.0.10.1/24";
+        };
+      ];
+    };
+  };
+
   # Set your time zone.
   time.timeZone = "America/New_York";
 
diff --git a/secrets/wireguard-oracle.age b/secrets/wireguard-oracle.age
index e69de29..9e52161 100644
--- a/secrets/wireguard-oracle.age
+++ b/secrets/wireguard-oracle.age
@@ -0,0 +1,5 @@
+age-encryption.org/v1
+-> ssh-ed25519 XlaGxQ 64T+sKc6cuLGJpF2mjdRoLupmh4r4xDJYWnz2XtW5yw
+Fn2imf2lLbjRLQOG7FP844OfmLm2uX3zz+mEy4k4PbM
+--- hVrfmKh1csvwWIvzvdcOiJVM9+KzG1xLr5eYj9qZ3oE
+*�����n���zkXI�`{#.=�,���`W�gh��c.��[�w�J��d��V,�ߖ&iz����L�9B�"u}�͟
\ No newline at end of file
diff --git a/user/environments/nixos-server/home.nix b/user/environments/nixos-server/home.nix
index 8239aeb..ffd76fb 100644
--- a/user/environments/nixos-server/home.nix
+++ b/user/environments/nixos-server/home.nix
@@ -5,9 +5,12 @@
   ];
 
   home.packages = with pkgs; [
-    neovim
     lazygit
   ];
 
+  programs.neovim = {
+    enable = true;
+  };
+
   home.stateVersion = "21.05";
 }