summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Hihn <markus.hihn@dcso.de>2018-01-05 09:56:54 +0100
committerMarkus Hihn <markus.hihn@dcso.de>2018-01-05 09:56:54 +0100
commit0f6666f7944f0146d5a2ef85741ad5bc1bc2c17a (patch)
tree53b9683d8192d81375f66228b0e496e6d647d64a
parent06e9ff116be37d22c05913351137a15d40626f10 (diff)
parent221671d0b115a8baaebb2644b5316ce79e8edad9 (diff)
Merge branch 'staging/jeschli' of prism.r:stockholm
-rw-r--r--jeschli/1systems/brauerei/config.nix2
-rw-r--r--jeschli/source.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index 171a002..2dec457 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -96,7 +96,7 @@
# Enable the X11 windowing system.
services.xserver.enable = true;
- # services.xserver.layout = "us";
+ services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e";
# Enable touchpad support.
diff --git a/jeschli/source.nix b/jeschli/source.nix
index d1b64b0..ae9e1e7 100644
--- a/jeschli/source.nix
+++ b/jeschli/source.nix
@@ -10,7 +10,7 @@ in
nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix";
nixpkgs.git = {
url = https://github.com/nixos/nixpkgs;
- ref = "f9390d6";
+ ref = "d83c808";
};
secrets.file = getAttr builder {
buildbot = toString <stockholm/jeschli/2configs/tests/dummy-secrets>;