diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 3d495bf..0dbc10a 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -14,10 +14,6 @@ let "noatime" "x-systemd.device-timeout=0" ]; - btrfs_ssd = [ - "ssd" - "discard=async" - ]; in { imports = [ @@ -72,17 +68,8 @@ in SuspendState = "mem"; }; - fileSystems."/mnt/old" = { - device = "/dev/disk/by-label/BTRFS_ROOT"; - fsType = "btrfs"; - options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd; - }; # boot.initrd.luks.reusePassphrases = true; boot.initrd.luks.devices = { - "old" = { - bypassWorkqueues = true; - device = "/dev/disk/by-label/CRYPT_ROOT"; - }; "data" = { bypassWorkqueues = true; device = "/dev/disk/by-label/CRYPT_DATA"; @@ -92,16 +79,6 @@ in # device = "/dev/disk/by-label/CRYPT_BIGBOY"; # }; }; - # boot.loader.efi.efiSysMountPoint = "/boot/efi"; - # fileSystems."/boot/efi" = { - # device = "/dev/disk/by-label/NIXBOOT"; - # fsType = "vfat"; - # }; - # fileSystems."/home" = { - # device = "/dev/disk/by-label/BTRFS_ROOT"; - # fsType = "btrfs"; - # options = [ "subvol=home" ] ++ btrfs_options ++ btrfs_ssd; - # }; fileSystems."/home/lelgenio/Downloads/Torrents" = { device = "/dev/disk/by-label/BTRFS_DATA"; fsType = "btrfs"; @@ -129,11 +106,6 @@ in ] ++ btrfs_options; }; - fileSystems."/home/lelgenio/.local/mount/old" = { - device = "/dev/disk/by-label/BTRFS_ROOT"; - fsType = "btrfs"; - options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd; - }; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -179,19 +151,4 @@ in "vm.watermark_scale_factor" = 125; "vm.page-cluster" = 0; }; - - # swap - # fileSystems."/swap" = { - # device = "/dev/disk/by-label/BTRFS_ROOT"; - # fsType = "btrfs"; - # # Note these options effect the entire BTRFS filesystem and not just this volume, - # # with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts - # options = [ "subvol=swap" ] ++ btrfs_options ++ btrfs_ssd; - # }; - # swapDevices = [ - # { - # device = "/swap/swapfile"; - # size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB - # } - # ]; }