makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse source
This commit is contained in:
lassulus 2017-04-11 19:42:43 +02:00
parent 4642786cef 6edf616847
commit fc404a10e6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tv/2configs/default.nix
View file

@ -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";

4
tv/2configs/vim.nix
View file

@ -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