bluray module, mutter scaling hack

Author: anna328p

common/workstation/apps-extra.nix

@@ -5,15 +5,7 @@ let
 in {
     environment.systemPackages = let
         p = pkgs;
-    in if isMinimal then [
-        # Media players
-        p.mpv p.vlc
-        p.ffmpeg
-    ] else [
-        # Media players with Blu-Ray support
-        p.mpv_bd p.vlc_bd p.keydb
-        p.ffmpeg_bd
-
+    in if isMinimal then [ ] else [
         # Media creation
         p.audacity
         p.vcv-rack
@@ -24,9 +16,7 @@ in {
         p.img2pdf
 
         # Text, documents
-        p.libreoffice
         p.calibre
-        p.xdot
 
         # Typefaces
         p.fontforge-gtk p.nodePackages.svgo

common/workstation/apps.nix

@@ -25,6 +25,13 @@
         # Media
         p.tremotesf
 
+        # Media players
+        p.mpv p.vlc
+        p.ffmpeg
+
+        # Documents
+        p.libreoffice-fresh
+
         ## Programming / Software development
 
         # Interpreters
@@ -42,6 +49,7 @@
         p._7zz
         p.nix-tree
         p.binutils # strings
+        p.binwalk
         p.difftastic
 
         # Misc
@@ -50,9 +58,6 @@
 
     # TODO: Remove
     nixpkgs.config.permittedInsecurePackages = [
-        # Logseq 0.10 dep
-        "electron-27.3.11"
-
         # nheko dep
         "olm-3.2.16"
     ];

common/workstation/docs.nix

@@ -8,6 +8,8 @@
     ];
 
     documentation = {
+        nixos.includeAllModules = true;
+
         dev.enable = true;
 
         man = {

flake.lock

@@ -55,7 +55,7 @@ let
     css = /* css */ ''
         ${cssColors}
 
-        .nautilus-window.background { background-color: ${c.base00} !important; }
+        .nautilus-window.background { background-color: ${c.base00}; }
     '';
 in {
     xdg.configFile = {

home/workstation/theming/adwaita.nix

@@ -5,7 +5,6 @@ rec {
     modulePaths.nixos = rec {
         default = local.misc;
 
-
         local = {
             misc = modules/nixos/misc;
         };

local-modules.nix

@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+{
+    options.misc.bluray = let
+        inherit (lib) mkEnableOption;
+    in {
+        decryption.enable = mkEnableOption "Blu-ray decryption support";
+    };
+
+    config = let
+        cfg = config.misc.bluray;
+    in {
+        nixpkgs.overlays = lib.mkIf cfg.decryption.enable [
+            (final: prev: {
+                mpv = prev.mpv_bd;
+                mpv-unwrapped = prev.mpv-unwrapped_bd;
+                vlc = prev.vlc_bd;
+                ffmpeg = prev.ffmpeg_bd;
+            })
+        ];
+
+        environment.systemPackages = lib.mkIf cfg.decryption.enable [
+            pkgs.keydb
+        ];
+    };
+}

modules/nixos/misc/bluray.nix

@@ -6,6 +6,7 @@ in {
     imports = [
         ./udev.nix
         ./rebuilds.nix
+        ./bluray.nix
     ];
 
     options.misc = {

modules/nixos/misc/default.nix

@@ -12,8 +12,8 @@
 
         usbDevSpec = t.submodule {
             options = {
-                vid = mkOption { type = usbIds; };
-                pid = mkOption { type = usbIds; };
+                vid = mkOption { type = usbIds; description = "Vendor ID";  };
+                pid = mkOption { type = usbIds; description = "Product ID"; };
             };
         };
     in {

modules/nixos/misc/udev.nix

@@ -2,9 +2,7 @@
 
 final: prev: {
     libbluray_bd = prev.libbluray.override {
-        # TODO: NixOS/nixpkgs#296748
-        # withJava = true;
-
+        withJava = true;
         withAACS = true;
         withBDplus = true;
     };