From de7cbc20521068bc34029e548289542fe47e04c2 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Sat, 16 Sep 2023 12:51:40 +0200
Subject: [PATCH] refactor

---
 hosts/yodaTab/configuration.nix           | 6 ++++++
 hosts/yodaTab/hardware-configuration.nix  | 4 +---
 hosts/yodaTux/configuration.nix           | 6 ++++++
 hosts/yodaTux/hardware-configuration.nix  | 4 +---
 hosts/yodaYoga/configuration.nix          | 6 ++++++
 hosts/yodaYoga/hardware-configuration.nix | 4 +---
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index 65e7d0e..54b65db 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -50,6 +50,12 @@ in
       ../../modules/dns.nix
     ];
 
+  # Manually enable compression
+  # https://nixos.wiki/wiki/Btrfs#Compression
+  fileSystems = {
+    "/".options = [ "compress=zstd" ];
+  };
+
   networking.hostName = "yodaTab";
   services.openssh.ports = [ 22 ];
   boot.initrd.network.ssh.port = 22;
diff --git a/hosts/yodaTab/hardware-configuration.nix b/hosts/yodaTab/hardware-configuration.nix
index 074c68d..c85d29b 100644
--- a/hosts/yodaTab/hardware-configuration.nix
+++ b/hosts/yodaTab/hardware-configuration.nix
@@ -16,9 +16,7 @@
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/f87e6b3c-12f2-4fda-92b3-06b07bdad58f";
       fsType = "btrfs";
-      # Manually enable compression
-      # https://nixos.wiki/wiki/Btrfs#Compression
-      options = [ "subvol=@" "compress=zstd" ];
+      options = [ "subvol=@" ];
     };
 
   boot.initrd.luks.devices."luks-ba8b94d0-7f70-496a-ad87-eadc5e852aad".device = "/dev/disk/by-uuid/ba8b94d0-7f70-496a-ad87-eadc5e852aad";
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index 8204081..6cd9b10 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -50,6 +50,12 @@ in
       ../../modules/dns.nix
     ];
 
+  # Manually enable compression
+  # https://nixos.wiki/wiki/Btrfs#Compression
+  fileSystems = {
+    "/".options = [ "compress=zstd" ];
+  };
+
   networking.hostName = "yodaTux";
   services.openssh.ports = [ 22 ];
   boot.initrd.network.ssh.port = 22;
diff --git a/hosts/yodaTux/hardware-configuration.nix b/hosts/yodaTux/hardware-configuration.nix
index 051e5ca..6bd36a1 100644
--- a/hosts/yodaTux/hardware-configuration.nix
+++ b/hosts/yodaTux/hardware-configuration.nix
@@ -16,9 +16,7 @@
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/01f67928-9b35-48b2-aaa6-c58ff6c440a8";
       fsType = "btrfs";
-      # Manually enable compression
-      # https://nixos.wiki/wiki/Btrfs#Compression
-      options = [ "subvol=@" "compress=zstd" ];
+      options = [ "subvol=@" ];
     };
 
   boot.initrd.luks.devices."luks-ea7099e3-320d-4eb3-a4c3-9910a9af817b".device = "/dev/disk/by-uuid/ea7099e3-320d-4eb3-a4c3-9910a9af817b";
diff --git a/hosts/yodaYoga/configuration.nix b/hosts/yodaYoga/configuration.nix
index a17de13..c8a6292 100644
--- a/hosts/yodaYoga/configuration.nix
+++ b/hosts/yodaYoga/configuration.nix
@@ -52,6 +52,12 @@ in
       ../../modules/dns.nix
     ];
 
+  # Manually enable compression
+  # https://nixos.wiki/wiki/Btrfs#Compression
+  fileSystems = {
+    "/".options = [ "compress=zstd" ];
+  };
+
   networking.hostName = "yodaYoga";
   services.openssh.ports = [ 2224 ];
   boot.initrd.network.ssh.port = 2225;
diff --git a/hosts/yodaYoga/hardware-configuration.nix b/hosts/yodaYoga/hardware-configuration.nix
index 47f677a..f8a9bdd 100644
--- a/hosts/yodaYoga/hardware-configuration.nix
+++ b/hosts/yodaYoga/hardware-configuration.nix
@@ -15,9 +15,7 @@
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/90156ea3-7098-445f-932f-0db166787284";
       fsType = "btrfs";
-      # Manually enable compression
-      # https://nixos.wiki/wiki/Btrfs#Compression
-      options = [ "subvol=@" "compress=zstd" ];
+      options = [ "subvol=@" ];
     };
 
   boot.initrd.luks.devices."luks-a8521407-e25b-4f26-8e7a-a56fcbfd2e35".device = "/dev/disk/by-uuid/a8521407-e25b-4f26-8e7a-a56fcbfd2e35";