From 97b17113791d3410bb2fc8307a3a26a47594fcf8 Mon Sep 17 00:00:00 2001 From: tv 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') 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 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') 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 From 7eb564d0eff22226a2e9955a3c239d1a770bde93 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 15 Oct 2015 02:00:32 +0200 Subject: push: init at 1.0.0 --- tv/2configs/git.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'tv/2configs') diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index 401cf5f4d..d782c87f1 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -35,6 +35,7 @@ let nixos-infest = {}; nixpkgs = {}; painload = {}; + push = {}; quipper = {}; regfish = {}; stockholm = { -- cgit v1.2.3