diff options
| author | makefu <github@syntax-fehler.de> | 2017-02-04 14:31:47 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-02-04 14:31:47 +0100 |
| commit | d6c9edd9dc860d560d4ea7a727962aaf93d09322 (patch) | |
| tree | aefb49a9372b959cd722bdfcf51001783cda8bb1 /lass/2configs/default.nix | |
| parent | d2df5375e705e55764b4cacd4ea32dffcb4c6041 (diff) | |
| parent | 8daef993dcb6149a02c72a4895d6e808a6c6a8d4 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/2configs/default.nix')
| -rw-r--r-- | lass/2configs/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 911b7738a..d1810c00c 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -9,6 +9,7 @@ with import <stockholm/lib>; ../2configs/mc.nix ../2configs/nixpkgs.nix ../2configs/vim.nix + ../2configs/monitoring/client.nix ./backups.nix { users.extraUsers = @@ -98,7 +99,6 @@ with import <stockholm/lib>; # multiple-definition-problem when defining environment.variables.EDITOR environment.extraInit = '' EDITOR=vim - MANPAGER=most ''; nixpkgs.config.allowUnfree = true; |