diff --git a/configuration.nix b/configuration.nix
index f0bf913..1436d67 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -32,29 +32,27 @@
     systemPackages = with pkgs; [
       gcc
       git
+      ((vim_configurable.override {}).customize {
+        name = "vim";
+        vimrcConfig.customRC = ''
+          set nocompatible
+          syntax on
+
+          set colorcolumn=80,100
+          set expandtab     " Spaces instead of tabs.
+          set list          " Show hidden characters.
+          set shiftwidth=2  " # of spaces to use for each (auto)indent.
+          set tabstop=2     " # of spaces a <Tab> in the file counts for.
+        '';
+      })
     ];
     variables = {
-      EDITOR = "nvim";
+      EDITOR = "vim";
     };
   };
 
   hardware.bluetooth.enable = true;
 
-  programs.neovim = {
-    enable = true;
-    configure = {
-      customRC = ''
-      set colorcolumn=80,100
-      set expandtab     " Spaces instead of tabs.
-      set list          " Show hidden characters.
-      set shiftwidth=2  " # of spaces to use for each (auto)indent.
-      set tabstop=2     " # of spaces a <Tab> in the file counts for.
-      '';
-    };
-    viAlias = true;
-    vimAlias = true;
-  };
-
   networking.hostName = "nixos";
   networking.networkmanager.enable = true;
 
diff --git a/jrpotter/default.nix b/jrpotter/default.nix
index 47b6631..6f23e58 100644
--- a/jrpotter/default.nix
+++ b/jrpotter/default.nix
@@ -9,7 +9,7 @@
   home = {
     username = "jrpotter";
     homeDirectory = "/home/jrpotter";
-  
+
     packages = with pkgs; [
       anki-bin
       bitwarden
diff --git a/jrpotter/neovim/default.nix b/jrpotter/neovim/default.nix
index c0bf1d8..b525f57 100644
--- a/jrpotter/neovim/default.nix
+++ b/jrpotter/neovim/default.nix
@@ -77,6 +77,7 @@ in
 
   config = {
     programs.neovim = {
+      defaultEditor = true;
       plugins = map (p:
         if builtins.hasAttr "config" p then {
           inherit (p) plugin;
diff --git a/jrpotter/wezterm/wezterm.lua b/jrpotter/wezterm/wezterm.lua
index a2e3fef..cbcdea6 100644
--- a/jrpotter/wezterm/wezterm.lua
+++ b/jrpotter/wezterm/wezterm.lua
@@ -52,6 +52,11 @@ return {
       mods = 'LEADER',
       action = wezterm.action.ActivateTabRelative(-1),
     },
+    {
+      key = 'c',
+      mods = 'LEADER',
+      action = wezterm.action.SpawnTab 'CurrentPaneDomain',
+    },
     {
       -- Disallow hiding the terminal from the keyboard.
       key = 'm',