Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'staging/jeschli' of prism.r:stockholm

Browse Source
This commit is contained in:
Markus Hihn 2018-01-05 09:56:54 +01:00
commit 5d87fd8caa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeschli/1systems/brauerei/config.nix
View File

@ -96,7 +96,7 @@
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; services.xserver.enable = true;
# services.xserver.layout = "us"; services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e"; # services.xserver.xkbOptions = "eurosign:e";
# Enable touchpad support. # Enable touchpad support.

2
jeschli/source.nix
View File

@ -10,7 +10,7 @@ in
nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix"; nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix";
nixpkgs.git = { nixpkgs.git = {
url = https://github.com/nixos/nixpkgs; url = https://github.com/nixos/nixpkgs;
ref = "f9390d6"; ref = "d83c808";
}; };
secrets.file = getAttr builder { secrets.file = getAttr builder {
buildbot = toString <stockholm/jeschli/2configs/tests/dummy-secrets>; buildbot = toString <stockholm/jeschli/2configs/tests/dummy-secrets>;