Skip to content

Commit 2ea3847

Browse files
committed
chore: remove all default btrfs mountpoints
1 parent c20485d commit 2ea3847

File tree

8 files changed

+1
-48
lines changed

8 files changed

+1
-48
lines changed

hosts/alcyone/hardware-configuration.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
}];
6868
};
6969
};
70-
fileSystems."/persist".neededForBoot = true;
7170

7271
hardware.cpu.intel.updateMicrocode = true;
7372

hosts/atlas/hardware-configuration.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,4 @@
9595
};
9696
};
9797
};
98-
fileSystems."/persist".neededForBoot = true;
9998
}

hosts/celaeno/hardware-configuration.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,4 @@
8282
};
8383
};
8484
};
85-
fileSystems."/persist".neededForBoot = true;
8685
}

hosts/common/optional/ephemeral-btrfs.nix

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
config,
55
...
66
}: let
7-
hostname = config.networking.hostName;
8-
97
root = config.fileSystems."/";
108

119
wipeScript = ''
@@ -48,43 +46,5 @@ in {
4846
};
4947
};
5048

51-
fileSystems = {
52-
"/" = lib.mkDefault {
53-
device = "/dev/disk/by-label/${hostname}";
54-
fsType = "btrfs";
55-
options = [
56-
"subvol=root"
57-
"compress=zstd"
58-
];
59-
};
60-
61-
"/nix" = lib.mkDefault {
62-
device = "/dev/disk/by-label/${hostname}";
63-
fsType = "btrfs";
64-
options = [
65-
"subvol=nix"
66-
"noatime"
67-
"compress=zstd"
68-
];
69-
};
70-
71-
"/persist" = lib.mkDefault {
72-
device = "/dev/disk/by-label/${hostname}";
73-
fsType = "btrfs";
74-
options = [
75-
"subvol=persist"
76-
"compress=zstd"
77-
];
78-
neededForBoot = true;
79-
};
80-
81-
"/swap" = lib.mkDefault {
82-
device = "/dev/disk/by-label/${hostname}";
83-
fsType = "btrfs";
84-
options = [
85-
"subvol=swap"
86-
"noatime"
87-
];
88-
};
89-
};
49+
fileSystems."/persist".neededForBoot = lib.mkDefault true;
9050
}

hosts/maia/hardware-configuration.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
};
9595
};
9696
};
97-
fileSystems."/persist".neededForBoot = true;
9897

9998
programs.light.enable = true;
10099
environment.systemPackages = [pkgs.brightnessctl];

hosts/merope/hardware-configuration.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
};
9898
};
9999
};
100-
fileSystems."/persist".neededForBoot = true;
101100

102101
hardware.raspberry-pi."4" = {
103102
i2c1.enable = true;

hosts/pleione/hardware-configuration.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,5 +114,4 @@
114114
};
115115
};
116116
};
117-
fileSystems."/persist".neededForBoot = true;
118117
}

hosts/taygeta/hardware-configuration.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,4 @@
7373
};
7474
};
7575
};
76-
fileSystems."/persist".neededForBoot = true;
7776
}

0 commit comments

Comments
 (0)