summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2020-04-22 12:57:16 +0200
committerlassulus <lassulus@lassul.us>2020-04-22 12:57:16 +0200
commitd5851b50c589a18281081212b18533fb6b0d1c43 (patch)
tree8f3d63d4493c7aceb5b022ecf551f05cd0dc937c
parentd23fa4802edf7835c68de1fcce08d7b2643c9d48 (diff)
parent3c0496ec1a774c539cf10311bff821ff07ddbf01 (diff)
Merge remote-tracking branch 'enklave/master' into 20.0320.03
-rw-r--r--jeschli/1systems/reagenzglas/config.nix1
m---------jeschli/2configs/elisp0
2 files changed, 0 insertions, 1 deletions
diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index b3b33558..dec69563 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -7,7 +7,6 @@
<stockholm/jeschli/2configs/emacs.nix>
<stockholm/jeschli/2configs/firefox.nix>
<stockholm/jeschli/2configs/rust.nix>
- <stockholm/jeschli/2configs/haskell.nix>
<stockholm/jeschli/2configs/steam.nix>
<stockholm/jeschli/2configs/python.nix>
./desktop.nix
diff --git a/jeschli/2configs/elisp b/jeschli/2configs/elisp
-Subproject ae1a03ddee80d73ac166af75cdb1d93d24fa44b
+Subproject 279d6a01f5abbab5d28d3a57549b7fec800a510