torjus/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Compare commits

base: torjus:d2085956c60eb990c2718c639de648c7f2c9babe
Branches Tags
torjus:master
torjus:temp-small
...
compare: torjus:2bece06f10416a923dfe78d905435be5f994b7d6
Branches Tags
torjus:master
torjus:temp-small

3 Commits
d2085956c6 ... 2bece06f10

Author SHA1 Message Date
Torjus Håkestad
2bece06f10 Add workaround for onnxruntime with cuda
Some checks are pending
pre-commit / pre-commit (push) Waiting to run
Details
2024-07-16 01:36:08 +02:00
Torjus Håkestad
499a6a8eb5 Flake update 2024-07-15 15:24:46 +02:00
Torjus Håkestad
a81cb21190 Add streamdeck for gunter 2024-07-14 15:51:33 +02:00
4 changed files with 24 additions and 12 deletions
Show Stats Expand all files Collapse all files

24
flake.lock
View File

@ -124,11 +124,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1720768451, "lastModified": 1720957393,
"narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,11 +156,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1720282526, "lastModified": 1720915306,
"narHash": "sha256-dudRkHPRivMNOhd04YI+v4sWvn2SnN5ODSPIu5IVbco=", "narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "550ac3e955c30fe96dd8b2223e37e0f5d225c927", "rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -172,11 +172,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1720181791, "lastModified": 1720781449,
"narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", "rev": "8b5a3d5a1d951344d683b442c0739010b80039db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,11 +227,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1720479166, "lastModified": 1720926522,
"narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=", "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "67035a355b1d52d2d238501f8cc1a18706979760", "rev": "0703ba03fd9c1665f8ab68cc3487302475164617",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
home/programs/obs-studio/default.nix
View File

@ -1,9 +1,15 @@
{ pkgs, lib, osConfig, ... }: { pkgs, lib, osConfig, ... }:
let let
withCuda = if (osConfig.system.name == "gunter") then true else false; withCuda = if (osConfig.system.name == "gunter") then true else false;
onnxruntime-gpu = (pkgs.onnxruntime.override { onnxruntime-gpu = (pkgs.onnxruntime.override {
cudaSupport = withCuda; cudaSupport = withCuda;
}).overrideAttrs (old: {
# TODO: Remove when fixed in nixpkgs
# https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/development/libraries/onnxruntime/default.nix#L154
buildInputs = old.buildInputs ++ [ pkgs.cudaPackages.nccl ];
}); });
obs-backgrounremoval-gpu = ((pkgs.obs-studio-plugins.obs-backgroundremoval.override { obs-backgrounremoval-gpu = ((pkgs.obs-studio-plugins.obs-backgroundremoval.override {
onnxruntime = onnxruntime-gpu; onnxruntime = onnxruntime-gpu;
}).overrideAttrs (old: { }).overrideAttrs (old: {

1
hosts/gunter/default.nix
View File

@ -5,6 +5,7 @@
./steamuser.nix ./steamuser.nix
./nfs.nix ./nfs.nix
./ollama.nix ./ollama.nix
./streamdeck.nix
../../system ../../system
../../home/gunter.nix ../../home/gunter.nix
]; ];

5
hosts/gunter/streamdeck.nix Normal file
View File

@ -0,0 +1,5 @@
{ pkgs, ... }: {
programs.streamdeck-ui = {
enable = true;
};
}