From ab1c9a4a785d8434430b436ea0c883f87b4d389e Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Tue, 20 May 2025 09:38:53 +0100 Subject: [PATCH] Remove OBS declarative resolution Signed-off-by: Nikolaos Karaolidis --- hosts/common/configs/user/gui/obs/default.nix | 29 ++------------- hosts/common/configs/user/gui/obs/options.nix | 35 ------------------- hosts/eirene/hardware/display.nix | 16 +-------- hosts/elara/hardware/sas/display.nix | 16 +-------- 4 files changed, 4 insertions(+), 92 deletions(-) delete mode 100644 hosts/common/configs/user/gui/obs/options.nix diff --git a/hosts/common/configs/user/gui/obs/default.nix b/hosts/common/configs/user/gui/obs/default.nix index a44a4f0..4de1c37 100644 --- a/hosts/common/configs/user/gui/obs/default.nix +++ b/hosts/common/configs/user/gui/obs/default.nix @@ -2,10 +2,7 @@ user ? throw "user argument is required", home ? throw "home argument is required", }: -{ config, pkgs, ... }: -let - hmConfig = config.home-manager.users.${user}; -in +{ config, ... }: { boot = { kernelModules = [ "v4l2loopback" ]; @@ -19,27 +16,5 @@ in "/persist"."${home}/.config/obs-studio" = { }; }; - home-manager.users.${user} = { - imports = [ ./options.nix ]; - - programs.obs-studio.enable = true; - - xdg.configFile."obs-studio/basic/profiles/Untitled/basic.ini".source = - (pkgs.formats.ini { }).generate "basic.ini" - { - SimpleOutput = { - FilePath = "${home}/Videos"; - VBitrate = 4000; - ABitrate = 320; - RecEncoder = "nvenc_hevc"; - FileNameWithoutSpace = true; - }; - Video = with hmConfig.programs.obs-studio.resolution; { - BaseCX = base.x; - BaseCY = base.y; - OutputCX = output.x; - OutputCY = output.y; - }; - }; - }; + home-manager.users.${user}.programs.obs-studio.enable = true; } diff --git a/hosts/common/configs/user/gui/obs/options.nix b/hosts/common/configs/user/gui/obs/options.nix deleted file mode 100644 index 3339a12..0000000 --- a/hosts/common/configs/user/gui/obs/options.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, ... }: -{ - options.programs.obs-studio.resolution = - with lib; - with types; - { - base = { - x = mkOption { - type = int; - description = "Base resolution width."; - default = 1920; - }; - - y = mkOption { - type = int; - description = "Base resolution height."; - default = 1080; - }; - }; - - output = { - x = mkOption { - type = int; - description = "Output resolution width."; - default = 1920; - }; - - y = mkOption { - type = int; - description = "Output resolution height."; - default = 1080; - }; - }; - }; -} diff --git a/hosts/eirene/hardware/display.nix b/hosts/eirene/hardware/display.nix index 8df2c1a..f90f8ee 100644 --- a/hosts/eirene/hardware/display.nix +++ b/hosts/eirene/hardware/display.nix @@ -45,21 +45,7 @@ ]; }; - programs = { - vscode.profiles.default.userSettings."window.zoomLevel" = (1.25 - 1) / 0.2; - - obs-studio.resolution = { - base = { - x = 4096; - y = 2560; - }; - - output = { - x = 2048; - y = 1280; - }; - }; - }; + programs.vscode.profiles.default.userSettings."window.zoomLevel" = (1.25 - 1) / 0.2; theme.cursor.size = 24; } diff --git a/hosts/elara/hardware/sas/display.nix b/hosts/elara/hardware/sas/display.nix index 30f934a..7468344 100644 --- a/hosts/elara/hardware/sas/display.nix +++ b/hosts/elara/hardware/sas/display.nix @@ -42,21 +42,7 @@ ]; }; - programs = { - vscode.profiles.default.userSettings."window.zoomLevel" = (1.25 - 1) / 0.2; - - obs-studio.resolution = { - base = { - x = 1920; - y = 1200; - }; - - output = { - x = 1920; - y = 1200; - }; - }; - }; + programs.vscode.profiles.default.userSettings."window.zoomLevel" = (1.25 - 1) / 0.2; theme.cursor.size = 24; }