Merge remote-tracking branch 'ni/master'

tv/2configs/default.nix

@@ -14,7 +14,7 @@ with import <stockholm/lib>;
       stockholm.file = "/home/tv/stockholm";
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
-        ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03
+        ref = "69d9061908162bd973fcf34d0fc6dc9d9f8cf9ed"; # nixos-17.03
       };
     } // optionalAttrs host.secure {
       secrets-master.file = "/home/tv/secrets/master";

tv/2configs/vim.nix

@@ -4,7 +4,7 @@ with import <stockholm/lib>;
 let {
   body = {
     environment.systemPackages = [
-      vim
+      vim-wrapper
     ];
 
     environment.etc.vimrc.source = vimrc;
@@ -297,7 +297,7 @@ let {
     alldirs = attrValues dirs ++ map dirOf (attrValues files);
   in unique (sort lessThan alldirs);
 
-  vim = pkgs.concat "vim" [
+  vim-wrapper = pkgs.concat "vim" [
     pkgs.vim_configurable
     (pkgs.writeDashBin "vim" ''
       set -efu