common/vm/default.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./qemu-guest.nix
-  ];
-}

common/vm/qemu-guest.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  services.qemuGuest.enable = true;
-}

hosts/ca/configuration.nix

@@ -8,7 +8,6 @@
     ../template/hardware-configuration.nix
 
     ../../system
-    ../../common/vm
   ];
 
   nixpkgs.config.allowUnfree = true;

hosts/ha1/configuration.nix

@@ -1,16 +1,11 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 {
-  imports = [
+  imports =
+    [
       ../template/hardware-configuration.nix
 
       ../../system
-    ../../common/vm
     ];
 
   nixpkgs.config.allowUnfree = true;
@@ -44,10 +39,7 @@
   };
   time.timeZone = "Europe/Oslo";
 
-  nix.settings.experimental-features = [
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-    "nix-command"
-    "flakes"
-  ];
   nix.settings.tarball-ttl = 0;
   environment.systemPackages = with pkgs; [
     vim
@@ -75,3 +67,4 @@
 
   system.stateVersion = "23.11"; # Did you read the comment?
 }
+

hosts/http-proxy/configuration.nix

@@ -8,7 +8,6 @@
     ../template/hardware-configuration.nix
 
     ../../system
-    ../../common/vm
   ];
 
   nixpkgs.config.allowUnfree = true;

hosts/monitoring01/configuration.nix

@@ -8,7 +8,6 @@
     ../template/hardware-configuration.nix
 
     ../../system
-    ../../common/vm
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -53,8 +52,6 @@
     git
   ];
 
-  services.qemuGuest.enable = true;
-
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];

hosts/ns1/configuration.nix

@@ -1,18 +1,13 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 {
-  imports = [
+  imports =
+    [
       ../template/hardware-configuration.nix
 
       ../../system
       ../../services/ns/master-authorative.nix
       ../../services/ns/resolver.nix
-    ../../common/vm
     ];
 
   nixpkgs.config.allowUnfree = true;
@@ -43,10 +38,7 @@
   };
   time.timeZone = "Europe/Oslo";
 
-  nix.settings.experimental-features = [
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-    "nix-command"
-    "flakes"
-  ];
   nix.settings.tarball-ttl = 0;
   environment.systemPackages = with pkgs; [
     vim
@@ -62,3 +54,4 @@
 
   system.stateVersion = "23.11"; # Did you read the comment?
 }
+

hosts/ns2/configuration.nix

@@ -1,18 +1,13 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 {
-  imports = [
+  imports =
+    [
       ../template/hardware-configuration.nix
 
       ../../system
       ../../services/ns/secondary-authorative.nix
       ../../services/ns/resolver.nix
-    ../../common/vm
     ];
 
   nixpkgs.config.allowUnfree = true;
@@ -43,10 +38,7 @@
   };
   time.timeZone = "Europe/Oslo";
 
-  nix.settings.experimental-features = [
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-    "nix-command"
-    "flakes"
-  ];
   environment.systemPackages = with pkgs; [
     vim
     wget
@@ -61,3 +53,4 @@
 
   system.stateVersion = "23.11"; # Did you read the comment?
 }
+

services/monitoring/prometheus.nix

@@ -36,9 +36,6 @@
         ];
       }
     ];
-    globalConfig = {
-      scrape_interval = "15s";
-    };
     rules = [
       ''
         groups:
@@ -127,14 +124,6 @@
           }
         ];
       }
-      {
-        job_name = "prometheus";
-        static_configs = [
-          {
-            targets = [ "localhost:9090" ];
-          }
-        ];
-      }
       {
         job_name = "pve-exporter";
         static_configs = [

system/monitoring/metrics.nix

@@ -5,8 +5,6 @@
     enabledCollectors = [
       "systemd"
       "logind"
-      "cgroups"
-      "processes"
     ];
   };
 }