diff options
| author | makefu <github@syntax-fehler.de> | 2016-10-19 12:32:12 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-10-19 12:32:12 +0200 |
| commit | 0868101f2adc00f4e13a4ea242dc3bd23070917f (patch) | |
| tree | a155571c2c448e51e5b1461228d7b46dda64a07f /lass/1systems/mors.nix | |
| parent | ccd89b19f3fbbb6acb94be8f9f54d4e673ee33dc (diff) | |
| parent | ce58a50de30fd49d4c000a81f9b7ce9baf0ccd66 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'lass/1systems/mors.nix')
| -rw-r--r-- | lass/1systems/mors.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 1aa4d9b2..1028ca65 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -23,7 +23,7 @@ with config.krebs.lib; ../2configs/teamviewer.nix ../2configs/libvirt.nix ../2configs/fetchWallpaper.nix - ../2configs/c-base.nix + #../2configs/c-base.nix ../2configs/mail.nix ../2configs/krebs-pass.nix ../2configs/repo-sync.nix @@ -54,8 +54,8 @@ with config.krebs.lib; enable = true; package = pkgs.postgresql; }; - virtualisation.docker.enable = true; - users.users.mainUser.extraGroups = [ "docker" ]; + #virtualisation.docker.enable = true; + #users.users.mainUser.extraGroups = [ "docker" ]; } { lass.umts = { @@ -140,6 +140,11 @@ with config.krebs.lib; device = "/dev/big/conf"; fsType = "ext4"; }; + "/tmp" = { + device = "tmpfs"; + fsType = "tmpfs"; + options = ["nosuid" "nodev" "noatime"]; + }; }; services.udev.extraRules = '' @@ -192,8 +197,12 @@ with config.krebs.lib; urban mk_sql_pair remmina + thunderbird logf + iodine + + macchanger ]; #TODO: fix this shit |