diff --git a/hosts/diva/configuration.nix b/hosts/diva/configuration.nix
index 30f3426..fedbca6 100644
--- a/hosts/diva/configuration.nix
+++ b/hosts/diva/configuration.nix
@@ -1,8 +1,12 @@
 { inputs, username, ... }:
 {
+  # diva provides uptime-kuma, and website hosting for rougebordeaux.xyz
+
   imports = [
-    ./hardware.nix
-    ./networking.nix
+    # these files should be automatically generated by nixos-infect
+    /etc/nixos/configuration/hardware.nix
+    /etc/nixos/configuration/networking.nix
+
     ./features
     ../../shared
   ];
diff --git a/hosts/diva/features/nextcloud.nix b/hosts/diva/features/nextcloud.nix
deleted file mode 100644
index a37407f..0000000
--- a/hosts/diva/features/nextcloud.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-  imports = [
-    "${
-      fetchTarball {
-        url = "https://github.com/onny/nixos-nextcloud-testumgebung/archive/fa6f062830b4bc3cedb9694c1dbf01d5fdf775ac.tar.gz";
-        sha256 = "0gzd0276b8da3ykapgqks2zhsqdv4jjvbv97dsxg0hgrhb74z0fs";
-      }
-    }/nextcloud-extras.nix"
-    ./nextcloud-network.nix
-  ]; # adding caddy support
-
-  sops.secrets.adminNextcloudPass = {
-    owner = "nextcloud";
-  };
-
-  services.nextcloud = {
-    enable = true;
-    hostName = "cloud.hypervirtual.world";
-    database.createLocally = true;
-    webserver = "caddy";
-    configureRedis = true;
-    package = pkgs.nextcloud30;
-    config = {
-      dbtype = "pgsql";
-      adminpassFile = config.sops.secrets.adminNextcloudPass.path;
-    };
-
-    settings = {
-      enabledPreviewProviders = [
-        "OC\\Preview\\BMP"
-        "OC\\Preview\\GIF"
-        "OC\\Preview\\JPEG"
-        "OC\\Preview\\Krita"
-        "OC\\Preview\\MarkDown"
-        "OC\\Preview\\MP3"
-        "OC\\Preview\\OpenDocument"
-        "OC\\Preview\\PNG"
-        "OC\\Preview\\TXT"
-        "OC\\Preview\\XBitmap"
-        "OC\\Preview\\HEIC"
-      ];
-
-      trustedDomains = [ "cloud.hypervirtual.world" ];
-      overwriteprotocol = "https";
-      log_type = "file"; # temporary fix for https://nixos.org/manual/nixos/stable/#module-services-nextcloud-warning-logreader
-      default_phone_region = "FR";
-      default_locale = "fr_FR";
-      default_language = "fr";
-      default_timezone = "Europe/Paris";
-      "memories.exiftool" = "${lib.getExe pkgs.exiftool}";
-    };
-
-    phpExtraExtensions = all: [
-      all.pdlib
-      all.redis
-      all.bz2
-    ];
-
-    phpOptions."opcache.interned_strings_buffer" = "23";
-    appstoreEnable = true; # why i would want appstore to be disabled ???
-    autoUpdateApps.enable = true;
-    cli.memoryLimit = "4G";
-  };
-
-  environment.systemPackages =
-    let
-      php = pkgs.php.buildEnv { extraConfig = "memory_limit = 4G"; };
-    in
-    [
-      php
-    ];
-}
diff --git a/hosts/diva/hardware.nix b/hosts/diva/hardware.nix
deleted file mode 100644
index 871796c..0000000
--- a/hosts/diva/hardware.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ modulesPath, ... }:
-{
-  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-  boot.loader.grub = {
-    efiSupport = true;
-    efiInstallAsRemovable = true;
-    device = "nodev";
-  };
-  fileSystems."/boot" = { device = "/dev/disk/by-uuid/476E-933D"; fsType = "vfat"; };
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" ];
-  boot.initrd.kernelModules = [ "nvme" ];
-  fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
-  
-}
diff --git a/hosts/diva/networking.nix b/hosts/diva/networking.nix
deleted file mode 100644
index b745b77..0000000
--- a/hosts/diva/networking.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, ... }: {
-  # This file was populated at runtime with the networking
-  # details gathered from the active system.
-  networking = {
-    nameservers = [ "2a01:4ff:ff00::add:1"
- "2a01:4ff:ff00::add:2"
- "185.12.64.2"
- ];
-    defaultGateway = "172.31.1.1";
-    defaultGateway6 = {
-      address = "fe80::1";
-      interface = "eth0";
-    };
-    dhcpcd.enable = false;
-    usePredictableInterfaceNames = lib.mkForce false;
-    interfaces = {
-      eth0 = {
-        ipv4.addresses = [
-          { address="95.216.145.45"; prefixLength=32; }
-        ];
-        ipv6.addresses = [
-          { address="2a01:4f9:c011:97d1::1"; prefixLength=64; }
-{ address="fe80::9400:4ff:fe44:c3cd"; prefixLength=64; }
-        ];
-        ipv4.routes = [ { address = "172.31.1.1"; prefixLength = 32; } ];
-        ipv6.routes = [ { address = "fe80::1"; prefixLength = 128; } ];
-      };
-      
-    };
-  };
-  services.udev.extraRules = ''
-    ATTR{address}=="96:00:04:44:c3:cd", NAME="eth0"
-    
-  '';
-}