From b5b03dea636dfb264bac05235c61bb28c16a359b Mon Sep 17 00:00:00 2001
From: Julian Sutter <jsutter@symbiotip.com>
Date: Sat, 21 Dec 2024 16:02:42 -0800
Subject: [PATCH] radeontop and more

---
 desktop/virtualization.nix | 21 ++++++++++-----------
 flake.lock                 | 18 +++++++++---------
 flake.nix                  |  3 ---
 systems/framework.nix      |  2 +-
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/desktop/virtualization.nix b/desktop/virtualization.nix
index 065890d..ba6369f 100755
--- a/desktop/virtualization.nix
+++ b/desktop/virtualization.nix
@@ -4,15 +4,12 @@
   virtualisation = {
     libvirtd = {
       enable = true;
-      qemu = {
-        ovmf.enable = true;
-        swtpm.enable = true;
-        ovmf.packages = [ pkgs.OVMFFull ];
+      qemu.ovmf.enable = true;
+      qemu.swtpm.enable = true;
+      qemu.ovmf.packages = [ pkgs.OVMFFull ];
       };
-    };
     spiceUSBRedirection.enable = true;
-  };
-
+    };
   services.spice-vdagentd.enable = true;
 
   environment.systemPackages = with pkgs; [
@@ -23,17 +20,19 @@
     spice-protocol
     win-virtio
     win-spice
-    # quickemu
+#    quickemu
     spicy
-  ];
+    ];
 
   users.extraGroups.vboxusers.members = [ "jsutter" ];
 
-  environment.sessionVariables.LIBVIRT_DEFAULT_URI = "qemu:///system";
+  environment.sessionVariables.LIBVIRT_DEFAULT_URI = [ "qemu:///system" ];
 
   boot.kernelModules = [ "kvm-intel" "kvm-amd" ];
 
-  virtualisation.libvirtd.allowedBridges = [ "br0" ];
+  virtualisation.libvirtd.allowedBridges =
+    [ "br0" ];
 
   networking.interfaces.br0.useDHCP = true;
+
 }
diff --git a/flake.lock b/flake.lock
index 6dbfd80..16d0a43 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732884235,
-        "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=",
+        "lastModified": 1734808199,
+        "narHash": "sha256-MxlUcLjE8xLbrI1SJ2B2jftlg4wdutEILa3fgqwA98I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "819f682269f4e002884702b87e445c82840c68f2",
+        "rev": "f342df3ad938f205a913973b832f52c12546aac6",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1732483221,
-        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
+        "lastModified": 1734352517,
+        "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
+        "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732837521,
-        "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
+        "lastModified": 1734424634,
+        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
+        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index f19d54d..01545a2 100755
--- a/flake.nix
+++ b/flake.nix
@@ -37,8 +37,6 @@
         ./desktop/virtualization.nix
         ./desktop/office.nix
         ./desktop/gaming.nix
-	./servers/common.nix
-	./servers/hugo.nix
         ];
       };
       labrizor = nixpkgs.lib.nixosSystem {
@@ -50,7 +48,6 @@
         ./users/isutter.nix
         ./users/aksutter.nix
         ./desktop/plasma.nix
-	./desktop/virtualization.nix
         ./desktop/3dprinting.nix
         ];
       };
diff --git a/systems/framework.nix b/systems/framework.nix
index 4712ba0..7f648bd 100755
--- a/systems/framework.nix
+++ b/systems/framework.nix
@@ -60,9 +60,9 @@
     };
   };
 
-  ## Keyboard controller support
   environment.systemPackages = with pkgs; [
      via
+     radeontop
   ];
   services.udev.packages = [ pkgs.via ];