summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-10-28 15:15:21 +0200
committermakefu <github@syntax-fehler.de>2016-10-28 15:15:21 +0200
commitd4f36e8ff5891fee46f85fbc086dbfe5c6f6fb35 (patch)
tree2b261ab7e8bf4d86fb9ab0132aed7167811e6b45 /lass
parentc26a3ce4b465db07f3d94e263588b96d167e53fa (diff)
parent98659a68c7c40bee92e851afcf5a9bebeb3e2a06 (diff)
Merge remote-tracking branch 'prism/lassulus'
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/mors.nix2
-rw-r--r--lass/2configs/go.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index c3d027edc..742d42bf8 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -54,7 +54,7 @@ with import <stockholm/lib>;
enable = true;
package = pkgs.postgresql;
};
- #virtualisation.docker.enable = true;
+ virtualisation.docker.enable = true;
#users.users.mainUser.extraGroups = [ "docker" ];
}
{
diff --git a/lass/2configs/go.nix b/lass/2configs/go.nix
index 7d694c173..f6ddbe96d 100644
--- a/lass/2configs/go.nix
+++ b/lass/2configs/go.nix
@@ -3,7 +3,7 @@
with import <stockholm/lib>;
{
environment.systemPackages = [
- pkgs.go
+ pkgs.go-shortener
];
krebs.go = {
enable = true;