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 | 32e1764b1972ee109ec3687dfec8645f365de9ea (patch) | |
| tree | 6fd254345fb0378fabbfd74c79ab578c17bbfc94 /shared | |
| parent | e4f43d0732b30381f8c92854fc603329b27084ca (diff) | |
| parent | af162549b12cc7b1f496b2d4d8fe99c9dab85428 (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 cae2bc8..49c0d3d 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 |