From bc81c39a950d4d677ae2f3801365e48b9e717d59 Mon Sep 17 00:00:00 2001
From: Kabbone <tobias@opel-online.de>
Date: Sat, 26 Nov 2022 21:16:39 +0100
Subject: [PATCH] hosts: fine adjustments first boot server

---
 hosts/configuration_server.nix          |  1 +
 hosts/default.nix                       |  2 +-
 hosts/server/hardware-configuration.nix | 20 ++++----------------
 hosts/server/home.nix                   |  1 -
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/hosts/configuration_server.nix b/hosts/configuration_server.nix
index b29ca3c..313ebee 100644
--- a/hosts/configuration_server.nix
+++ b/hosts/configuration_server.nix
@@ -93,6 +93,7 @@
       enable = true;                        # local: $ ssh <user>@<ip>
       passwordAuthentication = false;
     };
+    qemuGuest.enable = true;
 
     #flatpak.enable = true;                  # download flatpak file from website - sudo flatpak install <path> - reboot if not showing up
                                             # sudo flatpak uninstall --delete-data <app-id> (> flatpak list --app) - flatpak uninstall --unused
diff --git a/hosts/default.nix b/hosts/default.nix
index 3ecb435..d37df5e 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -80,7 +80,7 @@ in
 
   dmz-services = lib.nixosSystem {                                # Desktop profile
     inherit system;
-    user = "dmz-user";
+    #user = "dmz-user";
     specialArgs = { inherit inputs user location nixos-hardware nur; };
     modules = [
       nur.nixosModules.nur
diff --git a/hosts/server/hardware-configuration.nix b/hosts/server/hardware-configuration.nix
index c8ac54d..86c6ab3 100644
--- a/hosts/server/hardware-configuration.nix
+++ b/hosts/server/hardware-configuration.nix
@@ -14,12 +14,12 @@
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
   boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" "vfio_virqfd" ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
@@ -57,18 +57,6 @@
       fsType = "vfat";
     };
 
-  fileSystems."/mnt/Herkules" =
-    { device = "truenas:/mnt/Herkules";
-      fsType = "nfs";
-      options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec" ];
-    };
-
-  fileSystems."/mnt/Nova" =
-    { device = "truenas:/mnt/Nova";
-      fsType = "nfs";
-      options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec" ];
-    };
-
 
   swapDevices = [ ];
   
@@ -79,7 +67,7 @@
       enable = true;
     };
     interfaces = {
-      enp34s0 = {
+      enp6s18 = {
         useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
         #ipv4.addresses = [ {
         #    address = "192.168.0.51";
diff --git a/hosts/server/home.nix b/hosts/server/home.nix
index 886a66a..2a86eac 100644
--- a/hosts/server/home.nix
+++ b/hosts/server/home.nix
@@ -37,7 +37,6 @@
   };
 
   services = {                            # Applets
-   blueman-applet.enable = true;         # Bluetooth
    network-manager-applet.enable = true; # Network
   };