From 2f7158385c80471e58a9ac2cdda20a271af233a4 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sat, 23 Mar 2024 13:02:14 +0000
Subject: [PATCH] Vanguard back to desktop / Hyprland (again...)

Also Vanguard: remove amdvlk package, use mesa drivers instead;
Getting better performance and it fixed the rendering bug with HFW
---
 flake.nix                        | 8 +++++---
 hosts/Vanguard/configuration.nix | 8 +-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index 376ab534..a802b5c1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -186,10 +186,12 @@
       Vanguard = systemConfig {
         hostName = "Vanguard";
         systemModules = [
-          ./services/sshd.nix
-          ./system/gamescope.nix
+          ./system/hyprland.nix
+          ./system/games.nix
+        ];
+        homeModules = [
+          ./home/hyprland/default.nix
         ];
-        homeModules = [./home/default.nix];
       };
 
       ## Work
diff --git a/hosts/Vanguard/configuration.nix b/hosts/Vanguard/configuration.nix
index b35ee6e3..13485c96 100644
--- a/hosts/Vanguard/configuration.nix
+++ b/hosts/Vanguard/configuration.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{config, ...}: {
   boot = {
     initrd.kernelModules = ["amdgpu"];
     extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
@@ -13,8 +9,6 @@
   hardware.opengl = {
     driSupport = true;
     driSupport32Bit = true;
-    extraPackages = with pkgs; [amdvlk rocmPackages.clr.icd];
-    extraPackages32 = [pkgs.driversi686Linux.amdvlk];
   };
   services.ollama.enable = true;
   networking.wg-quick.interfaces = {