diff options
| author | nin <nineinchnade@gmail.com> | 2017-03-07 16:27:15 +0100 |
|---|---|---|
| committer | nin <nineinchnade@gmail.com> | 2017-03-07 16:27:15 +0100 |
| commit | 2edd8ca37b5c134b697315fd7ab603807760e6d6 (patch) | |
| tree | 4fa4df81774907b797d04707028406788d7297e1 /shared | |
| parent | 01868340e25ffb05ea8b784c5cdf47c251157dfb (diff) | |
| parent | c05db2409061f721ba454f4bf79e635ee13a6f11 (diff) | |
Merge remote-tracking branch 'prism/newest'
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/2configs/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/shared/2configs/default.nix b/shared/2configs/default.nix index cae2bc814..49c0d3d95 100644 --- a/shared/2configs/default.nix +++ b/shared/2configs/default.nix @@ -11,7 +11,7 @@ with import <stockholm/lib>; nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "b8ede35d2efa96490857c22c751e75d600bea44f"; # nixos-16.09 @ 2016-10-19 + ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03 @ 2017-03-03 }; secrets.file = if getEnv "dummy_secrets" == "true" @@ -30,10 +30,6 @@ with import <stockholm/lib>; ]; nix.useSandbox = true; - nixpkgs.config.packageOverrides = pkgs: { - nano = pkgs.vim; - }; - environment.systemPackages = with pkgs; [ git rxvt_unicode.terminfo |