mpv: Remove unpackaged plugin

flake.lock

@@ -20,11 +20,11 @@
     },
     "emacs": {
       "locked": {
-        "lastModified": 1647827912,
-        "narHash": "sha256-q3sEAJe+nAlWp0kVSqPdGSvhwG9+i1Ppm+BMNnU76Ok=",
+        "lastModified": 1648981401,
+        "narHash": "sha256-7+L/vxg1g5QRl4XKPO5+awlubD5iRgqY7LG4Ag9Pasw=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "ccb4f7c6af0b2dc5c02aec6f28d5cffb199087c4",
+        "rev": "8704d61679ea1025fa16f612579f80263c96c321",
         "type": "github"
       },
       "original": {
@@ -56,11 +56,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1644229661,
-        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "lastModified": 1648297722,
+        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
         "type": "github"
       },
       "original": {
@@ -134,11 +134,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1647821523,
-        "narHash": "sha256-NAIY357pAOcxK6bAt83kKEJ2LxZhLCiPIlmQ2iTQbk4=",
+        "lastModified": 1648917498,
+        "narHash": "sha256-fdyVHsP6XeyCk9FRyjV6Wv+7qiOzWxykGXdNixadvyg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "835797f3a4a59459a316ae8d4ab91fa59faf61a4",
+        "rev": "cfab869fcebc56710be6ec3aca76036b25c04a0d",
         "type": "github"
       },
       "original": {
@@ -267,11 +267,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1647447644,
-        "narHash": "sha256-Di7ZCXjQKEys+jxgl8Mp7a8nowRSeAbzH8c9QNYkw2k=",
+        "lastModified": 1648141026,
+        "narHash": "sha256-h8e3+5EZFbYHTMb0DN2ACuQTJBNHpqigvmEV1w2WIuE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "32f61571b486efc987baca553fb35df22532ba63",
+        "rev": "feceb4d24f582817d8f6e737cd40af9e162dee05",
         "type": "github"
       },
       "original": {
@@ -299,8 +299,8 @@
     },
     "nixpkgs": {
       "locked": {
-        "narHash": "sha256-ulGq3W5XsrBMU/u5k9d4oPy65pQTkunR4HKKtTq0RwY=",
-        "path": "/nix/store/f71alr07xb2swc37fiqjr5h416qcs6wr-source",
+        "narHash": "sha256-rjwoxrk16zfrcO5Torh6CbAd5GHsHrXw+EwxOvh9AUI=",
+        "path": "/nix/store/33zgpp4aj1qyfwnlaspj8mypvv0sjpyw-source",
         "type": "path"
       },
       "original": {
@@ -326,11 +326,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1647800324,
-        "narHash": "sha256-rjwoxrk16zfrcO5Torh6CbAd5GHsHrXw+EwxOvh9AUI=",
+        "lastModified": 1648632716,
+        "narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9bc841fec1c0e8b9772afa29f934d2c7ce57da8e",
+        "rev": "710fed5a2483f945b14f4a58af2cd3676b42d8c8",
         "type": "github"
       },
       "original": {
@@ -445,11 +445,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1647843981,
-        "narHash": "sha256-Ug5krnnJc/OVkLpnEhfBRoosLXJ6HYnHa2nw7cppHXw=",
+        "lastModified": 1649000089,
+        "narHash": "sha256-aY1kwpteyXJ6nT3FibGBpeSIvVHI/6Wskh48HpQpFig=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "0367c3938355bf4b92b9ad15acd4658b46b6b23a",
+        "rev": "1221f32068c2401276c023d91ae7e9fe26f95926",
         "type": "github"
       },
       "original": {

flake.nix

@@ -37,6 +37,7 @@
     
     nixosConfigurations = {
       miku = mkSystem {
+        bluray = true;
         hostConfigFile = ./hosts/miku.nix;
       };
       mashu = mkSystem {

hosts/miku.nix

@@ -40,6 +40,7 @@
     newsflash
     sublime-music
     anki
+    gnome-podcasts
     #psst
 
     # Proprietary stuff (yikes)
@@ -48,6 +49,7 @@
   
   ptw = {
     programs = {
+      bluray.enable = true;
       mpv = {
         primaryScreen = "C27F398";
         enable = true;
@@ -70,7 +72,7 @@
     };
     services = {
       gamemode.enable = true;
-      #gnome.enable = true;
+      gnome.enable = true;
       input-remapper = {
         enable = false;
         postStartCommand = "${pkgs.input-remapper}/bin/input-remapper-control --command start --preset NOOP --device \"Razer Razer Tartarus V2\"";

lib/baseSystem.nix

@@ -75,6 +75,9 @@ in {
       git-crypt
       gnupg
       python3
+      unzip
+      file
+      ripgrep
 
       # General utilities
       bandwhich bottom latencytop

lib/mkSystem.nix

@@ -15,6 +15,7 @@ Idea: Make miku.nix, mashu.nix, ... have the following structure
 {
   hostConfigFile
 , architecture ? "x86_64-linux"
+, bluray ? false
 }: let
   pkgs = inputs.nixpkgs;
   config = pkgs.lib;
@@ -43,7 +44,9 @@ in inputs.nixpkgs.lib.nixosSystem {
         emacs.overlay
         (import ../packages)
         (import ../overlays/simple.nix)
-
+      ]
+      ++ lib.optional bluray (import ../overlays/bluray.nix)
+      ++ [
         # Always keep sandbox.nix as the last overlay
         (import ../overlays/sandbox.nix)
       ];

modules/default.nix

@@ -23,6 +23,7 @@
     ./programs/plasma
     ./programs/office
     ./programs/gaming
+    ./programs/bluray
 
     # Services
     ./services/kanshi

modules/programs/bluray/default.nix

@@ -0,0 +1,15 @@
+{ pkgs, config, lib, ... }:
+
+let
+  cfg = config.ptw.programs.bluray;
+in {
+  options.ptw.programs.bluray = {
+    enable = lib.mkEnableOption "Enable bluray playback and decoding. Will rebuild a lot of packages";
+  };
+
+  config = lib.mkIf cfg.enable {
+    nixpkgs.config.overlays = [
+      (import ../../../overlays/bluray.nix)
+    ];
+  };
+}

modules/programs/mpv/default.nix

@@ -1,12 +1,14 @@
 { config, lib, pkgs, ... }:
 
 let
+  mkAnime4kShader = shader: "${pkgs.anime4k}/usr/share/shaders/${shader}";
+  mkDefaultShader = shader: "${pkgs.mpv-shader-pack}/usr/share/shaders/${shader}";
   makeMpvProfile = { shader, additional ? {} }: {
-    glsl-shaders = "${pkgs.anime4k}/usr/share/shaders/${shader}";
+    glsl-shaders = shader;
     scale = "ewa_lanczossharp";
     cscale = "ewa_lanczossharp";
     gpu-context = "wayland";
-    gpu-api = "opengl";
+    gpu-api = "vulkan";
     hwdec = "vaapi";
     vo = "gpu";
     video-sync = "display-resample";
@@ -15,8 +17,7 @@ let
   } // additional // (if config.ptw.programs.mpv != "" then {
     # Make mpv pop up on the primary screen
     screen-name = config.ptw.programs.mpv.primaryScreen;
-    fs-screen-name = config.ptw.programs.mpv.primaryScreen;
-  } else {});
+    fs-screen-name = config.ptw.programs.mpv.primaryScreen;} else {});
   cfg = config.ptw.programs.mpv;
 in {
   options.ptw.programs.mpv = {
@@ -40,13 +41,19 @@ in {
         defaultProfiles = [ "anime" ];
         profiles = {
           anime = (makeMpvProfile {
-            shader = "Anime4K_Upscale_Denoise_CNN_x2_VL.glsl";
+            shader = mkAnime4kShader "Anime4K_Upscale_Denoise_CNN_x2_VL.glsl";
             additional = {
               fullscreen = "";
             };
           });
-          "anime-denoise" = (makeMpvProfile {
-            shader = "Anime4K_Upscale_Denoise_CNN_x2_VL.glsl";
+          anime-denoise = (makeMpvProfile {
+            shader = mkAnime4kShader "Anime4K_Upscale_Denoise_CNN_x2_VL.glsl";
+          });
+          non-anime = (makeMpvProfile {
+            shader = mkDefaultShader "FSRCNNX_x2_8-0-4-1.glsl";
+          });
+          non-anime-strong = (makeMpvProfile {
+            shader = mkDefaultShader "FSRCNNX_x2_16-0-4-1.glsl";
           });
         };
       };

modules/programs/plasma/default.nix

@@ -42,7 +42,6 @@ in {
       libsForQt5.bismuth
       #kde-rounded-corners
       index-fm
-      #kasts-git
       rsibreak
       kalendar
       kate

overlays/bluray.nix

@@ -0,0 +1,29 @@
+final: prev:
+
+let
+  overrideWithAACS = pkgName: prev."${pkgName}".overrideAttrs (old: {
+    buildInputs = with prev; old.buildInputs ++ [ libaacs ];
+  });
+in {
+  libbluray = prev.libbluray.override {
+    withAACS = true;
+    withBDplus = true;
+  };
+
+  mpvUnwrapped = prev.mpvUnwrapped.overrideAttrs (old: {
+    buildInputs = with prev; old.buildInputs ++ [ libaacs ];
+  });
+
+  vlc = prev.vlc.overrideAttrs (old: {
+    buildInputs = with prev; old.buildInputs ++ [ libaacs ];
+  });
+  
+  handbrake = prev.handbrake.overrideAttrs (old: {
+    buildInputs = with prev; old.buildInputs ++ [ libaacs ];
+  });
+  
+  /*
+  mpvUnwrapped = overrideWithAACS "mpvUnwrapped";
+  handbrake = overrideWithAACS "handbrake";
+  */
+}

overlays/simple.nix

@@ -1,15 +1,6 @@
 final: prev:
 
 {
-  /*
-  mpv = prev.wrapMpv mpv {
-    # Prevent the need for prefixing mpv with DRI_PRIME=1
-    extraMakeWrapperArgs = [
-      "--set" "DRI_PRIME" "1"
-    ];
-  };
-  */ 
-
   gajim = prev.gajim.overrideAttrs (old: {
     # Enable notification sounds
     propagatedBuildInputs = old.propagatedBuildInputs ++ [ prev.gsound ];
@@ -68,18 +59,6 @@ final: prev:
     ];
   });
 
-  # TODO: Remove once upstream has a new version tagged
-  kasts-git = prev.libsForQt5.kasts.overrideAttrs (old: {
-    src = let
-      commit = "b39be0118ef6ff587b433af185c584f3d5bcec30";
-    in builtins.fetchTarball {
-      url = "https://invent.kde.org/plasma-mobile/kasts/-/archive/${commit}/kasts-${commit}.tar.gz";
-      sha256 = "06myymbwj89357cpg7phha1x8q84mlhcy4f44pdkqmg7lkd5a6df";
-    };
-
-    buildInputs = old.buildInputs ++ [ prev.taglib prev.libsForQt5.qtkeychain ];
-  });
-
   xournalpp-git = prev.xournalpp.overrideAttrs (old: {
     version = "1.1.1";
     src = prev.fetchFromGitHub {

packages/default.nix

@@ -25,6 +25,7 @@ in {
   evdev-proxy = prev.callPackage ./tools/virtualisation/evdev-proxy {};
   virtiofsd = prev.callPackage ./tools/virtualisation/virtiofsd {};
   anime4k = prev.callPackage ./misc/video/anime4k {};
+  mpv-shader-pack = prev.callPackage ./misc/video/mpv-shader-pack {};
   anime-dl = prev.callPackage ./tools/video/animedl {
     pySmartDL = pySmartDL;
     cfscrape = cfscrape;

packages/misc/video/anime4k/default.nix

@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
   '';
   
   meta = with lib; {
-    description = "A High-Quality Real Time Upscaler for Anime Video ";
-    homepage = "A High-Quality Real Time Upscaler for Anime Video ";
+    description = "A High-Quality Real Time Upscaler for Anime Video";
+    homepage = "https://bloc97.github.io/Anime4K/";
     license = licenses.mit;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

packages/misc/video/mpv-prescalers/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "mpv-prescalers";
+  version = "20211110";
+
+  src = fetchFromGitHub {
+    owner = "bjin";
+    repo = "mpv-prescalers";
+    rev = "cc02ed95c1fe05b72bc21d41257c4c085e6e409b";
+    sha256 = "1gc1ka9i7xzxq58175q5svhvp8vr27hy477r4z4nkhp9q1cqj19d";
+  };
+  
+  installPhase = ''
+    find . -type f -iname '*.hook' -exec install -Dm 644 {} -t $out/usr/share/shaders/ \;
+  '';
+  
+  meta = with lib; {
+    description = "prescalers for mpv, as user shaders";
+    homepage = "https://github.com/bjin/mpv-prescalers";
+    license = licenses.gpl3;
+    maintainers = [ ];
+    platforms = platforms.all;
+  };
+}

packages/misc/video/mpv-shader-pack/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "mpv-shader-pack";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "iwalton3";
+    repo = "default-shader-pack";
+    rev = "v${version}";
+    sha256 = "10383h2qq35whj3v1vs34yyqiflxjf1vlv2p4l6jrmljwpjpcj4k";
+  };
+
+  buildPhase = ''
+    # Packaged by the anime4k package
+    rm shaders/Anime4K_*.glsl
+  '';
+  
+  installPhase = ''
+    find ./shaders -type f -exec install -Dm 644 {} -t $out/usr/share/shaders/ \;
+  '';
+  
+  meta = with lib; {
+    description = "Preconfigured set of MPV shaders and configurations for MPV Shim media clients.";
+    homepage = "https://github.com/iwalton3/default-shader-pack";
+    license = licenses.gpl3;
+    maintainers = [ ];
+    platforms = platforms.all;
+  };
+}