From a92d79f96f2c4bacf489c73b2040906e6a51a1e5 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Sat, 24 Oct 2020 10:12:39 -0500
Subject: [PATCH] More modularization

---
 env/nix/modules/neovim.nix | 11 ++++++++++-
 env/nix/profiles/base.nix  |  5 -----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/env/nix/modules/neovim.nix b/env/nix/modules/neovim.nix
index 0f3b2f7..162bf31 100644
--- a/env/nix/modules/neovim.nix
+++ b/env/nix/modules/neovim.nix
@@ -1,3 +1,12 @@
 { config, pkgs, ... }: {
-	environment.systemPackages = [ pkgs.neovim ];
+	environment = {
+		systemPackages = [ pkgs.neovim ];
+		variables = {
+			EDITOR = "nvim";
+		};
+		shellAliases = {
+			vim = "neovim";
+			vi = "neovim";
+		};
+	};
 }
diff --git a/env/nix/profiles/base.nix b/env/nix/profiles/base.nix
index ba9e6da..3f7dd42 100644
--- a/env/nix/profiles/base.nix
+++ b/env/nix/profiles/base.nix
@@ -21,14 +21,9 @@
 			unzip
 		];
 		variables = {
-			EDITOR = "nvim";
 			PAGER = "less";
 			VISUAL = "less";
 		};
-		shellAliases = {
-			vim = "neovim";
-			vi = "neovim";
-		};
 	};
 
   programs = {