manakish: fix imports

configs/default.nix

@@ -170,6 +170,7 @@ in
     ./fonts.nix
     ./hledger.nix
     ./htop.nix
+    ./lix.nix
     ./uni.nix
     # ./i3.nix
     ./graphical

configs/lix.nix

@@ -1,13 +1,11 @@
 {
   pkgs,
+  lib,
   ...
 }:
 {
-  nixpkgs = {
-    config.allowUnfree = true;
-  };
   nix = {
-    package = pkgs.nixVersions.stable;
+    package = lib.mkForce pkgs.lix;
     settings.experimental-features = [ "nix-command" "flakes" ];
   };
 }

configs/mpv.nix

@@ -1,49 +1,42 @@
 {
   pkgs,
   lib,
+  self,
   config,
   ...
 }:
 let
   swallow = command: "${pkgs.swallow}/bin/swallow ${command}";
+  myMpv =
+    pkgs:
+    self.inputs.wrappers.wrapperModules.mpv.apply {
+      inherit pkgs;
+      scripts = [
+        pkgs.mpvScripts.visualizer
+      ];
+      "mpv.conf".content = "";
+      "mpv.input".content = ''
+        Alt+- add video-zoom -0.25
+        Alt+= add video-zoom 0.25
+        Alt+LEFT add video-rotate -90
+        Alt+RIGHT add video-rotate 90
+        Alt+h add video-pan-x 0.05
+        Alt+j add video-pan-y -0.05
+        Alt+k add video-pan-y 0.05
+        Alt+l add video-pan-x -0.05
+      '';
+    };
 in
 {
   environment.shellAliases.smpv = swallow "mpv";
 
   nixpkgs.overlays = [
-    (self: super: {
+    (final: prev: {
-      mpv = config.home-manager.users.me.programs.mpv.finalPackage;
+      mpv = (myMpv prev).wrapper;
     })
   ];
 
-  home-manager.users.me = {
+  environment.systemPackages = [
-    programs.mpv = {
+    ((myMpv pkgs).wrapper)
-      enable = true;
+  ];
-      config = {
-        ytdl-format = "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
-        ytdl-raw-options = lib.concatStringsSep "," [
-          ''sub-lang="de,en"''
-          "write-sub="
-          "write-auto-sub="
-        ];
-        screenshot-template = "%F-%wH%wM%wS-%#04n";
-        script-opts = "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp";
-        ao = "pulse"; # no pipewire for me :(
-      };
-      bindings = {
-        "Alt+RIGHT" = "add video-rotate 90";
-        "Alt+LEFT" = "add video-rotate -90";
-        "Alt+-" = "add video-zoom -0.25";
-        "Alt+=" = "add video-zoom 0.25";
-        "Alt+l" = "add video-pan-x -0.05";
-        "Alt+h" = "add video-pan-x 0.05";
-        "Alt+k" = "add video-pan-y 0.05";
-        "Alt+j" = "add video-pan-y -0.05";
-      };
-      scripts = [
-        # pkgs.mpvScripts.quality-menu
-        # pkgs.mpvScripts.visualizer
-      ];
-    };
-  };
 }

configs/packages.nix

@@ -132,6 +132,7 @@ in
     pdfpc # presenter console for pdf slides
     hc # print files as qr codes
     yt-dlp
+    yt-dlp-master
     espeak
     rink # unit converter
     auc

flake.lock

@@ -695,7 +695,8 @@
         "treefmt-nix": "treefmt-nix_3",
         "voidrice": "voidrice",
         "wallpapers": "wallpapers",
-        "wetter": "wetter"
+        "wetter": "wetter",
+        "wrappers": "wrappers_2"
       }
     },
     "rust-analyzer-src": {
@@ -1090,6 +1091,26 @@
         "repo": "wrappers",
         "type": "github"
       }
+    },
+    "wrappers_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770311206,
+        "narHash": "sha256-gzTvuaJZaymgxQC4rOZ9HlMRRWHVF2moEEaTnCG556A=",
+        "owner": "lassulus",
+        "repo": "wrappers",
+        "rev": "241f2f7dfcac0dbb2338105bdba7f03f412c5847",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lassulus",
+        "repo": "wrappers",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -27,6 +27,7 @@
     wallpapers.url = "github:kmein/wallpapers";
     nix-topology.url = "github:oddlama/nix-topology";
     wetter.url = "github:4z3/wetter";
+    wrappers.url = "github:lassulus/wrappers";
 
     voidrice.flake = false;
     wallpapers.flake = false;
@@ -63,6 +64,7 @@
     tinc-graph.inputs.nixpkgs.follows = "nixpkgs";
     wetter.inputs.nixpkgs.follows = "nixpkgs";
     niphas.inputs.nixpkgs.follows = "nixpkgs-unstable";
+    wrappers.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
@@ -246,12 +248,6 @@
         trans = prev.callPackage packages/trans.nix { }; # TODO upstream
         go-webring = prev.callPackage packages/go-webring.nix { }; # TODO upstream
         stag = prev.callPackage packages/stag.nix { }; # TODO upstream
-        mpv = prev.mpv.override {
-          scripts = [
-            # final.mpvScripts.visualizer
-            final.mpvScripts.mpris
-          ];
-        };
         morris = prev.callPackage packages/morris.nix { };
         cro = prev.callPackage packages/cro.nix { };
         exodus = prev.callPackage packages/exodus.nix { };
@@ -349,6 +345,7 @@
         vim-kmein = prev.callPackage packages/vim-kmein { };
         vimv = prev.callPackage packages/vimv.nix { };
         klem = prev.callPackage packages/klem.nix { };
+        yt-dlp-master = prev.callPackage packages/yt-dlp-master.nix { };
 
         lib = lib // {
           niveum = import lib/default.nix {
@@ -366,25 +363,25 @@
         let
           profiles.default = [
             { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
-              {
+            {
-                nixpkgs.overlays = [
+              nixpkgs.overlays = [
-                  self.overlays.default
+                self.overlays.default
-                  niphas.overlays.default
+                niphas.overlays.default
-                  (final: prev: {
+                (final: prev: {
-                    niphas-git =
+                  niphas-git =
-                      (prev.niphas-git.passthru.configuration.apply {
+                    (prev.niphas-git.passthru.configuration.apply {
-                        settings = {
+                      settings = {
-                          user.name = prev.lib.niveum.kieran.name;
+                        user.name = prev.lib.niveum.kieran.name;
-                          user.email = prev.lib.niveum.kieran.email;
+                        user.email = prev.lib.niveum.kieran.email;
-                        };
+                      };
-                      }).wrapper;
+                    }).wrapper;
-                    niphas-editor = prev.niphas-editor.override {
+                  niphas-editor = prev.niphas-editor.override {
-                      withCopilot = true;
+                    withCopilot = true;
-                      colorscheme = "base16-gruvbox-dark-medium";
+                    colorscheme = "base16-gruvbox-dark-medium";
-                    };
+                  };
-                  })
+                })
-                ];
+              ];
-              }
+            }
             {
               system.autoUpgrade = {
                 enable = true;
@@ -428,6 +425,7 @@
         {
           ful = nixpkgs.lib.nixosSystem {
             system = "aarch64-linux";
+            specialArgs = { inherit self; };
             modules =
               profiles.default
               ++ profiles.server
@@ -442,6 +440,7 @@
           };
           zaatar = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
+            specialArgs = { inherit self; };
             modules =
               profiles.default
               ++ profiles.server
@@ -451,6 +450,7 @@
           };
           kibbeh = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
+            specialArgs = { inherit self; };
             modules =
               profiles.default
               ++ profiles.desktop
@@ -460,6 +460,7 @@
           };
           makanek = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
+            specialArgs = { inherit self; };
             modules =
               profiles.default
               ++ profiles.server
@@ -471,18 +472,21 @@
           };
           tahina = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
+            specialArgs = { inherit self; };
             modules = profiles.default ++ [
               systems/tahina/configuration.nix
             ];
           };
           tabula = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
+            specialArgs = { inherit self; };
             modules = profiles.default ++ [
               systems/tabula/configuration.nix
             ];
           };
           manakish = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
+            specialArgs = { inherit self; };
             modules =
               profiles.default
               ++ profiles.desktop
@@ -493,6 +497,7 @@
           };
           kabsa = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
+            specialArgs = { inherit self; };
             modules =
               profiles.default
               ++ profiles.desktop
@@ -613,6 +618,7 @@
             vimv
             weechat-declarative
             wttr
+            yt-dlp-master
             ;
         }
       );

packages/yt-dlp-master.nix

@@ -0,0 +1,9 @@
+{ nix, writeShellScriptBin }:
+writeShellScriptBin "yt-dlp-master" ''
+  args=$@
+  ${nix}/bin/nix-shell -p '(yt-dlp.overrideAttrs (_: {
+    src = builtins.fetchTree "github:yt-dlp/yt-dlp";
+    patches = [];
+    postPatch = "python devscripts/update-version.py 0.99";
+  }))' -p deno --run "yt-dlp $args"
+''

systems/manakish/configuration.nix

@@ -11,7 +11,6 @@
     ./hdmi.nix
     ../../configs/default.nix
     ../../configs/tlp.nix
-    ../../configs/admin-essentials.nix
     ../../configs/networkmanager.nix
     ../../configs/power-action.nix
   ];