desktop sync

2 files changed, 33 insertions, 12 deletions

diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix
index 2fcf340..ad2d748 100644
--- a/os/srv/gaming.nix
+++ b/os/srv/gaming.nix
@@ -3,6 +3,7 @@
   lib,
   pkgs,
   username,
+  inputs,
   ...
 }:
 let
@@ -61,7 +62,13 @@ in
       environment.systemPackages = with pkgs; [
         openttd-jgrpp
         openmw
-        portmod
+        inputs.openmw-nix.packages.x86_64-linux.umo
+        inputs.openmw-nix.packages.x86_64-linux.momw-configurator
+        inputs.openmw-nix.packages.x86_64-linux.delta-plugin
+        inputs.openmw-nix.packages.x86_64-linux.openmw-validator
+        inputs.openmw-nix.packages.x86_64-linux.groundcoverify
+        inputs.openmw-nix.packages.x86_64-linux.plox
+        inputs.openmw-nix.packages.x86_64-linux.s3lightfixes
       ];
     })
 
@@ -80,11 +87,34 @@ 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" ];
diff --git a/os/srv/i2p.nix b/os/srv/i2p.nix
index f2c27b1..9bf897b 100644
--- a/os/srv/i2p.nix
+++ b/os/srv/i2p.nix
@@ -11,7 +11,7 @@ in
 {
   options.os.srv.i2p = {
     enable = lib.mkEnableOption "enables i2pd";
-    enableBrowser = lib.mkEnableOption "enables mullvad browser and creates a desktop entry";
+    enableBrowser = lib.mkEnableOption "enables mullvad browser for browsing eepsites";
   };
 
   config = lib.mkMerge [
@@ -42,16 +42,7 @@ in
       };
     })
     (lib.mkIf cfg.enableBrowser {
-      home-manager.users.${username} = {
-        home.packages = [ pkgs.mullvad-browser ];
-        xdg.desktopEntries = {
-          i2p-browser = {
-            name = "i2p Browser";
-            genericName = "Web Browser";
-            exec = "${pkgs.mullvad-browser}/bin/mullvad-browser -p i2p";
-          };
-        };
-      };
+      home-manager.users.${username}.home.packages = [ pkgs.mullvad-browser ];
     })
   ];
 }