zoey/config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

feat: switch to btrfs

Browse source
This commit is contained in:
zoey 2025-06-18 12:07:36 -04:00
parent 0ad695abcf
commit 90cbe489f6
Signed by: zoey
GPG key ID: 81FB9FECDD6A33E2
10 changed files with 154 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

26
systems/x86_64-linux/earth/default.nix
View file

@ -25,6 +25,31 @@
options = "--delete-older-than 1d";
};
boot.initrd.postResumeCommands = lib.mkAfter ''
mkdir /btrfs_tmp
mount /dev/root_vg/root /btrfs_tmp
if [[ -e /btrfs_tmp/root ]]; then
mkdir -p /btrfs_tmp/old_roots
timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S")
mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp"
fi
delete_subvolume_recursively() {
IFS=$'\n'
for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do
delete_subvolume_recursively "/btrfs_tmp/$i"
done
btrfs subvolume delete "$1"
}
for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do
delete_subvolume_recursively "$i"
done
btrfs subvolume create /btrfs_tmp/root
umount /btrfs_tmp
'';
hardware.audio.enable = true;
hardware.nvidia.enable = true;
hardware.keyboard.qmk.enable = true;
@ -209,6 +234,7 @@
pkgs.winetricks
];
})
pkgs.vulkan-hdr-layer-kwin6
pkgs.bottles
pkgs.file-roller
pkgs.podman-tui

109
systems/x86_64-linux/earth/disk-config.nix
View file

@ -17,11 +17,31 @@
mountOptions = ["umask=0077" "nofail"];
};
};
zfs = {
root = {
name = "root";
size = "100%";
content = {
type = "zfs";
pool = "zroot";
type = "btrfs";
extraArgs = ["-f"];
subvolumes = {
"/rootfs" = {
mountpoint = "/";
};
"/home" = {
mountOptions = ["compress=zstd"];
mountpoint = "/home";
};
"/home/zoey" = {};
"/nix" = {
mountOptions = [
"compress=zstd"
];
mountpoint = "/nix";
};
};
};
};
};
@ -36,83 +56,22 @@
zbk = {
size = "100%";
content = {
type = "zfs";
pool = "zbk";
type = "btrfs";
extraArgs = ["-f"];
subvolumes = {
"/mnt/zbk" = {
mountOptions = [
"compress=zstd"
"noatime"
];
mountpoint = "/mnt/zbk";
};
};
};
};
};
};
};
};
zpool = {
zbk = {
type = "zpool";
rootFsOptions = {
acltype = "posixacl";
atime = "off";
compression = "zstd";
mountpoint = "none";
xattr = "sa";
autotrim = "on";
};
options.ashift = "12";
datasets = {
"zbk" = {
type = "zfs_fs";
options.mountpoint = "none";
};
"zbk/zbk" = {
type = "zfs_fs";
mountpoint = "/mnt/zbk";
options."sharesmb" = "on";
# Used by services.zfs.autoSnapshot options.
options."com.sun:auto-snapshot" = "true";
};
};
};
zroot = {
type = "zpool";
rootFsOptions = {
# https://wiki.archlinux.org/title/Install_Arch_Linux_on_ZFS
acltype = "posixacl";
atime = "off";
compression = "zstd";
mountpoint = "none";
xattr = "sa";
autotrim = "on";
};
options.ashift = "12";
datasets = {
"local" = {
type = "zfs_fs";
options.mountpoint = "none";
};
"local/home" = {
type = "zfs_fs";
mountpoint = "/home";
# Used by services.zfs.autoSnapshot options.
options."com.sun:auto-snapshot" = "true";
};
"local/nix" = {
type = "zfs_fs";
mountpoint = "/nix";
options."com.sun:auto-snapshot" = "false";
};
"local/persist" = {
type = "zfs_fs";
mountpoint = "/persist";
options."com.sun:auto-snapshot" = "false";
};
"local/root" = {
type = "zfs_fs";
mountpoint = "/";
options."com.sun:auto-snapshot" = "false";
postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/local/root@blank$' || zfs snapshot zroot/local/root@blank";
};
};
};
};
};
}