2023-06-21

4 files changed, 69 insertions, 55 deletions

diff --git a/flake.lock b/flake.lock
index 6e1d5b0..c6cb238 100644
--- a/flake.lock
+++ b/flake.lock
@@ -124,11 +124,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1686307493,
-        "narHash": "sha256-R4VEFnDn7nRmNxAu1LwNbjns5DPM8IBsvnrWmZ8ymPs=",
+        "lastModified": 1687110393,
+        "narHash": "sha256-SnkdWeZ8PZd3Dc74iFF8xiE7qDp5+z3Yps2mE79tsM0=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "7c16d31383a90e0e72ace0c35d2d66a18f90fb4f",
+        "rev": "8a5af0da9d8dab8a188436750489e304ac682085",
         "type": "github"
       },
       "original": {
@@ -222,11 +222,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "lastModified": 1687171271,
+        "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c",
         "type": "github"
       },
       "original": {
@@ -264,11 +264,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1686922395,
-        "narHash": "sha256-ysevinohPxdKp0RXyhDRsz1/vh1eXazg4AWp0n5X/U4=",
+        "lastModified": 1687257796,
+        "narHash": "sha256-jWF0LtG4GczLGLsBvXIGaCX+JvTLfawVLLJPtB5CMW0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9ba7b3990eb1f4782ea3f5fe7ac4f3c88dd7a32c",
+        "rev": "e8b5f8f9b3368dcc4814129d6f66c1af7cf3b6e5",
         "type": "github"
       },
       "original": {
@@ -323,11 +323,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1686966098,
-        "narHash": "sha256-KXBx7Ucbe2PYdPqt/Fi2qfmS0KUCB0cx34lTZt5+QQA=",
+        "lastModified": 1687139085,
+        "narHash": "sha256-iZHeSZ/F9PRl9WI/ZuQ0EiKI2knnIvdUVz/wUGB9MZY=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "0e62ed61d662c8608302a0b4f8361b98c0d9faac",
+        "rev": "b37d37bf2cba6942250e1bbae74d4c4237f9737d",
         "type": "github"
       },
       "original": {
@@ -350,11 +350,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1686964861,
-        "narHash": "sha256-i5GkiFxCiiT1ichYzfqUpnKjIoJ5kxP88xeDWAjm3H0=",
+        "lastModified": 1687224042,
+        "narHash": "sha256-X28G+05iIBvjJ+wU/5YwwUWdiQ6q/YVz2Teqf6WmH0g=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "df5043b03e4cfcda27b8aa380e8b1a68d9ee0384",
+        "rev": "fe3a5d48c128315df763e957eb3c4c4eeea66506",
         "type": "github"
       },
       "original": {
@@ -382,11 +382,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1686949509,
-        "narHash": "sha256-52OTWmIjf5t5VcoGhSjRsCWHlwSf/mPhY+0fpaiA1hs=",
+        "lastModified": 1687245362,
+        "narHash": "sha256-+f9tH+k3u9lSS136M2LCsl5NJTNPvhmHEiVOcypiu1E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "992ccdd822ecff0712ed0004f89df9e96f6a4963",
+        "rev": "205ee073b053fc4d87d5adf2ebd44ebbef7bca4d",
         "type": "github"
       },
       "original": {
@@ -398,11 +398,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1686989191,
-        "narHash": "sha256-aJaTPcsgJ0e7FdR7eIE4UaQNJBrBvXWyA8oghiYOGLo=",
+        "lastModified": 1687281549,
+        "narHash": "sha256-6kWrEZyPWKXg337zz2l4/m9r26gjaxWYQEATQVSjKek=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8a1e6d18ec0ea33c455c69dc375b202376af959c",
+        "rev": "eafa1fd10d709fb2e5b85865cb475f1c074c33f8",
         "type": "github"
       },
       "original": {
@@ -414,11 +414,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1686968143,
-        "narHash": "sha256-NkXmT9ArJBeu56jo/agURQ1pvqrx0nUHi30yM7sttK8=",
+        "lastModified": 1687274842,
+        "narHash": "sha256-Pb/3StsAVr5ysU/haCU1tcfbq62gLp58wJuPeQwmbvc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "56799517d0537a6f3e91a5171af8c4bfd82c092e",
+        "rev": "c38961c681b546eb4bedc6ea6e5fb19b012a1612",
         "type": "github"
       },
       "original": {
@@ -464,11 +464,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1686975066,
-        "narHash": "sha256-GU3ymcXMdGl1TOSJgcYH4tNK4o7gzk3v8hgHoJERzQY=",
+        "lastModified": 1687273560,
+        "narHash": "sha256-81S7O06OCoTsHAlpIaD85pgSfvQrYtNvFvKrPYkABOM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "b56f4edc61a0c4b982d12268242ef78b7334ccc4",
+        "rev": "3f2ed752140508beb4ca8d21ba7b4a1d83df24a7",
         "type": "github"
       },
       "original": {
@@ -528,11 +528,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1686668298,
-        "narHash": "sha256-AADh9NqHh6X2LOem4BvI7oCkMm+JPCSCE7iIw5nn0VA=",
+        "lastModified": 1687251716,
+        "narHash": "sha256-+sFS41thsB5U+lY/dBYPSmU4AJ7nz/VdM1WD35fXVeM=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "5b6b54d3f722aa95cbf4ddbe35390a0af8c0015a",
+        "rev": "7807e1851d95828ed98491930d2d9e7ddbe65da4",
         "type": "github"
       },
       "original": {
diff --git a/modules/common/mpv.nix b/modules/common/mpv.nix
index 97f406c..28b3cf5 100644
--- a/modules/common/mpv.nix
+++ b/modules/common/mpv.nix
@@ -46,6 +46,17 @@ in {
         profiles = {
           "protocol.http".force-window = "immediate";
           "protocol.https".profile = "protocol.http";
+
+          "extension.gif" = {
+            cache = false;
+            loop-file = true;
+          };
+          "extension.png" = {
+            profile = "extension.gif";
+            video-aspect-override = 0;
+          };
+          "extension.jpeg".profile = "extension.png";
+          "extension.jpg".profile = "extension.png";
         };
 
         config = let
@@ -70,15 +81,18 @@ in {
             "ru-RU"
           ];
         in {
-          audio-display = "no";
           autofit-larger = "100%x95%";
+          cache = true;
           cursor-autohide = 1000;
-          force-seekable = "no";
+          cursor-autohide-fs-only = true;
+          demuxer-max-back-bytes = "20M";
+          demuxer-max-bytes = "20M";
+          force-seekable = true;
           fullscreen = true;
           msg-color = true;
           msg-module = true;
           prefetch-playlist = true;
-          save-position-on-quit = false;
+          save-position-on-quit = true;
           screenshot-format = "png";
           screenshot-template = "%F [%p]";
           stop-screensaver = true;
@@ -89,9 +103,9 @@ in {
           osd-bar-h = 2;
           osd-bar-w = 60;
           osd-border-color = "#FF262626";
-          osd-border-size = 2.5;
+          osd-border-size = 2;
           osd-color = "#FFFFFFFF";
-          osd-duration = 2500;
+          osd-duration = 1000;
           osd-font-size = 40;
           osd-fractions = true;
           osd-level = 1;
@@ -99,20 +113,22 @@ in {
 
           osc = false;
 
-          sub-auto = "fuzzy";
-          sub-file-paths-append = "srt";
+          blend-subtitles = true;
+          embeddedfonts = false;
           sub-ass-force-margins = true;
           sub-ass-force-style = "kerning=yes";
-          sub-fix-timing = true;
-          sub-use-margins = true;
-          sub-font-size = 40;
-          sub-color = "#FFFFFFFF";
+          sub-auto = "fuzzy";
           sub-border-color = "#FF262626";
           sub-border-size = 2.5;
-          sub-shadow-offset = 1;
+          sub-color = "#FFFFFFFF";
+          sub-file-paths-append = "srt";
+          sub-fix-timing = true;
+          sub-font-size = 40;
+          sub-scale-with-window = true;
           sub-shadow-color = "#33000000";
+          sub-shadow-offset = 1;
           sub-spacing = 0.5;
-          blend-subtitles = true;
+          sub-use-margins = true;
 
           audio-file-auto = "fuzzy";
           volume = 100;
diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix
index 5e12cc6..677006a 100644
--- a/nixosConfigurations/eonwe/default.nix
+++ b/nixosConfigurations/eonwe/default.nix
@@ -26,13 +26,10 @@ with lib; {
     qutebrowser.enable = true;
     mpd.enable = true;
     ipfs.enable = true;
-
-    common.nix.allowedUnfreePackages = ["burpsuite"];
   };
 
   hm = {
     home.packages = with pkgs; [
-      burpsuite
       gzdoom
       kdenlive
       obs-studio
@@ -41,22 +38,16 @@ with lib; {
       radeontop
       vcmi
       vial
-      whatweb
+      xonotic
     ];
 
     programs = {
       beets.settings.directory = mkForce "/mnt/udata/music";
 
-      # NOTE This produces very poor performance even though RX 6750 XT should
-      # handle VA-API hardware decoding for all major formats (including AV1) just
-      # fine.
-      firefox.profiles.default.settings."media.ffmpeg.vaapi.enabled" = false;
-
-      # Mostly just placebo. :^)
       mpv.config = {
-        hwdec = "vdpau";
-        vo = "gpu";
+        gpu-api = "vulkan";
         profile = "gpu-hq";
+        vo = "gpu-next";
       };
     };
 
@@ -73,6 +64,11 @@ with lib; {
       };
     };
 
+    openssh.settings = {
+      KbdInteractiveAuthentication = mkForce true;
+      PasswordAuthentication = mkForce true;
+    };
+
     udev.packages = with pkgs; [vial];
   };
 
diff --git a/packages/mpv-autosub.nix b/packages/mpv-autosub.nix
index daee8cc..3d8171d 100644
--- a/packages/mpv-autosub.nix
+++ b/packages/mpv-autosub.nix
@@ -20,6 +20,8 @@ stdenvNoCC.mkDerivation rec {
       --replace "'Dutch', 'nl', 'dut'" "'Russian', 'ru', 'rus'" \
       --replace "'tta'" "'tta', 'webm'" \
       --replace "disabled for audio files" "disabled for this filetype"
+
+    sed -iE '/.*add_key_binding.*/d' autosub.lua
   '';
 
   installPhase = ''