machine/backyard/default.nix

@@ -77,6 +77,7 @@
   };
 
   environment.systemPackages = with pkgs; [
+    ffmpeg		# omnipotent media tool
     pv			# zfs send progress meter
     smartmontools	# provides smartctl drive inspector
   ];

machine/catacomb/default.nix

@@ -25,6 +25,7 @@
   swapDevices = [ { device = "/swap"; size = 1024; } ];
 
   environment.systemPackages = with pkgs; [
+    ffmpeg
     lsof  # list open files
     mkpasswd  # used for setting SMB passwords, I think?
     samba  # provides smbpasswd, mostly

machine/imperium/default.nix

@@ -74,6 +74,7 @@
     bitwarden
     bitwarden-cli
     comic-mono
+    ffmpeg
     firefox
     gnome.gnome-terminal
     gthumb
@@ -81,7 +82,6 @@
     mpv
     obsidian
     unzip
-    vscodium
   ];
 
   networking.firewall = {

modules/beatific.nix

@@ -63,8 +63,6 @@ in {
         cp = "cp -rp";
         xo = "xdg-open";
         smv = "rsync -v --remove-source-files";
-        ffprobe = "ffprobe -hide_banner";
-        ffmpeg = "ffmpeg -hide_banner";
         ".." = "cd ..";
         "..." = "cd ../..";
         "...." = "cd ../../..";
@@ -101,28 +99,26 @@ in {
 
     (mkIf cfg.defaults.programs {
       environment.systemPackages = with pkgs; [
-        bat           # colorized and numbered `less`
-        bc            # Terminal calculator
-        curl          # omnipotent URL tool
-        duf           # disk-free checker
-        exiftool      # media tag tool
-        ffmpeg        # omnipotent media tool
-        file          # file type inspector
-        htmlq         # jq for html
-        jq            # jq for json
-        nebula        # vpn
-        poppler_utils # provides pdfto* utils, allows lesspipe to read pdfs
-        psmisc        # provides killall
-        python3       # second-best language for everything
-        ripgrep       # fast file searcher
-        rsync         # incremental remote copy
-        sqlite        # omnipotent database
-        tree          # directory tree view
-        unzip         # .zip archive tool
-        vim           # terminal editor
-        viu           # terminal image "viewer"
-        wget          # web fetcher
-        zip           # .zip archive tool
+        bat  # colorized and numbered `less`
+        bc  # Terminal calculator
+        curl
+        duf
+        exiftool
+        file  # File type inspector
+        htmlq   # jq for html
+        jq      # jq for json
+        nebula
+        poppler_utils	# provides pdfto* utils, allows lesspipe to read pdfs
+        psmisc  # provides killall
+        python3
+        rsync
+        sqlite
+        tree  # Directory tree view
+        unzip
+        vim
+        viu  # in-terminal image viewer
+        wget
+        zip
         (writeShellScriptBin "clip" ''
           ${xclip}/bin/xclip -sel c < "$1"
         '')