demiurge: add alvr and bs-manager

3 files changed, 13 insertions, 21 deletions

diff --git a/flake.lock b/flake.lock
index 1a322e3..86130d3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -240,21 +240,6 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-deathraymind": {
-      "locked": {
-        "lastModified": 1744873743,
-        "narHash": "sha256-RmmdC46wMUAnb75NGSWOb5ppuUeUhYORpe+Z222KvNE=",
-        "owner": "Deathraymind",
-        "repo": "nixpkgs",
-        "rev": "5af202742b96118156e0518365e8f52931257ff4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Deathraymind",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
@@ -308,7 +293,6 @@
         "home-manager": "home-manager_2",
         "llama-cpp": "llama-cpp",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-deathraymind": "nixpkgs-deathraymind",
         "nixpkgs-stable": "nixpkgs-stable",
         "simple-nixos-mailserver": "simple-nixos-mailserver"
       }
diff --git a/flake.nix b/flake.nix
index f36dc3c..51ad1ea 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,11 +32,9 @@
       url = "/data/src/clones/llm/llama.cpp_hjc4869";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    nixpkgs-deathraymind.url = "github:Deathraymind/nixpkgs";
         };
 
-        outputs = { self, home-manager, nixpkgs, nixpkgs-stable, nixpkgs-deathraymind, everblush-gtk, agenix, simple-nixos-mailserver, llama-cpp, ... }@inputs: {
+        outputs = { self, home-manager, nixpkgs, nixpkgs-stable, everblush-gtk, agenix, simple-nixos-mailserver, llama-cpp, ... }@inputs: {
                 # TODO: deduplicate this
                 nixosConfigurations = {
                         demiurge = nixpkgs.lib.nixosSystem {
diff --git a/hosts/demiurge/default.nix b/hosts/demiurge/default.nix
index 9b433d1..ab517c3 100644
--- a/hosts/demiurge/default.nix
+++ b/hosts/demiurge/default.nix
@@ -1,4 +1,4 @@
-{ config, home-manager, lib, pkgs, inputs, llama-cpp, nixpkgs-deathraymind, ... }:
+{ config, home-manager, lib, pkgs, inputs, llama-cpp, ... }:
 
 {
   imports =
@@ -61,6 +61,15 @@
           cargoHash = "sha256-DnJL7kkcVn5dW3AoPCn829WmkaCjpDZtYUXnpiB857Q=";
         });
       })
+      (self: super: {
+        alvr = super.alvr.overrideAttrs (old: {
+          buildInputs = old.buildInputs ++ [ super.android-tools super.usbutils ];
+          nativeBuildInputs = old.nativeBuildInputs ++ [ super.makeWrapper ];
+          postInstall = (old.postInstall or "") + ''
+            wrapProgram $out/bin/alvr_dashboard --prefix PATH : "${super.lib.makeBinPath [ super.android-tools super.usbutils ]}"
+          '';
+        });
+      })
     ];
   };
 
@@ -161,7 +170,8 @@
       ];
 
       packages = with pkgs; [
-        nixpkgs-deathraymind.legacyPackages.x86_64-linux.adbforwarder
+        alvr
+        bs-manager
         distrobox
         (llama-cpp.packages.x86_64-linux.rocm.override { useVulkan = true; })
         #(quartus-prime-lite.override { supportedDevices = [ "MAX 10 FPGA" ]; })