From 70a6695ca14f9c401d4175251a3e362d204702bd Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Fri, 24 Nov 2023 09:19:06 +0100
Subject: [PATCH] updates and virtualization enhancements

---
 flake.lock                                    | 12 +++++-----
 hosts/thinkpad/default.nix                    | 24 +++----------------
 hosts/thinkpad/modules/networks/default.nix   | 10 +++++++-
 .../modules/virtualisation/default.nix        | 13 +++++++---
 4 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/flake.lock b/flake.lock
index a2c7fba..bc95544 100644
--- a/flake.lock
+++ b/flake.lock
@@ -179,11 +179,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700419052,
-        "narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=",
+        "lastModified": 1700695018,
+        "narHash": "sha256-MAiPLgBF4GLzSOlhnPCDWkWW5CDx4i7ApIYaR+TwTVg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "993fb02d20760067b8ee19c713d94cee07037759",
+        "rev": "134deb46abd5d0889d913b8509413f6f38b0811e",
         "type": "github"
       },
       "original": {
@@ -295,11 +295,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700390070,
-        "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
+        "lastModified": 1700612854,
+        "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
+        "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
         "type": "github"
       },
       "original": {
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index 3a0b5ba..40bb579 100755
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -77,7 +77,7 @@
   };
 
   fonts = {
-    enableDefaultFonts = false;
+    enableDefaultPackages = false;
     packages = with pkgs;
       [
         nerdfonts
@@ -110,7 +110,6 @@
     ];
   };
 
-  programs.dconf.enable = true;
 
   # control display backlight
   programs.light.enable = true;
@@ -181,40 +180,23 @@
     nvme-cli
     intel-gpu-tools
     tpm2-tools
+    lm_sensors
+    pciutils
 
     # system essentials
-    wget
     htop-vim
-    dig
-    traceroute
-    mtr
-    whois
-    inetutils
     lsof
     killall
     zip
     unzip
-    pciutils
-    lm_sensors
     sbctl
     man-pages
-    openssl
     cups
     agenix.packages.x86_64-linux.default
     mosh
     qpwgraph
   ];
 
-  # services.mysql = {
-  #   enable = true;
-  #   package = pkgs.mariadb;
-  #   ensureUsers = [
-  #     {
-  #       name = "user1";
-  #     }
-  #   ];
-  # };
-
   programs.java.enable = true;
   programs.wireshark = {
     enable = true;
diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix
index 84ed648..4c42ff0 100644
--- a/hosts/thinkpad/modules/networks/default.nix
+++ b/hosts/thinkpad/modules/networks/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ pkgs, config, ... }:
 {
   imports = [ ./uni.nix ];
 
@@ -16,6 +16,14 @@
     };
 
   };
+  environment.systemPackages = with pkgs; [
+    mtr
+    whois
+    inetutils
+    openssl
+    wget
+    dnsutils
+  ];
   services.lldpd.enable = true;
   services.resolved = {
     fallbackDns = [
diff --git a/hosts/thinkpad/modules/virtualisation/default.nix b/hosts/thinkpad/modules/virtualisation/default.nix
index f039376..e661127 100644
--- a/hosts/thinkpad/modules/virtualisation/default.nix
+++ b/hosts/thinkpad/modules/virtualisation/default.nix
@@ -54,9 +54,16 @@
 # in
 {
 
-  boot.kernelParams = [ "intel_iommu=on" ];
-  virtualisation.libvirtd.enable = true;
-  virtualisation.spiceUSBRedirection.enable = true;
+  # boot.kernelParams = [ "intel_iommu=on" ];
+  virtualisation = {
+    libvirtd = {
+      enable = true;
+      qemu = {
+        runAsRoot = false;
+      };
+    };
+    spiceUSBRedirection.enable = true;
+  };
 
   # fix to enable secure boot in vms
   environment.etc = {