From 1c90b3507ede680b573d545c79bd17cba3477ef4 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Tue, 24 Jun 2025 21:42:12 +0800 Subject: [PATCH] module(obs): Refactor obs-studio module from hmModule into nixosModule --- home/david/configurations/Akun/default.nix | 1 - home/david/configurations/Tytonidae/default.nix | 1 - home/modules/programs/default.nix | 1 - nixos/configurations/Akun/default.nix | 1 + nixos/configurations/Tytonidae/default.nix | 1 + nixos/modules/programs/default.nix | 1 + {home => nixos}/modules/programs/obs.nix | 6 ++---- 7 files changed, 5 insertions(+), 7 deletions(-) rename {home => nixos}/modules/programs/obs.nix (86%) diff --git a/home/david/configurations/Akun/default.nix b/home/david/configurations/Akun/default.nix index 308530f..20ac93a 100644 --- a/home/david/configurations/Akun/default.nix +++ b/home/david/configurations/Akun/default.nix @@ -35,7 +35,6 @@ sops.enable = true; mpv.enable = true; atuin.enable = true; - obs.enable = true; chromium.enable = true; thunderbird.enable = true; # espanso.enable = true; diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index aa9aa6b..299ca11 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -39,7 +39,6 @@ kvm.enable = true; atuin.enable = true; thunderbird.enable = true; - obs.enable = true; chromium.enable = true; espanso.enable = true; ion.enable = true; diff --git a/home/modules/programs/default.nix b/home/modules/programs/default.nix index cac7555..51ce6b1 100644 --- a/home/modules/programs/default.nix +++ b/home/modules/programs/default.nix @@ -11,7 +11,6 @@ ./wluma.nix ./niri.nix ./starship - ./obs.nix ./fuzzel.nix ./mpv.nix ./swaylock.nix diff --git a/nixos/configurations/Akun/default.nix b/nixos/configurations/Akun/default.nix index 9fc6cb9..81ce43b 100644 --- a/nixos/configurations/Akun/default.nix +++ b/nixos/configurations/Akun/default.nix @@ -32,6 +32,7 @@ kanata.enable = true; tailscale.enable = true; wshowkeys.enable = true; + obs.enable = true; }; }; programs.gnupg.agent = { diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 8dcedca..9940421 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -51,6 +51,7 @@ juicity.client.enable = true; owncast.enable = true; wshowkeys.enable = true; + obs.enable = true; }; }; diff --git a/nixos/modules/programs/default.nix b/nixos/modules/programs/default.nix index a69c343..62986ad 100644 --- a/nixos/modules/programs/default.nix +++ b/nixos/modules/programs/default.nix @@ -26,5 +26,6 @@ ./radicle.nix ./wshowkeys.nix ./bash.nix + ./obs.nix ]; } diff --git a/home/modules/programs/obs.nix b/nixos/modules/programs/obs.nix similarity index 86% rename from home/modules/programs/obs.nix rename to nixos/modules/programs/obs.nix index 5314ed7..6567780 100644 --- a/home/modules/programs/obs.nix +++ b/nixos/modules/programs/obs.nix @@ -1,7 +1,7 @@ { pkgs, - config, lib, + config, ... }: let cfg = config.youthlic.programs.obs; @@ -16,11 +16,9 @@ in { enable = true; plugins = with pkgs.obs-studio-plugins; [ obs-source-record - obs-vaapi - obs-vkcapture - obs-webkitgtk obs-pipewire-audio-capture ]; + enableVirtualCamera = true; }; }; }