summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-08-01 22:32:14 +0200
committertv <tv@krebsco.de>2017-08-01 22:39:47 +0200
commit0b4d3edff8f3e0e33756355f1b3121cf311bafdb (patch)
tree5320efe7f63ef25de25c8e2fdf95058b176eb4df
parent24a515c4a0069828bc84ac60d239f88f9b637524 (diff)
tv: boot.tmpOnTmpfs = true
-rw-r--r--tv/1systems/mu/config.nix10
-rw-r--r--tv/1systems/nomic/config.nix3
-rw-r--r--tv/1systems/wu/config.nix10
-rw-r--r--tv/1systems/xu/config.nix10
-rw-r--r--tv/1systems/zu/config.nix10
-rw-r--r--tv/2configs/default.nix2
6 files changed, 2 insertions, 43 deletions
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 4c6d16329..01de9ee6b 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -50,11 +50,6 @@ with import <stockholm/lib>;
"/boot" = {
device = "/dev/sda1";
};
- "/tmp" = {
- device = "tmpfs";
- fsType = "tmpfs";
- options = [ "nosuid" "nodev" "noatime" ];
- };
};
swapDevices =[ ];
@@ -152,9 +147,4 @@ with import <stockholm/lib>;
"networkmanager"
];
};
-
- # see tmpfiles.d(5)
- systemd.tmpfiles.rules = [
- "d /tmp 1777 root root - -" # does this work with mounted /tmp?
- ];
}
diff --git a/tv/1systems/nomic/config.nix b/tv/1systems/nomic/config.nix
index d0144986b..64cccde0c 100644
--- a/tv/1systems/nomic/config.nix
+++ b/tv/1systems/nomic/config.nix
@@ -52,9 +52,6 @@ with import <stockholm/lib>;
swapDevices = [ ];
- # TODO base
- boot.tmpOnTmpfs = true;
-
environment.systemPackages = with pkgs; [
(writeDashBin "play" ''
set -euf
diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix
index 5ec6a462e..cdcaa98d9 100644
--- a/tv/1systems/wu/config.nix
+++ b/tv/1systems/wu/config.nix
@@ -45,11 +45,6 @@ with import <stockholm/lib>;
"/boot" = {
device = "/dev/sda1";
};
- "/tmp" = {
- device = "tmpfs";
- fsType = "tmpfs";
- options = ["nosuid" "nodev" "noatime"];
- };
};
krebs.nixpkgs.allowUnfreePredicate = pkg: hasPrefix "nvidia-x11-" pkg.name;
@@ -64,11 +59,6 @@ with import <stockholm/lib>;
services.printing.enable = true;
- # see tmpfiles.d(5)
- systemd.tmpfiles.rules = [
- "d /tmp 1777 root root - -" # does this work with mounted /tmp?
- ];
-
services.udev.extraRules = ''
SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0"
SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:1b:ae:6c", NAME="wl0"
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index 2c5e827a9..0525be858 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -137,11 +137,6 @@ with import <stockholm/lib>;
"/boot" = {
device = "/dev/sda1";
};
- "/tmp" = {
- device = "tmpfs";
- fsType = "tmpfs";
- options = ["nosuid" "nodev" "noatime"];
- };
};
environment.systemPackages = with pkgs; [
@@ -159,11 +154,6 @@ with import <stockholm/lib>;
services.printing.enable = true;
- # see tmpfiles.d(5)
- systemd.tmpfiles.rules = [
- "d /tmp 1777 root root - -" # does this work with mounted /tmp?
- ];
-
#services.bitlbee.enable = true;
#services.tor.client.enable = true;
#services.tor.enable = true;
diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix
index 5936ddfe1..7267bbc9e 100644
--- a/tv/1systems/zu/config.nix
+++ b/tv/1systems/zu/config.nix
@@ -39,11 +39,6 @@ with import <stockholm/lib>;
"/boot" = {
device = "/dev/sda1";
};
- "/tmp" = {
- device = "tmpfs";
- fsType = "tmpfs";
- options = ["nosuid" "nodev" "noatime"];
- };
};
security.wrappers = {
@@ -52,11 +47,6 @@ with import <stockholm/lib>;
services.printing.enable = true;
- # see tmpfiles.d(5)
- systemd.tmpfiles.rules = [
- "d /tmp 1777 root root - -" # does this work with mounted /tmp?
- ];
-
#services.bitlbee.enable = true;
#services.tor.client.enable = true;
#services.tor.enable = true;
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 834a89083..c58525e98 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -4,6 +4,8 @@ with import <stockholm/lib>;
then "buildbot"
else "tv";
in {
+ boot.tmpOnTmpfs = true;
+
krebs.enable = true;
krebs.build.user = config.krebs.users.tv;