radeontop and more

This commit is contained in:
Julian Sutter 2024-12-21 16:02:42 -08:00
parent aed77cf69d
commit b5b03dea63
4 changed files with 20 additions and 24 deletions

View file

@ -4,15 +4,12 @@
virtualisation = { virtualisation = {
libvirtd = { libvirtd = {
enable = true; enable = true;
qemu = { qemu.ovmf.enable = true;
ovmf.enable = true; qemu.swtpm.enable = true;
swtpm.enable = true; qemu.ovmf.packages = [ pkgs.OVMFFull ];
ovmf.packages = [ pkgs.OVMFFull ];
};
}; };
spiceUSBRedirection.enable = true; spiceUSBRedirection.enable = true;
}; };
services.spice-vdagentd.enable = true; services.spice-vdagentd.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -29,11 +26,13 @@
users.extraGroups.vboxusers.members = [ "jsutter" ]; 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" ]; boot.kernelModules = [ "kvm-intel" "kvm-amd" ];
virtualisation.libvirtd.allowedBridges = [ "br0" ]; virtualisation.libvirtd.allowedBridges =
[ "br0" ];
networking.interfaces.br0.useDHCP = true; networking.interfaces.br0.useDHCP = true;
} }

18
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732884235, "lastModified": 1734808199,
"narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", "narHash": "sha256-MxlUcLjE8xLbrI1SJ2B2jftlg4wdutEILa3fgqwA98I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "819f682269f4e002884702b87e445c82840c68f2", "rev": "f342df3ad938f205a913973b832f52c12546aac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1732483221, "lastModified": 1734352517,
"narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,11 +38,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732837521, "lastModified": 1734424634,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -37,8 +37,6 @@
./desktop/virtualization.nix ./desktop/virtualization.nix
./desktop/office.nix ./desktop/office.nix
./desktop/gaming.nix ./desktop/gaming.nix
./servers/common.nix
./servers/hugo.nix
]; ];
}; };
labrizor = nixpkgs.lib.nixosSystem { labrizor = nixpkgs.lib.nixosSystem {
@ -50,7 +48,6 @@
./users/isutter.nix ./users/isutter.nix
./users/aksutter.nix ./users/aksutter.nix
./desktop/plasma.nix ./desktop/plasma.nix
./desktop/virtualization.nix
./desktop/3dprinting.nix ./desktop/3dprinting.nix
]; ];
}; };

View file

@ -60,9 +60,9 @@
}; };
}; };
## Keyboard controller support
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
via via
radeontop
]; ];
services.udev.packages = [ pkgs.via ]; services.udev.packages = [ pkgs.via ];