diff --git a/flake.lock b/flake.lock index 5dab6fff..1f913627 100644 --- a/flake.lock +++ b/flake.lock @@ -2313,23 +2313,6 @@ "type": "github" } }, - "immich": { - "flake": false, - "locked": { - "lastModified": 1757619545, - "narHash": "sha256-0nStZuSnb8tJ0+Y247MHitmMURl8vTuPLAhUm+OHctE=", - "owner": "immich-app", - "repo": "immich", - "rev": "4153848c68d416329deecf8b671e02bd754b4dd7", - "type": "github" - }, - "original": { - "owner": "immich-app", - "ref": "v1.142.0", - "repo": "immich", - "type": "github" - } - }, "ironbar": { "inputs": { "flake-compat": "flake-compat_4", @@ -3411,7 +3394,6 @@ "hyprlock": "hyprlock", "hyprmonitors": "hyprmonitors", "ik_llama": "ik_llama", - "immich": "immich", "ironbar": "ironbar", "lanzaboote": "lanzaboote", "lfca": "lfca", @@ -3448,7 +3430,6 @@ "tree-sitter-slint": "tree-sitter-slint", "typr": "typr", "volt": "volt", - "wivrn": "wivrn", "yabai": "yabai", "zen-browser": "zen-browser", "zeronsd": "zeronsd", @@ -4572,23 +4553,6 @@ "type": "github" } }, - "wivrn": { - "flake": false, - "locked": { - "lastModified": 1762796646, - "narHash": "sha256-pEKMeRdI9UhdZ+NksRBcF7yPC7Ys2haE+B4PPGQ4beE=", - "owner": "WiVRn", - "repo": "WiVRn", - "rev": "09031b9aa5296d3be45c996fada9347f5ccb6f66", - "type": "github" - }, - "original": { - "owner": "WiVRn", - "ref": "v25.11.1", - "repo": "WiVRn", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index b56d2737..38e818ee 100644 --- a/flake.nix +++ b/flake.nix @@ -214,10 +214,6 @@ url = "github:ggml-org/llama.cpp/b6178?submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; }; - immich = { - url = "github:immich-app/immich/v1.142.0"; - flake = false; - }; yabai = { url = "github:koekeishiya/yabai"; flake = false; @@ -234,10 +230,6 @@ url = "github:nix-community/nixpkgs-xr"; inputs.nixpkgs.follows = "nixpkgs"; }; - wivrn = { - url = "github:WiVRn/WiVRn/v25.11.1"; - flake = false; - }; handoff = { # url = "github:uttarayan21/handoff"; url = "path:/home/servius/Projects/handoff"; diff --git a/nixos/ryu/apps/default.nix b/nixos/ryu/apps/default.nix index ea46711a..c5c9599a 100644 --- a/nixos/ryu/apps/default.nix +++ b/nixos/ryu/apps/default.nix @@ -6,5 +6,6 @@ imports = [ # ./alvr.nix ./easyeffects.nix + ./vr.nix ]; } diff --git a/nixos/ryu/programs/wlx-overlays.nix b/nixos/ryu/apps/vr.nix similarity index 70% rename from nixos/ryu/programs/wlx-overlays.nix rename to nixos/ryu/apps/vr.nix index 00f2b09f..5fcac118 100644 --- a/nixos/ryu/programs/wlx-overlays.nix +++ b/nixos/ryu/apps/vr.nix @@ -1,5 +1,7 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ wlx-overlay-s + wayvr-dashboard + bs-manager ]; } diff --git a/nixos/ryu/programs/default.nix b/nixos/ryu/programs/default.nix index 850b4a29..bd0bc370 100644 --- a/nixos/ryu/programs/default.nix +++ b/nixos/ryu/programs/default.nix @@ -9,6 +9,5 @@ ./gnome-disks.nix ./nix-ld.nix ./gamemode.nix - ./wlx-overlays.nix ]; } diff --git a/nixos/ryu/programs/obs-studio.nix b/nixos/ryu/programs/obs-studio.nix index c12c6ae4..033fa053 100644 --- a/nixos/ryu/programs/obs-studio.nix +++ b/nixos/ryu/programs/obs-studio.nix @@ -5,6 +5,8 @@ enableVirtualCamera = true; plugins = [ pkgs.obs-studio-plugins.wlrobs + pkgs.obs-studio-plugins.input-overlay + pkgs.obs-studio-plugins.obs-vkcapture # pkgs.obs-studio-plugins.droidcam-obs ]; }; diff --git a/nixos/ryu/ryu.nix b/nixos/ryu/ryu.nix index 9e7907ef..7ae00141 100644 --- a/nixos/ryu/ryu.nix +++ b/nixos/ryu/ryu.nix @@ -20,6 +20,7 @@ vpl-gpu-rt intel-media-driver nvidia-vaapi-driver + cudatoolkit # vaapiVdpau # libvdpau-va-gl # nvidia-utils diff --git a/nixos/ryu/services/default.nix b/nixos/ryu/services/default.nix index 7e548080..ebd52469 100644 --- a/nixos/ryu/services/default.nix +++ b/nixos/ryu/services/default.nix @@ -20,5 +20,6 @@ ./sshd.nix ./fprintd.nix ./handoff.nix + ./gstreamer.nix ]; } diff --git a/nixos/ryu/services/gstreamer.nix b/nixos/ryu/services/gstreamer.nix new file mode 100644 index 00000000..d23257d3 --- /dev/null +++ b/nixos/ryu/services/gstreamer.nix @@ -0,0 +1,22 @@ +{pkgs, ...}: { + environment = { + systemPackages = with pkgs; [ + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-rs + gst_all_1.gst-plugins-ugly + gst_all_1.gstreamer + gst_all_1.gstreamermm + gst_all_1.gst-rtsp-server + gst_all_1.gst-vaapi + # gst_all_1.icamerasrc-ipu6 + # gst_all_1.icamerasrc-ipu6ep + # gst_all_1.icamerasrc-ipu6epmtl + ]; + sessionVariables = { + GST_PLUGIN_PATH = "/run/current-system/sw/lib/gstreamer-1.0/"; + }; + }; +} diff --git a/nixos/ryu/services/wivrn.nix b/nixos/ryu/services/wivrn.nix index 7b33c64d..583b3b93 100644 --- a/nixos/ryu/services/wivrn.nix +++ b/nixos/ryu/services/wivrn.nix @@ -4,6 +4,10 @@ openFirewall = true; defaultRuntime = true; autoStart = true; - package = pkgs.wivrn; + steam = { + importOXRRuntimes = true; + }; + highPriority = true; + # package = pkgs.wivrn; }; } diff --git a/overlays.nix b/overlays.nix index 3b2c6e1c..e7c97601 100644 --- a/overlays.nix +++ b/overlays.nix @@ -259,17 +259,17 @@ ''; }); }; - immich = final: prev: { - immich-latest = prev.immich.overrideAttrs (oldAttrs: { - version = "v1.142.0"; - src = inputs.immich; - }); - }; + # immich = final: prev: { + # immich-latest = prev.immich.overrideAttrs (oldAttrs: { + # version = "v1.142.0"; + # src = inputs.immich; + # }); + # }; vr = final: prev: { - wivrn = prev.wivrn.overrideAttrs (oldAttrs: { - version = "v25.11.1"; - src = inputs.wivrn; - }); + # wivrn = prev.wivrn.overrideAttrs (oldAttrs: { + # version = "v25.11.1"; + # src = inputs.wivrn; + # }); # inputs.wivrn.packages.${prev.system}.default; }; in @@ -278,7 +278,6 @@ in anyrun-overlay catppuccinThemes csshacks - immich inputs.lfca.overlays.default inputs.nix-minecraft.overlay inputs.nur.overlays.default