summaryrefslogtreecommitdiffstats
path: root/jeschli/1systems/brauerei/config.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-04-04 15:23:44 +0200
committermakefu <github@syntax-fehler.de>2018-04-04 15:23:44 +0200
commit3ed84b0b8c063a294e7cb40a786fa7a15ee0e5a4 (patch)
tree569658ceb8fc90f640d7ce48357eb84a0383b494 /jeschli/1systems/brauerei/config.nix
parent1b740bf9ef32972f7242226699a75b39feeb18b2 (diff)
parent1a5b58c828409ce9bf1639f3f26ebeb142e0148a (diff)
Merge remote-tracking branch 'lass/staging/18.03' into staging
Diffstat (limited to 'jeschli/1systems/brauerei/config.nix')
-rw-r--r--jeschli/1systems/brauerei/config.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index eb2bb11d2..1203720a5 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -5,6 +5,7 @@
<stockholm/jeschli>
./hardware-configuration.nix
<stockholm/jeschli/2configs/urxvt.nix>
+ <stockholm/jeschli/2configs/emacs.nix>
];
krebs.build.host = config.krebs.hosts.brauerei;
[cgit] Unable to lock slot /tmp/cgit/eb200000.lock: No such file or directory (2)