From c05cb4d1252f7c0ff86982d0027b66fdeb269fed Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Wed, 1 Oct 2025 23:21:17 +0100 Subject: [PATCH] feat: blender-bin --- nix/flake.lock | 42 +++++++++++++++++++++++++++++++++--- nix/flake.nix | 3 +++ nix/modules/blender/home.nix | 6 +++--- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/nix/flake.lock b/nix/flake.lock index 2fd308a..e678f30 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -738,6 +738,26 @@ "type": "github" } }, + "nix-warez": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "dir": "blender", + "lastModified": 1758185131, + "narHash": "sha256-GlScQnoFgaFLQ9cd4llbJSisR0LjafjMAkBZQV7m4uk=", + "owner": "edolstra", + "repo": "nix-warez", + "rev": "f49a87422539d748a34b9f3b07a7b8ced7242dff", + "type": "github" + }, + "original": { + "dir": "blender", + "owner": "edolstra", + "repo": "nix-warez", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1758198701, @@ -771,6 +791,21 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.11", + "type": "indirect" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1759036355, "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", @@ -786,7 +821,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1758690382, "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", @@ -922,7 +957,8 @@ "home-manager": "home-manager", "hyprland": "hyprland", "neovim-nightly-overlay": "neovim-nightly-overlay", - "nixpkgs": "nixpkgs_3", + "nix-warez": "nix-warez", + "nixpkgs": "nixpkgs_4", "nixvim": "nixvim", "quickshell": "quickshell", "sops-nix": "sops-nix", @@ -952,7 +988,7 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "systems": "systems_4" }, "locked": { diff --git a/nix/flake.nix b/nix/flake.nix index 0c8b6a8..4ac44d5 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -33,6 +33,9 @@ spicetify-nix = { url = "github:Gerg-L/spicetify-nix"; }; + nix-warez = { # Blender-bin + url = "github:edolstra/nix-warez?dir=blender"; + }; }; outputs = inputs@{ nixpkgs, home-manager, ... }: diff --git a/nix/modules/blender/home.nix b/nix/modules/blender/home.nix index e197842..7a39280 100644 --- a/nix/modules/blender/home.nix +++ b/nix/modules/blender/home.nix @@ -1,10 +1,10 @@ -{ inputs, pkgs, home, ... }: +{ inputs, pkgs, home, system, ... }: let - + blenderPkgs = inputs.nix-warez.packages.${system}; in { # whole blender config including addons is too fat to include here home.packages = with pkgs; [ - blender + blenderPkgs.blender_4_5 ]; # nix'ing a blender config is most likely not possible # could probs install blender addons through nix since they are fat fat mega fat to install TODO