diff options
| author | tv <tv@krebsco.de> | 2016-10-13 20:33:45 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-10-13 20:33:45 +0200 |
| commit | 65165f422d8e08f29ec269a3ce98e7ebfa22c622 (patch) | |
| tree | 13d15f63626129c439840a4b406e3fe4e693096f /lass/1systems/mors.nix | |
| parent | 38d26c551cf3c53151120646a893a13990b21c5c (diff) | |
| parent | 8458ffd7a00a3e4c734755de7d72f95458d1bb52 (diff) | |
Merge remote-tracking branch 'prism/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 1aa4d9b23..1028ca652 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 |