diff --git a/modules/common.nix b/modules/common.nix
index b93302b..a39679c 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -39,11 +39,9 @@
   environment.pathsToLink = [ "/libexec" ];
   environment.systemPackages = with pkgs; [
     curl
-    git
     htop
     pciutils
     psmisc
-    vim
   ];
 
   # - Modules ------------------------------------
@@ -53,6 +51,7 @@
   samfelag.modules = {
     shell.utils.enable = true;
     shell.zsh.enable = true;
+    editors.vim.enable = true;
     dev.git.enable = true;
 
     # May go away from common if not all hosts use it
diff --git a/modules/editors/vim.nix b/modules/editors/vim.nix
new file mode 100644
index 0000000..c89fd23
--- /dev/null
+++ b/modules/editors/vim.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.samfelag.modules.editors.vim;
+in
+{
+  options.samfelag.modules.editors.vim = {
+    enable = lib.mkEnableOption "vim";
+  };
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      vim
+    ];
+  };
+}