cilly/flakes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

switch back to btrfs

Browse source 
too lazy to figure out how to do all the things with
bcachefs, would rather wait for it to be upstream
This commit is contained in:
LavaDesu 2021-05-30 11:00:59 +07:00
parent 2ee13936e1
commit b4708d2169
Signed by: cilly
GPG key ID: 6500251E087653C9
2 changed files with 24 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hosts/winter/default.nix
View file

@ -3,11 +3,11 @@
system.stateVersion = "20.09"; system.stateVersion = "20.09";
environment.etc = { environment.etc = {
"machine-id".source = "/mnt/bcachefs/machine-id"; "machine-id".source = "/var/persist/machine-id";
"ssh/ssh_host_rsa_key".source = "/mnt/bcachefs/ssh_host_rsa_key"; "ssh/ssh_host_rsa_key".source = "/var/persist/ssh_host_rsa_key";
"ssh/ssh_host_rsa_key.pub".source = "/mnt/bcachefs/ssh_host_rsa_key.pub"; "ssh/ssh_host_rsa_key.pub".source = "/var/persist/ssh_host_rsa_key.pub";
"ssh/ssh_host_ed25519_key".source = "/mnt/bcachefs/ssh_host_ed25519_key"; "ssh/ssh_host_ed25519_key".source = "/var/persist/ssh_host_ed25519_key";
"ssh/ssh_host_ed25519_key.pub".source = "/mnt/bcachefs/ssh_host_ed25519_key.pub"; "ssh/ssh_host_ed25519_key.pub".source = "/var/persist/ssh_host_ed25519_key.pub";
}; };
environment.pathsToLink = [ "/share/zsh" ]; environment.pathsToLink = [ "/share/zsh" ];
users.mutableUsers = false; users.mutableUsers = false;

45
hosts/winter/hardware-configuration.nix
View file

@ -8,13 +8,13 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" "bcachefs" ]; boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "none"; { device = "rootfs";
fsType = "tmpfs"; fsType = "tmpfs";
options = [ "defaults" "size=4G" "mode=755" ]; options = [ "defaults" "size=4G" "mode=755" ];
}; };
@ -24,40 +24,34 @@
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/mnt/bcachefs" = fileSystems."/mnt/butter" =
{ device = "/dev/sda2"; { device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d";
fsType = "bcachefs"; fsType = "btrfs";
neededForBoot = true; options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=5" ];
}; };
fileSystems."/nix" = fileSystems."/nix" =
{ device = "/mnt/bcachefs/binds/nix"; { device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d";
fsType = "none"; fsType = "btrfs";
options = [ "bind" ]; options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=258" ];
}; };
fileSystems."/home" = fileSystems."/home" =
{ device = "/mnt/bcachefs/binds/home"; { device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d";
fsType = "none"; fsType = "btrfs";
options = [ "bind" ]; options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=260" ];
};
fileSystems."/var" =
{ device = "/mnt/bcachefs/binds/var";
fsType = "none";
options = [ "bind" ];
}; };
fileSystems."/root" = fileSystems."/root" =
{ device = "/mnt/bcachefs/binds/root"; { device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d";
fsType = "none"; fsType = "btrfs";
options = [ "bind" ]; options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=261" ];
}; };
fileSystems."/etc/nixos" = fileSystems."/var" =
{ device = "/mnt/bcachefs/binds/etc_nixos"; { device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d";
fsType = "none"; fsType = "btrfs";
options = [ "bind" ]; options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=259" ];
}; };
fileSystems."/mnt/hdd" = fileSystems."/mnt/hdd" =
@ -66,5 +60,4 @@
}; };
swapDevices = [ ]; swapDevices = [ ];
} }