summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-04-11 19:42:43 +0200
committerlassulus <lass@lassul.us>2017-04-11 19:42:43 +0200
commitfc404a10e6a84b9432d1397688dee639d7e7c915 (patch)
tree9aedc7b394acdff1bd22f882718f07cfe2ce62dc
parent4642786cef32c94a2aad30c2297817d8a157834b (diff)
parent6edf616847178eaa4bed454f2c2fc7687fd78838 (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--tv/2configs/default.nix2
-rw-r--r--tv/2configs/vim.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index d17e41351..618dcdccb 100644
--- a/tv/2configs/default.nix
+++ b/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";
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 8b83b0503..b534c3f42 100644
--- a/tv/2configs/vim.nix
+++ b/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