[fanny] enable storage creation with disko

machines/fanny/configuration.nix

@@ -51,6 +51,7 @@ in
       disk0 = "disk/by-id/ata-SAMSUNG_MZ7LN256HCHP-000L7_S20HNAAH200381";
     };
     storage = {
+      enable = true;
       disks = ["disk/by-id/wwn-0x50014ee265b53b60" "disk/by-id/wwn-0x50014ee2bb0a194a"];
       mirror = true;
     };
@@ -69,8 +70,7 @@ in
   };
 
   services.malobeo.microvm.enableHostBridge = true;
-  services.malobeo.microvm.deployHosts = [ "overwatch" "infradocs" "durruti" ];
+  services.malobeo.microvm.deployHosts = [ "overwatch" "infradocs" "nextcloud" "durruti" ];
-  services.malobeo.microvm.client.nextcloud.enable = true;
 
   networking = {
     nat = {

machines/modules/malobeo/microvm_client.nix

@@ -1,28 +0,0 @@
-{config, lib, pkgs, ...}:
-let
-  cfg = config.services.malobeo.microvm.client;
-in
-{
-  options.services.malobeo.microvm.client = {
-    nextcloud = {
-      enable = lib.mkEnableOption "enable the nextcloud microvm wrapper";
-      datadir = lib.mkOption {
-        type = lib.types.string;
-        default = "/data/services/nextcloud/";
-        description = "set a custom datadir";
-      };
-    };
-  };
-
-  config = lib.mkMerge [
-    (lib.mkIf cfg.nextcloud.enable { #add check for run-vm?
-      services.malobeo.microvm.deployHosts = ["nextcloud"];
-      microvm.vms.nextcloud.config.microvm.shares = lib.mkAfter [{
-        source = cfg.datadir;
-        mountPoint = "/datadir";
-        tag = "nc-datadir";
-        proto = "virtiofs";
-      }];
-    })
-  ];
-}

machines/nextcloud/configuration.nix

@@ -37,7 +37,6 @@ with lib;
     hostName = "cloud.malobeo.org";
     config.adminpassFile = config.sops.secrets.nextcloudAdminPass.path;
     #https = true; #disable for testing
-    datadir = "/datadir";
     database.createLocally = true;
     config.dbtype = "pgsql";
     configureRedis = true;
@@ -56,12 +55,6 @@ with lib;
     };
     settings = {
       trusted_domains = ["10.0.0.13"];
-      "maintenance_window_start" = "1";
-      "default_phone_region" = "DE";
-    };
-    phpOptions = {
-      "realpath_cache_size" = "0";
-      "opcache.interned_strings_buffer" = "23";
     };
   };
 

outputs.nix

@@ -108,7 +108,7 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
 
     nixosModules.malobeo = {
       host.imports = [ ./machines/durruti/host_config.nix ];
-      microvm.imports = [ ./machines/modules/malobeo/microvm_host.nix ./machines/modules/malobeo/microvm_client.nix];
+      microvm.imports = [ ./machines/modules/malobeo/microvm_host.nix ];
       vpn.imports = [ ./machines/modules/malobeo/wireguard.nix ];
       initssh.imports = [ ./machines/modules/malobeo/initssh.nix ];
       metrics.imports = [ ./machines/modules/malobeo/metrics.nix ];