From 97b17113791d3410bb2fc8307a3a26a47594fcf8 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 15 Oct 2015 00:19:12 +0200
Subject: tv base: environment.variables.EDITOR = "vim"

---
 tv/2configs/base.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'tv/2configs/base.nix')

diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix
index 1c6eba662..a5ad7c7d3 100644
--- a/tv/2configs/base.nix
+++ b/tv/2configs/base.nix
@@ -79,11 +79,7 @@ in
       environment.etc."vim/vim${majmin pkgs.vim.version}".source =
           "${pkgs.vim}/share/vim/vim${majmin pkgs.vim.version}";
 
-      # multiple-definition-problem when defining environment.variables.EDITOR
-      environment.extraInit = ''
-        EDITOR=vim
-      '';
-
+      environment.variables.EDITOR = lib.mkForce "vim";
       environment.variables.VIM = "/etc/vim";
     }
     {
-- 
cgit v1.2.3


From 32c8e9a10b14071c5e5b128c33eaa87a363bce81 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 15 Oct 2015 00:26:02 +0200
Subject: tv base: drop redundant "lib."

---
 tv/2configs/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/2configs/base.nix')

diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix
index a5ad7c7d3..010d4b326 100644
--- a/tv/2configs/base.nix
+++ b/tv/2configs/base.nix
@@ -79,7 +79,7 @@ in
       environment.etc."vim/vim${majmin pkgs.vim.version}".source =
           "${pkgs.vim}/share/vim/vim${majmin pkgs.vim.version}";
 
-      environment.variables.EDITOR = lib.mkForce "vim";
+      environment.variables.EDITOR = mkForce "vim";
       environment.variables.VIM = "/etc/vim";
     }
     {
-- 
cgit v1.2.3