diff --git a/nix/configuration/configuration.nix b/nix/configuration/configuration.nix index 7907444..5a1b58f 100644 --- a/nix/configuration/configuration.nix +++ b/nix/configuration/configuration.nix @@ -9,7 +9,6 @@ { imports = [ ./roles/2ship2harkinian - ./roles/9pfs_nix_store ./roles/alacritty ./roles/ansible ./roles/ares diff --git a/nix/configuration/flake.nix b/nix/configuration/flake.nix index 2e1e840..c3c0f93 100644 --- a/nix/configuration/flake.nix +++ b/nix/configuration/flake.nix @@ -126,7 +126,6 @@ isoImage.makeUsbBootable = true; me.buildingIso = true; me.optimizations.enable = nixpkgs.lib.mkDefault false; - me._9pfs_nix_store.is_iso = true; } { # These are big space hogs. The chance that I need them on an ISO is slim. @@ -141,9 +140,6 @@ networking.useDHCP = true; me.optimizations.enable = nixpkgs.lib.mkDefault false; } - { - # me._9pfs_nix_store.enable = true; - } ]; in { diff --git a/nix/configuration/roles/9pfs_nix_store/default.nix b/nix/configuration/roles/9pfs_nix_store/default.nix deleted file mode 100644 index a459c80..0000000 --- a/nix/configuration/roles/9pfs_nix_store/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - imports = [ ]; - - options.me = { - _9pfs_nix_store.enable = lib.mkOption { - type = lib.types.bool; - default = false; - example = true; - description = "Whether we want to mount /nix/store over 9pfs (useful in virtual machines to share a directory from the host as a persistent nix store."; - }; - - _9pfs_nix_store.is_iso = lib.mkOption { - type = lib.types.bool; - default = false; - example = true; - description = "Whether this build is for an ISO. It changes how we mount the nix store."; - }; - }; - - config = lib.mkIf config.me._9pfs_nix_store.enable ( - lib.mkMerge [ - (lib.mkIf config.me._9pfs_nix_store.is_iso { - # fileSystems = { - # "/nix/store" = lib.mkForce { - # fsType = "overlay"; - # device = "overlay"; - # options = [ - # "lowerdir=/nix/.ro-store" - # "upperdir=/store" - # "workdir=/work" - # ]; - # depends = [ - # "/nix/.ro-store" - # "/store" - # "/work" - # ]; - # }; - - # "/store" = lib.mkForce { - # fsType = "9p"; - # device = "nixstore"; - # options = [ - # "trans=virtio" - # "version=9p2000.L" - # "x-systemd.requires=modprobe@9pnet_virtio.service" - # "msize=16384" # Maximum packet size. Increasing this should improve performance at the cost of increased memory usage. - # "cache=loose" - # ]; - # }; - # }; - }) - (lib.mkIf (!config.me._9pfs_nix_store.is_iso) { - fileSystems = { - "/nix/store" = lib.mkForce { - fsType = "9p"; - device = "nixstore"; - neededForBoot = true; - options = [ - "trans=virtio" - "version=9p2000.L" - "x-systemd.requires=modprobe@9pnet_virtio.service" - "msize=16384" # Maximum packet size. Increasing this should improve performance at the cost of increased memory usage. - "cache=loose" - ]; - }; - }; - }) - ] - ); -}