Trim up Isaiah/Jeremiah

Remove minio configurations for them
Remove the semi-completed Ceph configuration from them
Trim out the unused SAN VLan tag

hosts/isaiah/ceph.nix

@@ -1,34 +0,0 @@
-{ config, ... }:
-
-let
-  publicIp = (builtins.elemAt config.networking.interfaces.enp38s0.ipv4.addresses 0).address;
-  sanIp = (builtins.elemAt config.networking.interfaces.enp39s0.ipv4.addresses 0).address;
-  vip = (builtins.elemAt config.networking.interfaces.enp38s0.ipv4.addresses 1).address;
-  hostname = config.networking.hostName;
-  baseConfig = import ../../ceph/home.nix;
-in
-{
-  services.ceph-benaco = baseConfig // {
-    enable = false;
-    monitor = {
-      enable = false;
-      initialKeyring = ../../secrets/home.mon.keyring;
-      nodeName = hostname;
-      bindAddr = publicIp;
-      advertisedPublicAddr = vip;
-    };
-    osdBindAddr = publicIp;
-    osdAdvertisedPublicAddr = publicIp;
-    osds = {
-      osd1 = {
-        enable = false;
-        bootstrapKeyring = ../../secrets/home.osd-bootstrap.keyring;
-        id = 2;
-        uuid = "73424b68-210b-415f-800f-8767babea625";
-        blockDevice = "/dev/disk/by-id/ata-ST12000NM0558_ZHZ5WM4L";
-        blockDeviceUdevRuleMatcher = ''KERNEL=="sdb"'';
-        clusterAddress = sanIp;
-      };
-    };
-  };
-}

hosts/isaiah/default.nix

@@ -1,10 +1,8 @@
 { lib, ... }:
 {
   imports = [
-    ./ceph.nix
     ./hardware-configuration.nix
     ./git.nix
-    ./minio.nix
   ];
 
   greg = {

hosts/isaiah/minio.nix

@@ -1,33 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  minioPort = 9000;
-  minioConsolePort = 9001;
-in
-{
-  environment.systemPackages = with pkgs; [
-    minio-client
-    xfsprogs
-  ];
-
-  greg.proxies."minio-01.thehellings.lan".target = "http://localhost:9000";
-
-  fileSystems."/data/1" = {
-    device = "/dev/disk/by-id/wwn-0x5000c500c48728e9-part1";
-    fsType = "xfs";
-  };
-
-  networking.firewall.allowedTCPPorts = [
-    minioPort
-    minioConsolePort
-  ];
-
-  age.secrets.minio.file = ../../secrets/minio.age;
-
-  services.minio = {
-    enable = true;
-    dataDir = [ "/data/1/minio" ];
-    rootCredentialsFile = config.age.secrets.minio.path;
-    browser = true;
-  };
-}

hosts/jeremiah/ceph.nix

@@ -1,34 +0,0 @@
-{ config, ... }:
-
-let
-  publicIp = (builtins.elemAt config.networking.interfaces.enp68s0.ipv4.addresses 0).address;
-  sanIp = (builtins.elemAt config.networking.interfaces.enp67s0.ipv4.addresses 0).address;
-  vip = (builtins.elemAt config.networking.interfaces.enp68s0.ipv4.addresses 1).address;
-  hostname = config.networking.hostName;
-  baseConfig = import ../../ceph/home.nix;
-in
-{
-  services.ceph-benaco = baseConfig // {
-    enable = false;
-    monitor = {
-      enable = false;
-      initialKeyring = ../../secrets/home.mon.keyring;
-      nodeName = hostname;
-      bindAddr = publicIp;
-      advertisedPublicAddr = vip;
-    };
-    osdBindAddr = publicIp;
-    osdAdvertisedPublicAddr = publicIp;
-    osds = {
-      osd1 = {
-        enable = false;
-        bootstrapKeyring = ../../secrets/home.osd-bootstrap.keyring;
-        id = 1;
-        uuid = "c13bd2b1-cfc7-4966-8da5-d92356e87e06";
-        blockDevice = "/dev/sda";
-        blockDeviceUdevRuleMatcher = ''KERNEL=="sda"'';
-        clusterAddress = sanIp;
-      };
-    };
-  };
-}

hosts/jeremiah/default.nix

@@ -12,14 +12,20 @@
 {
   imports = [
     # Include the results of the hardware scan.
-    ./ceph.nix
     ./hardware-configuration.nix
-    ./minio.nix
   ];
 
   # Bootloader.
-  boot.loader.systemd-boot.enable = true;
+  boot.loader = {
-  boot.loader.efi.canTouchEfiVariables = true;
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
+
+  virtualisation.libvirtd = {
+    enable = true;
+    allowedBridges = [ "virbr0" ];
+    onBoot = "ignore"; # only restart VMs labeled 'autostart'
+  };
 
   networking = {
     hostName = "jeremiah"; # Define your hostname.
@@ -28,12 +34,6 @@
       address = " 10.42.1.1";
       interface = "enp68s0";
     };
-    vlans = {
-      san = {
-        id = 616;
-        interface = "enp67s0";
-      };
-    };
     interfaces = {
       enp68s0 = {
         ipv4.addresses = [
@@ -41,18 +41,6 @@
             address = "10.42.1.8";
             prefixLength = 16;
           }
-          {
-            address = "10.42.100.1";
-            prefixLength = 16;
-          }
-        ];
-      };
-      san = {
-        ipv4.addresses = [
-          {
-            address = "10.201.1.2";
-            prefixLength = 24;
-          }
         ];
       };
     };

hosts/jeremiah/minio.nix

@@ -1,33 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  minioPort = 9000;
-  minioConsolePort = 9001;
-in
-{
-  environment.systemPackages = with pkgs; [
-    minio-client
-    xfsprogs
-  ];
-
-  greg.proxies."minio-02.thehellings.lan".target = "http://localhost:9000";
-
-  fileSystems."/data/1" = {
-    device = "/dev/disk/by-id/ata-ST12000NM0558_ZHZ5YSXW-part1";
-    fsType = "xfs";
-  };
-
-  networking.firewall.allowedTCPPorts = [
-    minioPort
-    minioConsolePort
-  ];
-
-  age.secrets.minio.file = ../../secrets/minio.age;
-
-  services.minio = {
-    enable = true;
-    dataDir = [ "/data/1/minio" ];
-    rootCredentialsFile = config.age.secrets.minio.path;
-    browser = true;
-  };
-}