summaryrefslogtreecommitdiffstats
path: root/tv/2configs/base.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-10-27 18:12:29 +0100
committermakefu <github@syntax-fehler.de>2015-10-27 18:12:29 +0100
commita85114c59c5102b839584f72454bca2c8abbb887 (patch)
tree18fc24394171f4afae3dee0e68e3781df75723ea /tv/2configs/base.nix
parentfe4f5b98b91f6bacb036d57b5322fb4e09c22f14 (diff)
parent20ad77468131b7c69c5b3a26ea149ae7fdc0173b (diff)
Merge branch 'master' of pnp:stockholm
Diffstat (limited to 'tv/2configs/base.nix')
-rw-r--r--tv/2configs/base.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix
index 010d4b32..0a8dbdcc 100644
--- a/tv/2configs/base.nix
+++ b/tv/2configs/base.nix
@@ -15,6 +15,12 @@ in
imports = [
{
+ # stockholm dependencies
+ environment.systemPackages = with pkgs; [
+ git
+ ];
+ }
+ {
# TODO never put hashedPassword into the store
users.extraUsers =
mapAttrs (_: h: { hashedPassword = h; })
@@ -147,10 +153,9 @@ in
}
{
- nixpkgs.config.packageOverrides = pkgs:
- {
- nano = pkgs.runCommand "empty" {} "mkdir -p $out";
- };
+ nixpkgs.config.packageOverrides = pkgs: {
+ nano = pkgs.vim;
+ };
services.cron.enable = false;
services.nscd.enable = false;