diff options
| author | tv <tv@krebsco.de> | 2016-04-07 20:29:33 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-04-07 20:29:33 +0200 |
| commit | e1a287c78bab2847fee7c4f1a18a765d89ca373f (patch) | |
| tree | 336fc62199af9b1c38acf2de0a2bafbe8ed72efc /lass/2configs/base.nix | |
| parent | 033bf438bd2ae39d6a465c475500a24514cc2739 (diff) | |
| parent | 66b7a76a26a40bd4ecca8c83aafe5f2e5fefa461 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'lass/2configs/base.nix')
| -rw-r--r-- | lass/2configs/base.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index d2c96fdaa..8017d4270 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -54,8 +54,8 @@ with config.krebs.lib; #secrets-common = "/home/lass/secrets/common"; stockholm = "/home/lass/stockholm"; nixpkgs = { - url = https://github.com/Lassulus/nixpkgs; - rev = "d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce"; + url = https://github.com/NixOS/nixpkgs; + rev = "40c586b7ce2c559374df435f46d673baf711c543"; dev = "/home/lass/src/nixpkgs"; }; } // optionalAttrs config.krebs.build.host.secure { @@ -68,8 +68,9 @@ with config.krebs.lib; users.mutableUsers = false; + services.timesyncd.enable = true; + #why is this on in the first place? - services.ntp.enable = false; services.nscd.enable = false; boot.tmpOnTmpfs = true; @@ -81,7 +82,7 @@ with config.krebs.lib; # multiple-definition-problem when defining environment.variables.EDITOR environment.extraInit = '' EDITOR=vim - PAGER=most + MANPAGER=most ''; environment.systemPackages = with pkgs; [ @@ -104,6 +105,9 @@ with config.krebs.lib; #stuff for dl aria2 + + #neat utils + krebspaste ]; programs.bash = { |