From 0040f1d23e0ae1634870902b8b5045121810f69f Mon Sep 17 00:00:00 2001 From: materus Date: Tue, 25 Jun 2024 16:28:50 +0200 Subject: [PATCH] materusPC: add vlc, change ffmpeg and obs --- configurations/host/materusPC/apps.nix | 3 ++- configurations/host/materusPC/home/materus/default.nix | 5 ++--- configurations/host/materusPC/kde.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configurations/host/materusPC/apps.nix b/configurations/host/materusPC/apps.nix index 8d6de81..71479c9 100644 --- a/configurations/host/materusPC/apps.nix +++ b/configurations/host/materusPC/apps.nix @@ -11,7 +11,8 @@ gsettings-desktop-schemas kdePackages.dolphin vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - + vlc + patchelf killall util-linux diff --git a/configurations/host/materusPC/home/materus/default.nix b/configurations/host/materusPC/home/materus/default.nix index c93d1a8..062f31b 100644 --- a/configurations/host/materusPC/home/materus/default.nix +++ b/configurations/host/materusPC/home/materus/default.nix @@ -83,16 +83,15 @@ home.packages = [ pkgs.papirus-icon-theme - materusArg.pkgs.ffmpeg6-amf-full + materusArg.pkgs.ffmpeg_7-amf-full (materusArg.pkgs.polymc.wrap { extraJDKs = [ pkgs.graalvm-ce ]; extraLibs = [ ]; }) pkgs.git-crypt pkgs.obsidian ]; programs.obs-studio = { - enable = false; + enable = true; plugins = with pkgs.obs-studio-plugins; [ wlrobs obs-vaapi obs-vkcapture obs-gstreamer input-overlay obs-multi-rtmp obs-pipewire-audio-capture ]; - package = materusArg.pkgs.obs-amf; }; diff --git a/configurations/host/materusPC/kde.nix b/configurations/host/materusPC/kde.nix index 3008461..989bf71 100644 --- a/configurations/host/materusPC/kde.nix +++ b/configurations/host/materusPC/kde.nix @@ -69,5 +69,5 @@ in kdePackages.ark ]; - materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin ]; + materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin pkgs.vlc ]; }