summaryrefslogtreecommitdiffstats
path: root/jeschli/1systems/brauerei/config.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-03-24 12:45:35 +0100
committerlassulus <lassulus@lassul.us>2018-03-24 12:45:35 +0100
commitdb37440bbb468e6ebdafc2de1d07872f0f726501 (patch)
tree0f049cbfe9be4cbc7c03c472da273c4c79eb3cd6 /jeschli/1systems/brauerei/config.nix
parentd810727b985bbdce57ae2de515111949c141c3bd (diff)
parent4851f6b43ff2eebecf5f1dc6a808225ee1af0f08 (diff)
Merge branch 'master' into staging/18.03
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;