Merge branch 'master' of prism:stockholm
This commit is contained in:
commit
44d12e0037
@ -28,7 +28,7 @@ with import <stockholm/lib>;
|
|||||||
|
|
||||||
URxvt*scrollBar: false
|
URxvt*scrollBar: false
|
||||||
URxvt*urgentOnBell: true
|
URxvt*urgentOnBell: true
|
||||||
URxvt*font: xft:DejaVu Sans Mono:pixelsize=20
|
URxvt*font: xft:DejaVu Sans Mono:pixelsize=12
|
||||||
URXvt*faceSize: 12
|
URXvt*faceSize: 12
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
@ -10,7 +10,7 @@ in
|
|||||||
nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
|
nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
|
||||||
nixpkgs.git = {
|
nixpkgs.git = {
|
||||||
url = https://github.com/nixos/nixpkgs;
|
url = https://github.com/nixos/nixpkgs;
|
||||||
ref = "0b30c1d";
|
ref = "d202e30";
|
||||||
};
|
};
|
||||||
secrets = getAttr builder {
|
secrets = getAttr builder {
|
||||||
buildbot.file = toString <stockholm/lass/2configs/tests/dummy-secrets>;
|
buildbot.file = toString <stockholm/lass/2configs/tests/dummy-secrets>;
|
||||||
|
Loading…
Reference in New Issue
Block a user