From f6c907557a1206e83a7678158f90f83c6840eaf4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 15 Feb 2016 10:26:57 +0100
Subject: machines/aszlig: Use lists for filesystem options

We had this since NixOS/nixpkgs@3c5fca9 and since the merge of master
into closure-size (NixOS/nixpkgs@d039c87) we also have it there, so
there is no excuse now to not switch to lists, especially because we
already used concatStringsSep on lists anyway.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/aszlig/arilou.nix          | 4 ++--
 machines/aszlig/kzerza.nix          | 4 ++--
 machines/aszlig/managed/notsure.nix | 2 +-
 machines/aszlig/managed/tyree.nix   | 2 +-
 machines/aszlig/mmrnmhrm.nix        | 7 +------
 machines/aszlig/tishtushi.nix       | 8 ++------
 6 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'machines/aszlig')

diff --git a/machines/aszlig/arilou.nix b/machines/aszlig/arilou.nix
index b9a1c87d..469d6de9 100644
--- a/machines/aszlig/arilou.nix
+++ b/machines/aszlig/arilou.nix
@@ -25,7 +25,7 @@ in {
 
   fileSystems."/".device = "/dev/disk/by-uuid/${rootUUID}";
   fileSystems."/".fsType = "btrfs";
-  fileSystems."/".options = concatStringsSep "," [
+  fileSystems."/".options = [
     "ssd"
     "space_cache"
     "compress-force=zlib"
@@ -34,7 +34,7 @@ in {
 
   fileSystems."/tmp".device = "none";
   fileSystems."/tmp".fsType = "tmpfs";
-  fileSystems."/tmp".options = "nosuid,nodev,relatime";
+  fileSystems."/tmp".options = [ "nosuid" "nodev" "relatime" ];
 
   swapDevices = singleton {
     device = "/dev/disk/by-uuid/${swapUUID}";
diff --git a/machines/aszlig/kzerza.nix b/machines/aszlig/kzerza.nix
index b90b05d2..91fbe09c 100644
--- a/machines/aszlig/kzerza.nix
+++ b/machines/aszlig/kzerza.nix
@@ -24,7 +24,7 @@ in {
 
   fileSystems."/".device = "/dev/disk/by-uuid/${rootUUID}";
   fileSystems."/".fsType = "btrfs";
-  fileSystems."/".options = concatStringsSep "," [
+  fileSystems."/".options = [
     "ssd"
     "space_cache"
     "compress-force=zlib"
@@ -38,7 +38,7 @@ in {
 
   fileSystems."/tmp".device = "none";
   fileSystems."/tmp".fsType = "tmpfs";
-  fileSystems."/tmp".options = "nosuid,nodev,relatime";
+  fileSystems."/tmp".options = [ "nosuid" "nodev" "relatime" ];
 
   users.extraGroups.grandpa.gid = 666;
   users.extraUsers.grandpa = {
diff --git a/machines/aszlig/managed/notsure.nix b/machines/aszlig/managed/notsure.nix
index d498609b..3d222970 100644
--- a/machines/aszlig/managed/notsure.nix
+++ b/machines/aszlig/managed/notsure.nix
@@ -15,7 +15,7 @@ in {
   fileSystems."/" = {
     label = "root";
     fsType = "btrfs";
-    options = "rw,space_cache,relatime";
+    options = [ "space_cache" "relatime" ];
   };
 
   hardware = {
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index fead2ef3..c44f83b3 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -17,7 +17,7 @@
 
   fileSystems."/".label = "tyree-root";
   fileSystems."/".fsType = "btrfs";
-  fileSystems."/".options = lib.concatStringsSep "," [
+  fileSystems."/".options = [
     "compress=lzo"
     "discard"
     "noatime"
diff --git a/machines/aszlig/mmrnmhrm.nix b/machines/aszlig/mmrnmhrm.nix
index 49826d9b..b9d422e6 100644
--- a/machines/aszlig/mmrnmhrm.nix
+++ b/machines/aszlig/mmrnmhrm.nix
@@ -23,12 +23,7 @@ with lib;
     "/" = {
       label = "root";
       fsType = "btrfs";
-      options = concatStringsSep "," [
-        "autodefrag"
-        "space_cache"
-        "compress=lzo"
-        "noatime"
-      ];
+      options = [ "autodefrag" "space_cache" "compress=lzo" "noatime" ];
     };
   };
 
diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix
index a3f281f4..3232d222 100644
--- a/machines/aszlig/tishtushi.nix
+++ b/machines/aszlig/tishtushi.nix
@@ -40,17 +40,13 @@ in {
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/${rootUUID}";
     fsType = "btrfs";
-    options = concatStringsSep "," [
-      "space_cache" "compress=zlib" "noatime"
-    ];
+    options = [ "space_cache" "compress=zlib" "noatime" ];
   };
 
   fileSystems."/nix/store" = {
     device = "/dev/disk/by-uuid/${storeUUID}";
     fsType = "btrfs";
-    options = concatStringsSep "," [
-      "ssd" "compress-force=zlib" "noatime"
-    ];
+    options = [ "ssd" "compress-force=zlib" "noatime" ];
   };
 
   swapDevices = singleton {
-- 
cgit 1.4.1