diff options
| author | Markus Hihn <markus.hihn@dcso.de> | 2018-01-05 09:56:54 +0100 |
|---|---|---|
| committer | Markus Hihn <markus.hihn@dcso.de> | 2018-01-05 09:56:54 +0100 |
| commit | 5d87fd8caa64b48df8ac9704400de0542acbc539 (patch) | |
| tree | 9ac6d5eb2f934d1ffe9c5cab3d78fa735fee01a3 | |
| parent | 08fa15d17350f78ee6a85e5d7194ce663e0103a9 (diff) | |
| parent | 63800b93ffb9e1e612f2d51ff88597b351caeefb (diff) | |
Merge branch 'staging/jeschli' of prism.r:stockholm
| -rw-r--r-- | jeschli/1systems/brauerei/config.nix | 2 | ||||
| -rw-r--r-- | jeschli/source.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 171a002da..2dec45795 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 d1b64b0ed..ae9e1e72e 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>; |