From 0c6b78834551496a5e02db41f1579c580a4354a7 Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Mon, 13 Jul 2026 12:31:50 +0100 Subject: [PATCH] AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA --- config/hosts/aspects/doloro-desktop/home.nix | 5 +- config/modules/obs.nix | 37 ++--- flake.lock | 141 +++++++++++-------- 3 files changed, 101 insertions(+), 82 deletions(-) diff --git a/config/hosts/aspects/doloro-desktop/home.nix b/config/hosts/aspects/doloro-desktop/home.nix index 84d6c81..6cf0fbb 100644 --- a/config/hosts/aspects/doloro-desktop/home.nix +++ b/config/hosts/aspects/doloro-desktop/home.nix @@ -102,8 +102,9 @@ # gamescope android-studio blender - bottles - pi-coding-agent + tetrio-plus + # bottles + # pi-coding-agent # orca-slicer's wrapGAppsHook does not actually wrap the installed # binary, so neither the GSettings schema path nor the NVIDIA/zink # workaround env from `withNvidiaGLWorkaround` reach the process. diff --git a/config/modules/obs.nix b/config/modules/obs.nix index c0105ec..1ef5658 100644 --- a/config/modules/obs.nix +++ b/config/modules/obs.nix @@ -16,24 +16,25 @@ programs = { obs-studio = { enable = true; - package = ( - (pkgs.obs-studio.overrideAttrs (old: { - version = "32.2.0-beta2-unstable"; - src = pkgs.fetchFromGitHub { - owner = "obsproject"; - repo = "obs-studio"; - rev = "27ac23ef750aafb2bb7ddd499ede5755a5a3087f"; - hash = "sha256-3wPHNgYzR+ZIbCYMh5ocyK/nsQxy24Wfa03kheYOU88="; - fetchSubmodules = true; - }; - cmakeFlags = (old.cmakeFlags or []) ++ [ - "-DOBS_VERSION_OVERRIDE=32.2.0-beta2" - ]; - })).override - { - cudaSupport = true; - } - ); + # package = ( + # (pkgs.obs-studio.overrideAttrs (old: { + # version = "32.2.0-beta2-unstable"; + # src = pkgs.fetchFromGitHub { + # owner = "obsproject"; + # repo = "obs-studio"; + # rev = "27ac23ef750aafb2bb7ddd499ede5755a5a3087f"; + # hash = "sha256-3wPHNgYzR+ZIbCYMh5ocyK/nsQxy24Wfa03kheYOU88="; + # fetchSubmodules = true; + # }; + # cmakeFlags = (old.cmakeFlags or []) ++ [ + # "-DOBS_VERSION_OVERRIDE=32.2.0-beta2" + # ]; + # })).override + # { + # cudaSupport = true; + # } + # ); + package = pkgs.obs-studio.override { cudaSupport = true; }; plugins = with pkgs.obs-studio-plugins; [ obs-pipewire-audio-capture obs-vkcapture diff --git a/flake.lock b/flake.lock index 427aa7f..0d0885a 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1783173044, - "narHash": "sha256-IzB6XWH8zyBhR3zS2eCKwtVOLipOpVSwN8Lnpgn+5k0=", + "lastModified": 1783566754, + "narHash": "sha256-EyVTx67qTNB2utnXRUgOWnaZxV6c07XE2rVCq/qgWxI=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "d96a067ff30ed47ff1743d60a569b4badd2d7670", + "rev": "4065d7e175fb182a2e30b982b0d8121c97c8d46b", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1782814529, - "narHash": "sha256-YGYe7cy8vUFguQzdCt6FP1B/viF53cJdFZhNJ8Rpp5Y=", + "lastModified": 1783564544, + "narHash": "sha256-oOgjJXRLkTDfOcgPQpHF7MwIBPOf1pHT77EC/YVfkm4=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "f98908d8b5cacc4c24a6039ffd9f41f6a0de4ba2", + "rev": "c624c9c8cffc11dd619a7d37f903556c60d24e9c", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1782976048, - "narHash": "sha256-4Zpmn8rJqBWi2gW0BnYWGlYUjqmDVKCaJKyPVk30s6k=", + "lastModified": 1783857890, + "narHash": "sha256-rD4KU1jXXUuUP7ZWuxp8xoroXEne+NCeGrb77ZGhGvM=", "owner": "Mic92", "repo": "direnv-instant", - "rev": "c3d76e36f5431e34c7f33a3017c28d4bd53bb3c1", + "rev": "4d440be96bc6294c891f309d3c944bef64879c9a", "type": "github" }, "original": { @@ -472,14 +472,15 @@ "nixpkgs": [ "nixpkgs" ], + "nixpkgs-darwin": "nixpkgs-darwin", "utils": "utils" }, "locked": { - "lastModified": 1783223803, - "narHash": "sha256-tm6T+BmxX03IV5m5YLR9RixTATCs/FXbJMjZa4kzsA8=", + "lastModified": 1783756748, + "narHash": "sha256-hB8uUHBDsaZafd19ilbNVntTzaF7Sr2zGQDDb1tk8pE=", "owner": "vikingnope", "repo": "helium-browser-nix-flake", - "rev": "a4d5eb6e4b8a44d84fd66fe6771c49b51369bf51", + "rev": "2efc1e5eaabb81ffcbd66ded45a18bf3aa1c21c5", "type": "github" }, "original": { @@ -495,11 +496,11 @@ ] }, "locked": { - "lastModified": 1783479733, - "narHash": "sha256-d/JatqgG+Pmo+IuCTZfnrEAPWU3fdha48GQeXuFO+bE=", + "lastModified": 1783823409, + "narHash": "sha256-OI4IkRjRXa1e7hYmCGJDPDq5H/kPwhsyoS80cNUF9fI=", "owner": "nix-community", "repo": "home-manager", - "rev": "cee3f0e7fec85d80c149c7afc29926747f7bd3c2", + "rev": "7566825d4652a1b885bd4ce65bd9e8def432fec9", "type": "github" }, "original": { @@ -583,11 +584,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1783449028, - "narHash": "sha256-X7T5MtKdw7daUN2r2v7zVLrN4OKowJ3hgm+rSPeESnw=", + "lastModified": 1783866241, + "narHash": "sha256-UzU1qO0RDO7HQFFYFgxT/kUhfdHVTSSs6sSgJG2h3uo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "6a8eb0490ce3ff3cbf9b00815f7a215e895d87e0", + "rev": "ef18043b5ce913256c336c063147e120afd2abb1", "type": "github" }, "original": { @@ -907,11 +908,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1783510829, - "narHash": "sha256-VtZC3AiKp3w6oCTRlEaraI9Fi2T8CmdDuhzGf3lNG9M=", + "lastModified": 1783835967, + "narHash": "sha256-lbAgaLDBemsTac7H1HlABcaSKA9xCK5SBzYpEaklY4E=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ba8fc95733e53354e82dd1a821d8391dcd56e4bc", + "rev": "3374954b30e9e00637517f973a72ca928384b5f0", "type": "github" }, "original": { @@ -940,11 +941,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1783506058, - "narHash": "sha256-LyuNO/1BM7GphVyt4C4Qj2OkdHZvM/9Hxs7mQ5ExjYc=", + "lastModified": 1783522755, + "narHash": "sha256-dI0HkX1djETia7cD/Y64h8BNIsSOfTRMzfNum2J6UhE=", "owner": "YaLTeR", "repo": "niri", - "rev": "ef5b7379dc444d33b01a7faec2bd6592d3188357", + "rev": "0777769e719b7c9b7c980d4ea66288bfbb4da5b3", "type": "github" }, "original": { @@ -962,11 +963,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1783276891, - "narHash": "sha256-7+9RDZQxflIV5AuRqxIh+ZK+GrFUgngAzo5wPyhxBP4=", + "lastModified": 1783794640, + "narHash": "sha256-SgzzS5GtMFv323ritWP8A3rwhjphB7AYTfHLNSXGX3c=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "cf393892e55698ed5ac49377a24476d87bd880d4", + "rev": "6472f543b68e0b874603ad944419747815cfeb7a", "type": "github" }, "original": { @@ -997,11 +998,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1783370751, - "narHash": "sha256-E+3MIMvKuo9k+K+qLQ9YXzsBzkgHuyVLnsEbN2DFfuc=", + "lastModified": 1783792734, + "narHash": "sha256-50rvY9GdFvpYDcMLcD/4cWSi0hVxArT5wsGlVsHy8eY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "662bd6e312d2c8b212e32cb377abaee190749320", + "rev": "8efb4337e857949f4cfac86d12ef1066f417f31f", "type": "github" }, "original": { @@ -1080,11 +1081,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1782723713, - "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { @@ -1094,6 +1095,22 @@ "type": "github" } }, + "nixpkgs-darwin": { + "locked": { + "lastModified": 1783707519, + "narHash": "sha256-VJ+eK/EB7aIZ246bXjkYalr4YWQAtHRJeh15Qw2LxUs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2b35450a66cf6ee8492099a6eb1903796965d32d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-26.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1782614948, @@ -1127,11 +1144,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1783224372, - "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { @@ -1143,11 +1160,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1783279667, - "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", + "lastModified": 1783604885, + "narHash": "sha256-tzMgSkV7kljEkqIjlgV6F+n+xD+/a35Db8bs7a4BFAo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", + "rev": "767b0d3ec98a143ad9ed7dfc0d5553510ac27133", "type": "github" }, "original": { @@ -1191,11 +1208,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1783224372, - "narHash": "sha256-FGQ8TfSm9WviNE/fQAWsKs+y4GkX8fU4EScewpw54Y8=", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "lastModified": 1783776592, + "narHash": "sha256-+GVwKnbbSmf4cWMJyRzvw8H5yFknmkLoPD5v6snqPzo=", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1027867.d407951447dc/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1032869.e7a3ca8092b6/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1233,11 +1250,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1783224372, - "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", + "lastModified": 1783522502, + "narHash": "sha256-iffAls3iaNTyJC2faYcUXSI+Gp02cDjYl+MygxKl2GI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "rev": "0bb7ec54c8483066ec9d7720e780a5caa71f8612", "type": "github" }, "original": { @@ -1265,11 +1282,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1783264223, - "narHash": "sha256-3Uiwx/j6LYuQH3hYkPLOZrKjLtQO03fPkO3K0hIp8Jc=", + "lastModified": 1783760736, + "narHash": "sha256-PEXS6z/zIvH+O7J3Ua3N2OUE7IvMhhghwtKxZhVfm5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "28d4faad49f8095ec21ebf0454aa8e9c7d7d0af9", + "rev": "bbb4df715cb62e53cd329090c2b69eb07f2bddac", "type": "github" }, "original": { @@ -1331,11 +1348,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1783349931, - "narHash": "sha256-aYE76ATiGBg7/cQ2dHASRq97WvNum4OOIPgZ8xIK0QI=", + "lastModified": 1783862302, + "narHash": "sha256-UVik+sgPu9nSsn6/aguA6TEU+J/hivoksEoBRSi5VXw=", "owner": "nix-community", "repo": "nixvim", - "rev": "4fd45857deecb90d2732c87e0315daa48505515e", + "rev": "992c9c0f743822d68b51b7a11c6a07b4b50e27e9", "type": "github" }, "original": { @@ -1374,11 +1391,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1783357537, - "narHash": "sha256-M7clXqSngBP+2h0T0jyE3QyEcUeGyULqM09dSZh+mJ4=", + "lastModified": 1783821876, + "narHash": "sha256-FKZlHCJLzJaSFY9r2qNtjLODflv/YijDZ692OSuoRxY=", "ref": "main", - "rev": "2652622fc9e737bafdf2269a9d55ba1fc58d5e3b", - "revCount": 226, + "rev": "2651f942a076da8112222727ef65ce6f5d35a825", + "revCount": 256, "type": "git", "url": "https://git.molez.org/mandlm/omp-nix" }, @@ -1576,11 +1593,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1783303713, - "narHash": "sha256-d6Zs6wD0kvWQXn7qPU0YsuqoqBhT7zi5+1M365FINt8=", + "lastModified": 1783838433, + "narHash": "sha256-Zb8+v76qSPYDlUea1y30YzgdEoDjA97vRmeqfPAqwZs=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "d9d714243e2f8d10af28db5111f018ec2d77acc9", + "rev": "c6ab7371e40abd405313af9bddafd5f37cc94f83", "type": "github" }, "original": { @@ -1912,11 +1929,11 @@ ] }, "locked": { - "lastModified": 1783063092, - "narHash": "sha256-H6lM+h8+ZT25uWJwmYkER5yj5RJ9DP2++n5um/XH3J0=", + "lastModified": 1783668749, + "narHash": "sha256-EDJjJYGT5pQKTBqmz+OA2sqE20kjj6mP699JFGDzse4=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "36b24209358c82e0ea5404ba003ae8dc37334c86", + "rev": "e8041a3571e8cadb57dc18a3d6362d753510b94a", "type": "github" }, "original": {