machine/imperium/default.nix

@@ -57,9 +57,6 @@
 
   users.users.tvb = {
     extraGroups = [ "networkmanager" ];
-    packages = [
-      (pkgs.writeShellScriptBin "yt-dlp" ''exec $HOME/.yt-dlp/bin/yt-dlp "$@"'')
-    ];
   };
 
   # Configs needed to run TF2 on integrated graphics
@@ -72,7 +69,6 @@
   beatific.extraPrograms = true;
   environment.systemPackages = with pkgs; [
     comic-mono
-    ffmpeg
     firefox
     gnome.gnome-terminal
     libreoffice

modules/beatific.nix

@@ -108,7 +108,6 @@ in {
         htmlq   # jq for html
         jq      # jq for json
         nebula
-        poppler_utils	# provides pdfto* utils, allows lesspipe to read pdfs
         psmisc  # provides killall
         python3
         rsync
@@ -126,15 +125,7 @@ in {
       programs = {
         git = {
           enable = true;
-          config = {
-            init.defaultBranch = "master";
-            merge.conflictstyle = "diff3";
-            alias = {
-              amend = "commit --amend";
-              fixup = "commit --amend --no-edit";
-              pick = "cherry-pick";
-            };
-          };
+          config.init.defaultBranch = "master";
         };
         htop.enable = true;
       };