From af42bf21092130cb6d8d6809d6015e05f4524623 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Thu, 5 Aug 2021 14:01:03 +0000
Subject: [PATCH] Update python packages, add HE-AAC support to AV stuff

---
 home/mpv.nix            | 4 ++--
 sets/hacking.nix        | 4 ++--
 sets/packages.nix       | 4 +++-
 sets/sway.nix           | 1 +
 sets/virtualization.nix | 1 -
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/home/mpv.nix b/home/mpv.nix
index b98da7b..4e5ab73 100644
--- a/home/mpv.nix
+++ b/home/mpv.nix
@@ -8,8 +8,8 @@
       hwdec = "vaapi";
       vo = "gpu";
 
-      no-audio-display = "";
-      audio-normalize-downmix = "";
+      audio-display = "no";
+      audio-normalize-downmix = "yes";
       replaygain = "track";
     };
     # Don't make this profile default since not all machines can handle it
diff --git a/sets/hacking.nix b/sets/hacking.nix
index e9ad2d0..844e33e 100644
--- a/sets/hacking.nix
+++ b/sets/hacking.nix
@@ -13,8 +13,8 @@
     fusee-launcher
     ncat
     pwndbg
-    python37Packages.binwalk-full
-    python37Packages.shodan
+    python3Packages.binwalk-full
+    python3Packages.shodan
   ];
 
   users.users.artemis.extraGroups = [ "adbusers" "wireshark" ];
diff --git a/sets/packages.nix b/sets/packages.nix
index 92b9f12..028fc4f 100644
--- a/sets/packages.nix
+++ b/sets/packages.nix
@@ -1,13 +1,15 @@
 { config, pkgs, ... }:
 let
   llvm = pkgs.llvmPackages_12;
+  ffmpeg-nonfree = pkgs.ffmpeg-full.override { nonfreeLicensing = true; fdkaacExtlib = true; };
+  mpv = pkgs.wrapMpv (pkgs.mpv-unwrapped.override { ffmpeg = ffmpeg-nonfree; }) { };
 in
 {
   environment.systemPackages = (with pkgs; [
     # Audiovisual
     darktable
     exiftool
-    ffmpeg-full
+    ffmpeg-nonfree
     flac
     gimp
     inkscape
diff --git a/sets/sway.nix b/sets/sway.nix
index 08a1830..837bdf3 100644
--- a/sets/sway.nix
+++ b/sets/sway.nix
@@ -41,6 +41,7 @@ in
     mako
     polkit_gnome
     slurp
+    waypipe
     wf-recorder
     wl-clipboard
     wofi
diff --git a/sets/virtualization.nix b/sets/virtualization.nix
index 24582fd..47b1b33 100644
--- a/sets/virtualization.nix
+++ b/sets/virtualization.nix
@@ -22,7 +22,6 @@
   environment.systemPackages = with pkgs; [
     virtmanager
     spice_gtk
-    # swtpm-tpm2
   ];
 
   users.users = {