diff --git a/sets/packages.nix b/sets/packages.nix
index 33d09f9..92b9f12 100644
--- a/sets/packages.nix
+++ b/sets/packages.nix
@@ -1,12 +1,10 @@
 { config, pkgs, ... }:
 let
-  llvm = pkgs.llvmPackages_10;
-  go = pkgs.go_1_15;
+  llvm = pkgs.llvmPackages_12;
 in
 {
   environment.systemPackages = (with pkgs; [
     # Audiovisual
-    audacity
     darktable
     exiftool
     ffmpeg-full
@@ -16,7 +14,6 @@ in
     lame
     mpv
     obs-studio
-    obs-wlrobs
     opusTools
     pamixer
     pavucontrol
@@ -130,8 +127,7 @@ in
     gcc9
     gdb
     gnumake
-    go
-    gopls
+    llvm.bintools
     llvm.clang
     llvm.lld
     nasm
@@ -178,7 +174,4 @@ in
     en-us-large
     de_DE
   ]);
-
-  # Needed for obs-wlrobs
-  environment.pathsToLink = [ "/share/obs" "share/kicad" ];
 }
diff --git a/sets/virtualization.nix b/sets/virtualization.nix
index 47b1b33..24582fd 100644
--- a/sets/virtualization.nix
+++ b/sets/virtualization.nix
@@ -22,6 +22,7 @@
   environment.systemPackages = with pkgs; [
     virtmanager
     spice_gtk
+    # swtpm-tpm2
   ];
 
   users.users = {
diff --git a/system/starlight/boot-config.nix b/system/starlight/boot-config.nix
index cff07c0..117f4bb 100644
--- a/system/starlight/boot-config.nix
+++ b/system/starlight/boot-config.nix
@@ -16,9 +16,6 @@ in
       signing-certificate = "/root/secure-boot/db.crt";
     };
 
-    # Device fails with uas
-    kernelParams = [ "usb-storage.quirks=152d:0578:u" ];
-
     # Encrypted drives
     initrd.luks = {
       reusePassphrases = true;
diff --git a/system/starlight/default.nix b/system/starlight/default.nix
index 8aa1d0f..a5ecb86 100644
--- a/system/starlight/default.nix
+++ b/system/starlight/default.nix
@@ -75,6 +75,8 @@
     })
   ];
 
+  hardware.opengl.extraPackages = with pkgs; [ vulkan-validation-layers ];
+
   # Scanning
   hardware.sane.enable = true;
   users.users.artemis.extraGroups = [ "scanner" ];