diff --git a/flake.nix b/flake.nix index 9c1f553..73f55b6 100644 --- a/flake.nix +++ b/flake.nix @@ -115,9 +115,10 @@ # }; # }; modules = [ - ./nixos/configuration.nix - inputs.apple-silicon-support.nixosModules.default inputs.impermanence.nixosModules.impermanence + ./nixos/configuration.nix + ./nixos/modules/impermanence + inputs.apple-silicon-support.nixosModules.default ./nixos/mac-hardware-conf.nix ./nixos/macos/configuration.nix ] ++ general-modules; diff --git a/nixos/mac-hardware-conf.nix b/nixos/mac-hardware-conf.nix index b937acf..d1b4a56 100644 --- a/nixos/mac-hardware-conf.nix +++ b/nixos/mac-hardware-conf.nix @@ -14,13 +14,15 @@ boot.extraModulePackages = [ ]; fileSystems."/" = { - device = "none"; + device = "tmpfs"; fsType = "tmpfs"; - options = [ "defaults" "size = 3G" "mode = 755" ]; + options = [ "defaults" "size=3G" "mode=755" ]; }; fileSystems."/persist" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; + depends = [ "/" ]; + neededForBoot = true; }; fileSystems."/nix" = { device = "/persist/nix"; @@ -30,7 +32,7 @@ fileSystems."/boot" = { device = "/dev/disk/by-label/EFI\\x20-\\x20NIXOS"; fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; + #options = [ "fmask=0022" "dmask=0022" ]; }; swapDevices = [ ];