2023-06-17

7 files changed, 118 insertions, 232 deletions

diff --git a/flake.lock b/flake.lock
index bb9fd48..6e1d5b0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,7 +5,9 @@
         "darwin": [
           "darwin"
         ],
-        "home-manager": "home-manager",
+        "home-manager": [
+          "home-manager"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -122,11 +124,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1685559570,
-        "narHash": "sha256-MNIQvLRoq92isMLR/ordKNCl+aXNiuwBM4QyqmS8d00=",
+        "lastModified": 1686307493,
+        "narHash": "sha256-R4VEFnDn7nRmNxAu1LwNbjns5DPM8IBsvnrWmZ8ymPs=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "4338bc869e9874d54a4c89539af72f16666b2abe",
+        "rev": "7c16d31383a90e0e72ace0c35d2d66a18f90fb4f",
         "type": "github"
       },
       "original": {
@@ -177,41 +179,11 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
+        "nixpkgs-lib": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1685662779,
@@ -223,6 +195,7 @@
       },
       "original": {
         "owner": "hercules-ci",
+        "ref": "main",
         "repo": "flake-parts",
         "type": "github"
       }
@@ -263,50 +236,9 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
-          "pollymc",
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1660459072,
-        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "gitignore_2": {
-      "inputs": {
-        "nixpkgs": [
-          "pre-commit-hooks",
           "nixpkgs"
         ]
       },
@@ -320,6 +252,7 @@
       },
       "original": {
         "owner": "hercules-ci",
+        "ref": "master",
         "repo": "gitignore.nix",
         "type": "github"
       }
@@ -327,36 +260,15 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "agenix",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1682203081,
-        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
+        "lastModified": 1686922395,
+        "narHash": "sha256-ysevinohPxdKp0RXyhDRsz1/vh1eXazg4AWp0n5X/U4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1686142265,
-        "narHash": "sha256-IP0xPa0VYqxCzpqZsg3iYGXarUF+4r2zpkhwdHy9WsM=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "39c7d0a97a77d3f31953941767a0822c94dc01f5",
+        "rev": "9ba7b3990eb1f4782ea3f5fe7ac4f3c88dd7a32c",
         "type": "github"
       },
       "original": {
@@ -400,7 +312,9 @@
     },
     "nix-minecraft": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": [
+          "flake-compat"
+        ],
         "flake-utils": [
           "flake-utils"
         ],
@@ -409,11 +323,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1686102907,
-        "narHash": "sha256-GqjaX914k6OXeysEA81Psf56zPzv6pGCJOPw9bqsDmY=",
+        "lastModified": 1686966098,
+        "narHash": "sha256-KXBx7Ucbe2PYdPqt/Fi2qfmS0KUCB0cx34lTZt5+QQA=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "473897ae26beacef55d7c781054ce5408edb9982",
+        "rev": "0e62ed61d662c8608302a0b4f8361b98c0d9faac",
         "type": "github"
       },
       "original": {
@@ -436,11 +350,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1686145321,
-        "narHash": "sha256-IrWdLpdulNEQTpFZ+h27kyX12h35U2x3TJLuLnKuAow=",
+        "lastModified": 1686964861,
+        "narHash": "sha256-i5GkiFxCiiT1ichYzfqUpnKjIoJ5kxP88xeDWAjm3H0=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "6b3e042c3c654d32bb27ba7472f6361ffde130a4",
+        "rev": "df5043b03e4cfcda27b8aa380e8b1a68d9ee0384",
         "type": "github"
       },
       "original": {
@@ -452,11 +366,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1684899633,
-        "narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=",
+        "lastModified": 1686838567,
+        "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "4cc688ee711159b9bcb5a367be44007934e1a49d",
+        "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89",
         "type": "github"
       },
       "original": {
@@ -468,11 +382,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1686089707,
-        "narHash": "sha256-LTNlJcru2qJ0XhlhG9Acp5KyjB774Pza3tRH0pKIb3o=",
+        "lastModified": 1686949509,
+        "narHash": "sha256-52OTWmIjf5t5VcoGhSjRsCWHlwSf/mPhY+0fpaiA1hs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "af21c31b2a1ec5d361ed8050edd0303c31306397",
+        "rev": "992ccdd822ecff0712ed0004f89df9e96f6a4963",
         "type": "github"
       },
       "original": {
@@ -482,31 +396,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1685564631,
-        "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1686161832,
-        "narHash": "sha256-et2KAERoZI8WREmMrvxOixn0tBa7WlbYK9M3sk7jsMk=",
+        "lastModified": 1686989191,
+        "narHash": "sha256-aJaTPcsgJ0e7FdR7eIE4UaQNJBrBvXWyA8oghiYOGLo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d987535062d54cb9a9f0b7e6f64cfcde765ae765",
+        "rev": "8a1e6d18ec0ea33c455c69dc375b202376af959c",
         "type": "github"
       },
       "original": {
@@ -518,11 +414,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1686158406,
-        "narHash": "sha256-HzLu621eH25BwiRMP7qoGR9ssUCJ6m7jWKOlCSay+V4=",
+        "lastModified": 1686968143,
+        "narHash": "sha256-NkXmT9ArJBeu56jo/agURQ1pvqrx0nUHi30yM7sttK8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "edeacb701347c27727e3277d9442b085847ecec7",
+        "rev": "56799517d0537a6f3e91a5171af8c4bfd82c092e",
         "type": "github"
       },
       "original": {
@@ -568,11 +464,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1686156360,
-        "narHash": "sha256-Hiq9RgnjOQ12PewlX5HIU+eZv7sK0H7pYpYD621uohI=",
+        "lastModified": 1686975066,
+        "narHash": "sha256-GU3ymcXMdGl1TOSJgcYH4tNK4o7gzk3v8hgHoJERzQY=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "222cc78435a2a102896f9046b36cde8dfb4b60a8",
+        "rev": "b56f4edc61a0c4b982d12268242ef78b7334ccc4",
         "type": "github"
       },
       "original": {
@@ -584,13 +480,19 @@
     },
     "pollymc": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
-        "flake-parts": "flake-parts",
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "flake-parts": [
+          "flake-parts"
+        ],
         "libnbtplusplus": "libnbtplusplus",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "pre-commit-hooks": "pre-commit-hooks"
+        "pre-commit-hooks": [
+          "pre-commit-hooks"
+        ]
       },
       "locked": {
         "lastModified": 1686318133,
@@ -610,43 +512,14 @@
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": [
-          "pollymc",
-          "flake-compat"
-        ],
-        "flake-utils": "flake-utils_2",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "pollymc",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "pollymc",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1686213770,
-        "narHash": "sha256-Re6xXLEqQ/HRnThryumyGzEf3Uv0Pl4cuG50MrDofP8=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "182af51202998af5b64ddecaa7ff9be06425399b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
-    "pre-commit-hooks_2": {
-      "inputs": {
-        "flake-compat": [
           "flake-compat"
         ],
         "flake-utils": [
           "flake-utils"
         ],
-        "gitignore": "gitignore_2",
+        "gitignore": [
+          "gitignore"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -655,11 +528,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1686050334,
-        "narHash": "sha256-R0mczWjDzBpIvM3XXhO908X5e2CQqjyh/gFbwZk/7/Q=",
+        "lastModified": 1686668298,
+        "narHash": "sha256-AADh9NqHh6X2LOem4BvI7oCkMm+JPCSCE7iIw5nn0VA=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "6881eb2ae5d8a3516e34714e7a90d9d95914c4dc",
+        "rev": "5b6b54d3f722aa95cbf4ddbe35390a0af8c0015a",
         "type": "github"
       },
       "original": {
@@ -678,9 +551,11 @@
         "darwin": "darwin",
         "dns-nix": "dns-nix",
         "flake-compat": "flake-compat",
+        "flake-parts": "flake-parts",
         "flake-registry": "flake-registry",
         "flake-utils": "flake-utils",
-        "home-manager": "home-manager_2",
+        "gitignore": "gitignore",
+        "home-manager": "home-manager",
         "impermanence": "impermanence",
         "nix-minecraft": "nix-minecraft",
         "nix-vscode-extensions": "nix-vscode-extensions",
@@ -692,7 +567,7 @@
         "nmap-vulscan": "nmap-vulscan",
         "nur": "nur",
         "pollymc": "pollymc",
-        "pre-commit-hooks": "pre-commit-hooks_2",
+        "pre-commit-hooks": "pre-commit-hooks",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "xmonad-ng": "xmonad-ng"
       }
@@ -714,11 +589,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1684964237,
-        "narHash": "sha256-dDS+GhdZN2MAa2FJKFGM2gpgAXhx+xoMkpVsRx9qpDE=",
+        "lastModified": 1686468558,
+        "narHash": "sha256-K69Ojlx3N8I6tRTZsrKFMIqK4yrnJ6/PjfKZi3wchYg=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "1bcfcf786bc289ca1bd2c9d29d6f02d9141b1da3",
+        "rev": "290d00f6db4e80467013728819ad73dd4a394d9a",
         "type": "gitlab"
       },
       "original": {
@@ -743,21 +618,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "xmonad-ng": {
       "inputs": {
         "flake-utils": [
diff --git a/flake.nix b/flake.nix
index 3c87e85..ece18ad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -92,10 +92,10 @@
       repo = "arkenfox-nixos";
       ref = "main";
       inputs = {
-        nixpkgs.follows = "nixpkgs";
         flake-compat.follows = "flake-compat";
-        pre-commit.follows = "pre-commit-hooks";
         flake-utils.follows = "flake-utils";
+        nixpkgs.follows = "nixpkgs";
+        pre-commit.follows = "pre-commit-hooks";
       };
     };
 
@@ -106,8 +106,9 @@
       repo = "nix-minecraft";
       ref = "master";
       inputs = {
-        nixpkgs.follows = "nixpkgs";
+        flake-compat.follows = "flake-compat";
         flake-utils.follows = "flake-utils";
+        nixpkgs.follows = "nixpkgs";
       };
     };
 
@@ -116,7 +117,12 @@
       owner = "fn2006";
       repo = "PollyMC";
       ref = "7.0";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        flake-compat.follows = "flake-compat";
+        flake-parts.follows = "flake-parts";
+        nixpkgs.follows = "nixpkgs";
+        pre-commit-hooks.follows = "pre-commit-hooks";
+      };
     };
 
     dns-nix = {
@@ -162,6 +168,14 @@
       ref = "main";
     };
 
+    flake-parts = {
+      type = "github";
+      owner = "hercules-ci";
+      repo = "flake-parts";
+      ref = "main";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
+    };
+
     flake-registry = {
       type = "github";
       owner = "NixOS";
@@ -176,8 +190,9 @@
       repo = "agenix";
       ref = "main";
       inputs = {
-        nixpkgs.follows = "nixpkgs";
         darwin.follows = "darwin";
+        home-manager.follows = "home-manager";
+        nixpkgs.follows = "nixpkgs";
       };
     };
 
@@ -189,11 +204,20 @@
       inputs = {
         flake-compat.follows = "flake-compat";
         flake-utils.follows = "flake-utils";
-        nixpkgs.follows = "nixpkgs";
+        gitignore.follows = "gitignore";
         nixpkgs-stable.follows = "nixpkgs-stable";
+        nixpkgs.follows = "nixpkgs";
       };
     };
 
+    gitignore = {
+      type = "github";
+      owner = "hercules-ci";
+      repo = "gitignore.nix";
+      ref = "master";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     xmonad-ng = {
       # type = "path";
       # path = "/home/azahi/src/xmonad-ng";
diff --git a/modules/common/common/nix/default.nix b/modules/common/common/nix/default.nix
index fa1c85e..5dda142 100644
--- a/modules/common/common/nix/default.nix
+++ b/modules/common/common/nix/default.nix
@@ -29,17 +29,17 @@ with lib; {
   };
 
   nix = let
-    filteredInputs = filterAttrs (n: _: n != "self") inputs;
+    notSelfInputs = filterAttrs (n: _: n != "self") inputs;
   in {
     settings = {
+      # https://nixos.org/manual/nix/unstable/contributing/experimental-features.html#currently-available-experimental-features
       # https://github.com/NixOS/nix/blob/master/src/libutil/experimental-features.cc
       experimental-features = concatStringsSep " " [
-        "ca-derivations"
         "flakes"
         "nix-command"
-        "recursive-nix"
         "repl-flake"
       ];
+
       keep-derivations =
         if this.isHeadful
         then "true"
@@ -48,20 +48,10 @@ with lib; {
         if this.isHeadful
         then "true"
         else "false";
-      flake-registry = "${inputs.flake-registry}/flake-registry.json";
-      warn-dirty = false;
-    };
 
-    nixPath =
-      mapAttrsToList (n: v: "${n}=${v}") filteredInputs
-      ++ ["nixfiles=${config.my.home}/src/nixfiles"];
-
-    registry =
-      mapAttrs (_: flake: {inherit flake;}) filteredInputs
-      // {nixfiles.flake = inputs.self;};
+      flake-registry = "${inputs.flake-registry}/flake-registry.json";
 
-    settings = {
-      trusted-users = ["root" localUsername];
+      warn-dirty = false;
 
       substituters = [
         "https://azahi.cachix.org"
@@ -77,7 +67,17 @@ with lib; {
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
       ];
+
+      trusted-users = ["root" localUsername];
     };
+
+    nixPath =
+      mapAttrsToList (n: v: "${n}=${v}") notSelfInputs
+      ++ ["nixfiles=${config.my.home}/src/nixfiles"];
+
+    registry =
+      mapAttrs (_: flake: {inherit flake;}) notSelfInputs
+      // {nixfiles.flake = inputs.self;};
   };
 
   nixpkgs.overlays = with inputs; [
@@ -104,8 +104,8 @@ with lib; {
           src = super.fetchFromGitHub {
             owner = "OpenMW";
             repo = "openmw";
-            rev = "openmw-48-rc9";
-            hash = "sha256-3x+pwtZh+moLN3l1x5Q0rr9TKo3BMaul73ZgywrRBCk=";
+            rev = "openmw-48-rc10";
+            hash = "sha256-BIeCVM2O/YBgRjAedxe5/NqXpYeHggn3eSnHLgZtX80=";
           };
           patches = [];
           buildInputs =
diff --git a/modules/common/mpv.nix b/modules/common/mpv.nix
index 0421d62..97f406c 100644
--- a/modules/common/mpv.nix
+++ b/modules/common/mpv.nix
@@ -34,6 +34,9 @@ in {
           "Shift+UP" = "no-osd seek 5 exact";
           "Shift+DOWN" = "no-osd seek -5 exact";
 
+          "Alt+h" = "add sub-delay +1";
+          "Alt+l" = "add sub-delay -1";
+
           "Alt+k" = "add sub-scale +0.1";
           "Alt+j" = "add sub-scale -0.1";
 
diff --git a/modules/nixos/games/steam-run.nix b/modules/nixos/games/steam-run.nix
index 37a20e0..f2bce67 100644
--- a/modules/nixos/games/steam-run.nix
+++ b/modules/nixos/games/steam-run.nix
@@ -42,7 +42,7 @@ in {
               (glew.overrideAttrs (_: super: let
                 opname = super.pname;
               in rec {
-                pname = "${opname}-runfix";
+                pname = "${opname}-steam-run-fix";
                 inherit (super) version;
                 src = fetchurl {
                   url = "mirror://sourceforge/${opname}/${opname}-${version}.tgz";
@@ -52,7 +52,7 @@ in {
               (fmodex.overrideAttrs (_: super: let
                 opname = super.pname;
               in rec {
-                pname = "${opname}-runfix";
+                pname = "${opname}-steam-run-fix";
                 inherit (super) version;
                 installPhase = let
                   libPath = makeLibraryPath [
diff --git a/modules/nixos/games/steam.nix b/modules/nixos/games/steam.nix
index 679ce0e..8dfa72c 100644
--- a/modules/nixos/games/steam.nix
+++ b/modules/nixos/games/steam.nix
@@ -20,9 +20,6 @@ in {
       };
     };
 
-    programs.steam = {
-      enable = true;
-      package = with pkgs; steam.override {extraPkgs = _pkgs: [attr];};
-    };
+    hm.home.packages = with pkgs; [steam];
   };
 }
diff --git a/packages/mpv-autosub.nix b/packages/mpv-autosub.nix
index b7804a1..daee8cc 100644
--- a/packages/mpv-autosub.nix
+++ b/packages/mpv-autosub.nix
@@ -5,7 +5,7 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "mpv-autosub";
-  version = "git";
+  version = "unstable-2021-06-29";
 
   src = fetchFromGitHub {
     owner = "davidde";
@@ -16,8 +16,10 @@ stdenvNoCC.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace autosub.lua \
-      --replace '/home/david/.local/bin/subliminal' \
-      '${python3Packages.subliminal}/bin/subliminal'
+      --replace '/home/david/.local/bin/subliminal' '${python3Packages.subliminal}/bin/subliminal' \
+      --replace "'Dutch', 'nl', 'dut'" "'Russian', 'ru', 'rus'" \
+      --replace "'tta'" "'tta', 'webm'" \
+      --replace "disabled for audio files" "disabled for this filetype"
   '';
 
   installPhase = ''