diff options
author | makefu <github@syntax-fehler.de> | 2015-10-15 00:29:37 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-10-15 00:29:37 +0200 |
commit | 5d10eff1817b0d320d5ba83cdcdfe8cc99b87b19 (patch) | |
tree | 55f63ae969c2e2332fef6a951750aef31bd9b376 /tv/2configs | |
parent | 51b88fc8e3ec339445af98f2416baf71d58a7077 (diff) | |
parent | 32c8e9a10b14071c5e5b128c33eaa87a363bce81 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r-- | tv/2configs/base.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix index 1c6eba662..010d4b326 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 = mkForce "vim"; environment.variables.VIM = "/etc/vim"; } { |