ffmpeg bluray support

anna328p · Oct 31, 2024 · a7ba6d4 · a7ba6d4
1 parent 9b2b02e
commit a7ba6d4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/common/workstation/apps-extra.nix b/common/workstation/apps-extra.nix
@@ -8,9 +8,11 @@ in {
     in if isMinimal then [
         # Media players
         p.mpv p.vlc
+        p.ffmpeg
     ] else [
         # Media players with Blu-Ray support
         p.mpv_bd p.vlc_bd p.keydb
+        p.ffmpeg_bd
 
         # Media creation
         p.audacity

diff --git a/common/workstation/apps.nix b/common/workstation/apps.nix
@@ -23,7 +23,6 @@
         p.gimp
 
         # Media
-        p.ffmpeg
         p.tremotesf
 
         ## Programming / Software development

diff --git a/flake.lock b/flake.lock
diff --git a/home/workstation/theming/adwaita.nix b/home/workstation/theming/adwaita.nix
@@ -33,11 +33,16 @@ let
         view_bg_color = c.base01;
         view_fg_color = c.base05;
 
-        headerbar_bg_color = c.base01;
-        headerbar_fg_color = c.base05;
-        headerbar_border_color = c.base04;
+        headerbar_bg_color       = c.base01;
+        headerbar_fg_color       = c.base05;
+        headerbar_border_color   = c.base02;
         headerbar_backdrop_color = c.base00;
 
+        sidebar_bg_color       = headerbar_bg_color;
+        sidebar_fg_color       = headerbar_fg_color;
+        sidebar_border_color   = headerbar_border_color;
+        sidebar_backdrop_color = headerbar_backdrop_color;
+
         card_bg_color = c.base01;
         card_fg_color = c.base05;
 

diff --git a/pkgs/overlays/bluray/default.nix b/pkgs/overlays/bluray/default.nix
@@ -23,4 +23,6 @@ final: prev: {
     };
 
     vlc_bd = prev.vlc.override { libbluray = final.libbluray_bd; };
+
+    ffmpeg_bd = prev.ffmpeg-full.override { libbluray = final.libbluray_bd; };
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,6 @@ @@
             p.gimp
             # Media
-            p.ffmpeg
             p.tremotesf
             ## Programming / Software development
@@ Expand Down @@