From f7461269aca26a3bc7884c9b2fe80a8717c8249f Mon Sep 17 00:00:00 2001 From: voidarclabs Date: Fri, 16 Jan 2026 16:59:09 +0000 Subject: [PATCH] restructure --- common.nix => configs/common.nix | 0 .../configuration-laptop.nix | 0 .../configuration-pc.nix | 1 + flake.nix | 12 +++--- .../Chataigne-linux-x64-bleedingedge.AppImage | Bin .../chataigne}/chataigne.nix | 0 {chataigne => modules/chataigne}/flake.nix | 0 davinci.nix => modules/davinci/davinci.nix | 39 +++++++++--------- 8 files changed, 26 insertions(+), 26 deletions(-) rename common.nix => configs/common.nix (100%) rename configuration-laptop.nix => configs/configuration-laptop.nix (100%) rename configuration-pc.nix => configs/configuration-pc.nix (99%) rename {chataigne => modules/chataigne}/Chataigne-linux-x64-bleedingedge.AppImage (100%) rename {chataigne => modules/chataigne}/chataigne.nix (100%) rename {chataigne => modules/chataigne}/flake.nix (100%) rename davinci.nix => modules/davinci/davinci.nix (89%) diff --git a/common.nix b/configs/common.nix similarity index 100% rename from common.nix rename to configs/common.nix diff --git a/configuration-laptop.nix b/configs/configuration-laptop.nix similarity index 100% rename from configuration-laptop.nix rename to configs/configuration-laptop.nix diff --git a/configuration-pc.nix b/configs/configuration-pc.nix similarity index 99% rename from configuration-pc.nix rename to configs/configuration-pc.nix index 3941610..c709980 100644 --- a/configuration-pc.nix +++ b/configs/configuration-pc.nix @@ -50,6 +50,7 @@ bottles ferdium vesktop + i3 wine64 delfin docker diff --git a/flake.nix b/flake.nix index f57471c..f4aac85 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; elephant.url = "github:abenz1267/elephant"; - chataigne.url = "./chataigne"; + chataigne.url = "./configs/chataigne"; doot.url = "github:voidarclabs/nixos.doot"; way-edges.url = "github:way-edges/way-edges"; hyprfloat = { @@ -35,8 +35,8 @@ specialArgs = { inherit inputs; }; modules = [ - ./configuration-laptop.nix - ./common.nix + ./configs/configuration-laptop.nix + ./configs/common.nix hardwareConfig { nixpkgs.config.allowUnfree = true; @@ -48,9 +48,9 @@ specialArgs = { inherit inputs; }; modules = [ - ./configuration-pc.nix - ./common.nix - ./davinci.nix + ./configs/configuration-pc.nix + ./configs/common.nix + ./modules/davinci/davinci.nix hardwareConfig { nixpkgs.config.allowUnfree = true; diff --git a/chataigne/Chataigne-linux-x64-bleedingedge.AppImage b/modules/chataigne/Chataigne-linux-x64-bleedingedge.AppImage similarity index 100% rename from chataigne/Chataigne-linux-x64-bleedingedge.AppImage rename to modules/chataigne/Chataigne-linux-x64-bleedingedge.AppImage diff --git a/chataigne/chataigne.nix b/modules/chataigne/chataigne.nix similarity index 100% rename from chataigne/chataigne.nix rename to modules/chataigne/chataigne.nix diff --git a/chataigne/flake.nix b/modules/chataigne/flake.nix similarity index 100% rename from chataigne/flake.nix rename to modules/chataigne/flake.nix diff --git a/davinci.nix b/modules/davinci/davinci.nix similarity index 89% rename from davinci.nix rename to modules/davinci/davinci.nix index 7741200..1f113f6 100644 --- a/davinci.nix +++ b/modules/davinci/davinci.nix @@ -1,11 +1,18 @@ -# Tested on Davinci 20.0.1. It works for loading videos and exporting in H264/5 & AV1 -# This module doesn't seems to crack Davinci 20.2.1 -# Even if following this guide https://www.reddit.com/r/LinuxCrackSupport/comments/1nfqhld/davinci_resolve_studio_202_fix_linux_crack_guide/ -# nixpkgs rev used for this tests: 59e69648d345d6e8fef86158c555730fa12af9de - { lib, pkgs, ... }: let - ffmpeg-encoder-plugin = pkgs.stdenv.mkDerivation (finalAttrs: { + # 1. Pin Nixpkgs to your specific commit + pinnedPkgs = + import + (builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/d457818da697aa7711ff3599be23ab8850573a46.tar.gz"; + # Replace this with the hash from the nix-prefetch-url command above + sha256 = "11lf0nq7d4c5mgxiy0n9h8qdzvww6k0vmd5h1a75in6dnkry5l3z"; + }) + { + inherit (pkgs) system; + config.allowUnfree = true; + }; + ffmpeg-encoder-plugin = pinnedPkgs.stdenv.mkDerivation (finalAttrs: { pname = "ffmpeg-encoder-plugin"; version = "1.1.0"; @@ -25,17 +32,15 @@ let installPhase = '' runHook preInstall - mkdir -p $out cp ffmpeg_encoder_plugin.dvcp $out/ - runHook postInstall ''; }); davinci-resolve-studio-cracked = let - davinci-patched = pkgs.davinci-resolve-studio.davinci.overrideAttrs (old: { + davinci-patched = pinnedPkgs.davinci-resolve-studio.davinci.overrideAttrs (old: { # script based on https://www.reddit.com/r/LinuxCrackSupport/comments/1nfqhld/davinci_resolve_studio_202_fix_linux_crack_guide/ # # Additionally, it will install ffmpeg_encoder_plugin to enable H264/5 & AV1 exports: @@ -48,10 +53,8 @@ let ${lib.getExe pkgs.perl} -pi -e 's/\x03\x00\x89\x45\xFC\x83\x7D\xFC\x00\x74\x11\x48\x8B\x45\xC8\x8B/\x03\x00\x89\x45\xFC\x83\x7D\xFC\x00\xEB\x11\x48\x8B\x45\xC8\x8B/' $out/bin/resolve ${lib.getExe pkgs.perl} -pi -e 's/\x74\x11\x48\x8B\x45\xC8\x8B\x55\xFC\x89\x50\x58\xB8\x00\x00\x00/\xEB\x11\x48\x8B\x45\xC8\x8B\x55\xFC\x89\x50\x58\xB8\x00\x00\x00/' $out/bin/resolve ${lib.getExe pkgs.perl} -pi -e 's/\x41\xb6\x01\x84\xc0\x0f\x84\xb0\x00\x00\x00\x48\x85\xdb\x74\x08\x45\x31\xf6\xe9\xa3\x00\x00\x00/\x41\xb6\x00\x84\xc0\x0f\x84\xb0\x00\x00\x00\x48\x85\xdb\x74\x08\x45\x31\xf6\xe9\xa3\x00\x00\x00/' $out/bin/resolve - mkdir $out/license - touch $out/license/blackmagic.lic - echo -e "LICENSE blackmagic davinciresolvestudio 999999 permanent uncounted\n hostid=ANY issuer=CGP customer=CGP issued=28-dec-2023\n akey=0000-0000-0000-0000 _ck=00 sig=\"00\"" > $out/license/blackmagic.lic - + touch $out/.license/blackmagic.lic + echo -e "LICENSE blackmagic davinciresolvestudio 999999 permanent uncounted\n hostid=ANY issuer=CGP customer=CGP issued=28-dec-2023\n akey=0000-0000-0000-0000 _ck=00 sig=\"00\"" > $out/.license/blackmagic.lic mkdir -p $out/IOPlugins/ffmpeg_encoder_plugin.dvcp.bundle/Contents/Linux-x86-64/ cp ${ffmpeg-encoder-plugin}/ffmpeg_encoder_plugin.dvcp $out/IOPlugins/ffmpeg_encoder_plugin.dvcp.bundle/Contents/Linux-x86-64/ ''; @@ -61,12 +64,12 @@ let # the following was copied from davinci's derivation from nixpkgs. # if davinci updates, this should be updated too # but remember to replace "davinci" with "davinci-patched" - pkgs.buildFHSEnv { + pinnedPkgs.buildFHSEnv { inherit (davinci-patched) pname version; targetPkgs = pkgs: - with pkgs; + with pinnedPkgs; [ alsa-lib aprutil @@ -119,12 +122,10 @@ let ++ [ davinci-patched ]; extraPreBwrapCmds = '' - mkdir -p ~/.local/share/DaVinciResolve/license || exit 1 mkdir -p ~/.local/share/DaVinciResolve/Extras || exit 1 ''; extraBwrapArgs = [ - ''--bind "$HOME"/.local/share/DaVinciResolve/license ${davinci-patched}/.license'' ''--bind "$HOME"/.local/share/DaVinciResolve/Extras ${davinci-patched}/Extras'' ]; @@ -156,13 +157,10 @@ let drv=pkgs/by-name/da/davinci-resolve/package.nix currentVersion=${lib.escapeShellArg davinci-patched.version} downloadsJSON="$(curl --fail --silent https://www.blackmagicdesign.com/api/support/us/downloads.json)" - latestLinuxVersion="$(echo "$downloadsJSON" | jq '[.downloads[] | select(.urls.Linux) | .urls.Linux[] | select(.downloadTitle | test("DaVinci Resolve")) | .downloadTitle]' | grep -oP 'DaVinci Resolve \K\d+\.\d+(\.\d+)?' | sort | tail -n 1)" update-source-version davinci-resolve "$latestLinuxVersion" --source-key=davinci.src - # Since the standard and studio both use the same version we need to reset it before updating studio sed -i -e "s/""$latestLinuxVersion""/""$currentVersion""/" "$drv" - latestStudioLinuxVersion="$(echo "$downloadsJSON" | jq '[.downloads[] | select(.urls.Linux) | .urls.Linux[] | select(.downloadTitle | test("DaVinci Resolve")) | .downloadTitle]' | grep -oP 'DaVinci Resolve Studio \K\d+\.\d+(\.\d+)?' | sort | tail -n 1)" update-source-version davinci-resolve-studio "$latestStudioLinuxVersion" --source-key=davinci.src ''; @@ -192,4 +190,5 @@ in mesa.opencl ]; }; + }