diff options
| author | makefu <github@syntax-fehler.de> | 2016-02-28 02:26:44 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-02-28 02:26:44 +0100 |
| commit | db72d5911f1556d3b1cfbe8f1a2d8f6765728952 (patch) | |
| tree | ab12aafd2994c265cd4fd604e554b2e8db2da021 /tv/1systems | |
| parent | 64a1dc64a3a7daf57e1ebc677e35c4dc89d9c36b (diff) | |
| parent | 8c859335a879c515a1415bc8b15b5cb7eb519efc (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/1systems')
| -rw-r--r-- | tv/1systems/nomic.nix | 1 | ||||
| -rw-r--r-- | tv/1systems/wu.nix | 7 | ||||
| -rw-r--r-- | tv/1systems/xu.nix | 7 |
3 files changed, 9 insertions, 6 deletions
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index 45320690b..fa9c90816 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -15,6 +15,7 @@ with config.krebs.lib; ../2configs/nginx-public_html.nix ../2configs/pulse.nix ../2configs/retiolum.nix + ../2configs/wu-binary-cache/client.nix ../2configs/xserver ]; diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 8c363d9fc..0bf242109 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -16,6 +16,7 @@ with config.krebs.lib; ../2configs/nginx-public_html.nix ../2configs/pulse.nix ../2configs/retiolum.nix + ../2configs/wu-binary-cache ../2configs/xserver { environment.systemPackages = with pkgs; [ @@ -126,12 +127,12 @@ with config.krebs.lib; "/" = { device = "/dev/mapper/vg840-wuroot"; fsType = "btrfs"; - options = "defaults,noatime,ssd,compress=lzo"; + options = ["defaults" "noatime" "ssd" "compress=lzo"]; }; "/home" = { device = "/dev/mapper/home"; fsType = "btrfs"; - options = "defaults,noatime,ssd,compress=lzo"; + options = ["defaults" "noatime" "ssd" "compress=lzo"]; }; "/boot" = { device = "/dev/sda1"; @@ -139,7 +140,7 @@ with config.krebs.lib; "/tmp" = { device = "tmpfs"; fsType = "tmpfs"; - options = "nosuid,nodev,noatime"; + options = ["nosuid" "nodev" "noatime"]; }; }; diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index c6a69a85a..46fb59ff3 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -15,6 +15,7 @@ with config.krebs.lib; ../2configs/nginx-public_html.nix ../2configs/pulse.nix ../2configs/retiolum.nix + ../2configs/wu-binary-cache/client.nix ../2configs/xserver ../2configs/xu-qemu0.nix { @@ -137,12 +138,12 @@ with config.krebs.lib; "/" = { device = "/dev/mapper/xuvga-root"; fsType = "btrfs"; - options = "defaults,noatime,ssd,compress=lzo"; + options = ["defaults" "noatime" "ssd" "compress=lzo"]; }; "/home" = { device = "/dev/mapper/xuvga-home"; fsType = "btrfs"; - options = "defaults,noatime,ssd,compress=lzo"; + options = ["defaults" "noatime" "ssd" "compress=lzo"]; }; "/boot" = { device = "/dev/sda1"; @@ -150,7 +151,7 @@ with config.krebs.lib; "/tmp" = { device = "tmpfs"; fsType = "tmpfs"; - options = "nosuid,nodev,noatime"; + options = ["nosuid" "nodev" "noatime"]; }; }; |