feat(tf2): Upgrade tf2-nix

- Patch DeerHud.
- Install jump_noskillrequired.
- Use alternate explosion effects, from Mastercomfig.

flake.lock

@@ -327,6 +327,24 @@
         "type": "github"
       }
     },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -1001,16 +1019,32 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tf2-nix": {
       "inputs": {
+        "flake-utils": "flake-utils_4",
         "nixpkgs": "nixpkgs_12"
       },
       "locked": {
-        "lastModified": 1744277918,
+        "lastModified": 1744553083,
-        "narHash": "sha256-8C+wwrjYvatRDXE8HLeN0rUnfOW/ehqpBKhOkx4/mm0=",
+        "narHash": "sha256-YwM751s1If+JiZj6Wf/EFnxHgZgbYyizeFFErzsNeKI=",
         "owner": "msyds",
         "repo": "tf2-nix",
-        "rev": "e40d15248908d22041dbea7e3f693972a5913c2f",
+        "rev": "8ee5c24219f150178905fb0f4aafdc56f3fa4bd8",
         "type": "gitlab"
       },
       "original": {

modules/home/users/crumb/tf2.nix

@@ -11,20 +11,20 @@ in {
   config = lib.mkIf cfg.enable
     (let
       tf2pkgs = inputs.tf2-nix.packages.x86_64-linux;
-      my-config = pkgs.symlinkJoin {
+      my-config = tf2pkgs.mergeTf2Configs (with tf2pkgs; [
-        name = "tf2-files";
-        paths = with tf2pkgs; [
           mastercomfig.presets.medium-low
           mastercomfig.addons.flat-mouse
           mastercomfig.addons.no-tutorial
           mastercomfig.addons.null-canceling-movement
           improved-crosshairs
           loadouts-script
-          deerhud
+          (huds.deerhud.overrideAttrs (final: prev: {
+            patches = [ ./tf2/raise-uber-meter.patch ];
+          }))
+          maps.jump_noskillrequired_b3
           ./tf2/my-config
           ./tf2/quake-hitsounds
-        ];
+        ]);
-      };
       game-dir = ".local/share/Steam/steamapps/common/Team Fortress 2/tf";
     in {
       home.file.${game-dir} = {

modules/home/users/crumb/tf2/my-config/custom/comfig-custom/scripts/tf_weapon_rocketlauncher.txt

@@ -0,0 +1,80 @@
+"WeaponData"
+{
+	"printname" "#TF_Weapon_RocketLauncher"
+	"BuiltRightHanded" "0"
+	"weight" "3"
+	"WeaponType" "primary"
+	"ITEM_FLAG_NOITEMPICKUP" "1"
+	"Damage" "90"
+	"Range" "0"
+	"BulletsPerShot" "1"
+	"Spread" "0"
+	"PunchAngle" "0"
+	"TimeFireDelay" "0.8"
+	"TimeIdle" "0.8"
+	"TimeIdleEmpty" "0.8"
+	"TimeReloadStart" "0.1"
+	"TimeReload" "0.83"
+	"primary_ammo" "TF_AMMO_PRIMARY"
+	"clip_size" "4"
+	"default_clip" "4"
+	"ProjectileType" "projectile_rocket"
+	"HasTeamSkins_Viewmodel" "1"
+	"secondary_ammo" "None"
+	"bucket" "0"
+	"bucket_position" "0"
+	"ExplosionEffect" "electrocuted_blue_flash"
+	"ExplosionPlayerEffect" "ExplosionCore_sapperdestroyed"
+	"ExplosionWaterEffect" "electrocuted_blue_flash"
+	"ExplosionSound" "BaseExplosionEffect.Sound"
+	"anim_prefix" "gl"
+	"SoundData"
+	{
+		"single_shot" "Weapon_RPG.Single"
+		"burst" "Weapon_RPG.SingleCrit"
+	}
+	"TextureData"
+	{
+		"weapon"
+		{
+			"file" "sprites/bucket_rl"
+			"x" "0"
+			"y" "0"
+			"width" "200"
+			"height" "128"
+		}
+		"weapon_s"
+		{
+			"file" "sprites/bucket_rl"
+			"x" "0"
+			"y" "0"
+			"width" "200"
+			"height" "128"
+		}
+		"ammo"
+		{
+			"file" "sprites/a_icons1"
+			"x" "55"
+			"y" "60"
+			"width" "73"
+			"height" "15"
+		}
+		"crosshair"
+		{
+			"file" "sprites/crosshairs"
+			"x" "32"
+			"y" "32"
+			"width" "32"
+			"height" "32"
+		}
+		"autoaim"
+		{
+			"file" "sprites/crosshairs"
+			"x" "0"
+			"y" "48"
+			"width" "24"
+			"height" "24"
+		}
+	}
+	"classname" "tf_weapon_rocketlauncher"
+}

modules/home/users/crumb/tf2/raise-uber-meter.patch

@@ -0,0 +1,49 @@
+diff --git a/resource/ui/hudmediccharge.res b/resource/ui/hudmediccharge.res
+index afbf45a..5b0cd3c 100644
+--- a/resource/ui/hudmediccharge.res
++++ b/resource/ui/hudmediccharge.res
+@@ -5,7 +5,7 @@
+ 		"ControlName"	"ImagePanel"
+ 		"fieldName"		"MeterBrackets"
+ 		"xpos"			"cs-0.5"
+-		"ypos"			"47"
++		"ypos"			"3"
+ 		"zpos"			"-5"
+ 		"wide"			"156"
+ 		"tall"			"20"
+@@ -21,7 +21,7 @@
+ 		"ControlName"	"CExLabel"
+ 		"fieldName"		"ChargeLabel"
+ 		"xpos"			"cs-0.5"
+-		"ypos"			"50"
++		"ypos"			"6"
+ 		"zpos"			"3"
+ 		"wide"			"90"
+ 		"tall"			"15"
+@@ -65,7 +65,7 @@
+ 		"ControlName"	"CExLabel"
+ 		"fieldName"		"IndividualChargesLabel"
+ 		"xpos"			"c92"
+-		"ypos"			"44"
++		"ypos"			"0"
+ 		"zpos"			"2"
+ 		"wide"			"90"
+ 		"tall"			"30"
+@@ -87,7 +87,7 @@
+ 		"fieldName"		"ChargeMeter"
+ 		"font"			"Default"
+ 		"xpos"			"cs-0.5"
+-		"ypos"			"50"
++		"ypos"			"6"
+ 		"zpos"			"2"
+ 		"wide"			"150"
+ 		"tall"			"14"				
+@@ -107,7 +107,7 @@
+ 		"fieldName"		"ChargeMeter1"
+ 		"font"			"Default"
+ 		"xpos"			"c-75"
+-		"ypos"			"52"
++		"ypos"			"8"
+ 		"zpos"			"2"
+ 		"wide"			"36"
+ 		"tall"			"10"