diff --git a/hosts/winter/default.nix b/hosts/winter/default.nix index 46dbb1a..d7c8030 100644 --- a/hosts/winter/default.nix +++ b/hosts/winter/default.nix @@ -3,11 +3,11 @@ system.stateVersion = "20.09"; environment.etc = { - "machine-id".source = "/mnt/bcachefs/machine-id"; - "ssh/ssh_host_rsa_key".source = "/mnt/bcachefs/ssh_host_rsa_key"; - "ssh/ssh_host_rsa_key.pub".source = "/mnt/bcachefs/ssh_host_rsa_key.pub"; - "ssh/ssh_host_ed25519_key".source = "/mnt/bcachefs/ssh_host_ed25519_key"; - "ssh/ssh_host_ed25519_key.pub".source = "/mnt/bcachefs/ssh_host_ed25519_key.pub"; + "machine-id".source = "/var/persist/machine-id"; + "ssh/ssh_host_rsa_key".source = "/var/persist/ssh_host_rsa_key"; + "ssh/ssh_host_rsa_key.pub".source = "/var/persist/ssh_host_rsa_key.pub"; + "ssh/ssh_host_ed25519_key".source = "/var/persist/ssh_host_ed25519_key"; + "ssh/ssh_host_ed25519_key.pub".source = "/var/persist/ssh_host_ed25519_key.pub"; }; environment.pathsToLink = [ "/share/zsh" ]; users.mutableUsers = false; diff --git a/hosts/winter/hardware-configuration.nix b/hosts/winter/hardware-configuration.nix index c90435c..fee857b 100644 --- a/hosts/winter/hardware-configuration.nix +++ b/hosts/winter/hardware-configuration.nix @@ -8,13 +8,13 @@ [ (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.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "none"; + { device = "rootfs"; fsType = "tmpfs"; options = [ "defaults" "size=4G" "mode=755" ]; }; @@ -24,40 +24,34 @@ fsType = "vfat"; }; - fileSystems."/mnt/bcachefs" = - { device = "/dev/sda2"; - fsType = "bcachefs"; - neededForBoot = true; + fileSystems."/mnt/butter" = + { device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d"; + fsType = "btrfs"; + options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=5" ]; }; fileSystems."/nix" = - { device = "/mnt/bcachefs/binds/nix"; - fsType = "none"; - options = [ "bind" ]; + { device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d"; + fsType = "btrfs"; + options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=258" ]; }; fileSystems."/home" = - { device = "/mnt/bcachefs/binds/home"; - fsType = "none"; - options = [ "bind" ]; - }; - - fileSystems."/var" = - { device = "/mnt/bcachefs/binds/var"; - fsType = "none"; - options = [ "bind" ]; + { device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d"; + fsType = "btrfs"; + options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=260" ]; }; fileSystems."/root" = - { device = "/mnt/bcachefs/binds/root"; - fsType = "none"; - options = [ "bind" ]; + { device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d"; + fsType = "btrfs"; + options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=261" ]; }; - fileSystems."/etc/nixos" = - { device = "/mnt/bcachefs/binds/etc_nixos"; - fsType = "none"; - options = [ "bind" ]; + fileSystems."/var" = + { device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d"; + fsType = "btrfs"; + options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=259" ]; }; fileSystems."/mnt/hdd" = @@ -66,5 +60,4 @@ }; swapDevices = [ ]; - }