thinkpad sync

3 files changed, 18 insertions, 24 deletions

diff --git a/os/core/drivers.nix b/os/core/drivers.nix
index 4198bf5..9b373db 100644
--- a/os/core/drivers.nix
+++ b/os/core/drivers.nix
@@ -2,12 +2,14 @@
   config,
   lib,
   pkgs,
+  inputs,
   ...
 }:
 let
   cfg = config.os.core.drivers;
 in
 {
+  imports = [ inputs.nix-gaming-edge.nixosModules.default ];
   options.os.core.drivers = {
     enable = lib.mkEnableOption "enables hardware drivers";
 
@@ -23,6 +25,14 @@ in
 
     graphics = {
       enable = lib.mkEnableOption "graphics support";
+      version = lib.mkOption {
+        type = lib.types.enum [
+          "stable"
+          "git"
+        ];
+        default = "stable";
+        description = "Which Mesa version to use. 'git' uses the mesa-git overlay.";
+      };
       amdgpu.enable = lib.mkEnableOption "amd specific gpu features";
     };
 
@@ -76,6 +86,14 @@ in
           rocmPackages.clr.icd
         ];
       })
+      (lib.mkIf (cfg.graphics.enable && cfg.graphics.version == "git") {
+        nixpkgs.overlays = [ inputs.nix-gaming-edge.overlays.mesa-git ];
+        drivers.mesa-git = {
+          enable = true;
+          # cacheCleanup.enable = true;
+          # steamOrphanCleanup.enable = true;
+        };
+      })
       {
         boot.kernelPackages =
           let
diff --git a/os/core/security.nix b/os/core/security.nix
index 34e2f1f..afd6297 100644
--- a/os/core/security.nix
+++ b/os/core/security.nix
@@ -100,7 +100,6 @@ in
 
         environment.systemPackages = with pkgs; [
           veracrypt
-          bitwarden-desktop
           keepassxc
         ];
       }
diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix
index 28ebcc3..2fcf340 100644
--- a/os/srv/gaming.nix
+++ b/os/srv/gaming.nix
@@ -80,34 +80,11 @@ in
 
     # --- VR SUPPORT ---
     (lib.mkIf cfg.vr.enable {
-      programs.alvr = {
-        enable = true;
-        openFirewall = true;
-        package = pkgs.alvr.overrideAttrs (
-          finalAttrs: prevAttrs: {
-            version = "20.13.0";
-
-            src = pkgs.fetchFromGitHub {
-              owner = "alvr-org";
-              repo = "ALVR";
-              tag = "v${finalAttrs.version}";
-              fetchSubmodules = true;
-              hash = "sha256-h7/fuuolxbNkjUbqXZ7NTb1AEaDMFaGv/S05faO2HIc=";
-            };
-
-            cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
-              inherit (finalAttrs) src;
-              hash = "sha256-A0ADPMhsREH1C/xpSxW4W2u4ziDrKRrQyY5kBDn//gQ=";
-            };
-          }
-        );
-      };
       services.wivrn = {
         enable = true;
         openFirewall = true;
         highPriority = true;
         steam.importOXRRuntimes = true;
-        defaultRuntime = true;
       };
       environment.systemPackages = [ pkgs.android-tools ];
       users.users.${username}.extraGroups = [ "adbusers" ];