feat(nix): add blender-bin (GPU support) and fix cache settings

misumisumi · Nov 11, 2024 · d7d6693 · d7d6693
1 parent fb456ba
commit d7d6693
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 27 deletions.
diff --git a/apps/user/desktop/tool/develop/pkgs/default.nix b/apps/user/desktop/tool/develop/pkgs/default.nix
@@ -6,7 +6,7 @@
       # matlab # Followed by nix-matlab
       # sidequest                     # Meta Quest side loading tool
       audacity # GUI Sound Editor
-      blender # 3DCG modeling tool
+      blender_4_2 # 3DCG modeling tool
       carla # audio plugin host
       gimp # image editor
       google-fonts

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,17 +1,24 @@
 {
   description = "Each my machine NixOS System Flake Configuration";
   nixConfig = {
-    extra-substituters = [ "https://misumisumi.cachix.org" ];
+    extra-substituters = [
+      "https://misumisumi.cachix.org"
+      "https://cuda-maintainers.cachix.org"
+      "https://nix-community.cachix.org"
+    ];
     extra-trusted-public-keys = [
       "misumisumi.cachix.org-1:f+5BKpIhAG+00yTSoyG/ihgCibcPuJrfQL3M9qw1REY="
+      "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
   };
 
   inputs = {
     flake-parts.url = "github:hercules-ci/flake-parts";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
+    blender-bin.url = "github:edolstra/nix-warez?dir=blender";
     nur.url = "github:nix-community/NUR";
     catppuccin.url = "github:catppuccin/nix";
     flakes = {

diff --git a/settings/system/nix/default.nix b/settings/system/nix/default.nix
@@ -20,13 +20,14 @@
       keep-derivations = true;
       auto-optimise-store = true; # Optimise syslinks
       substituters = [
-        "https://cache.nixos.org/"
         "https://misumisumi.cachix.org"
         "https://cuda-maintainers.cachix.org"
+        "https://nix-community.cachix.org"
       ];
       trusted-public-keys = [
         "misumisumi.cachix.org-1:f+5BKpIhAG+00yTSoyG/ihgCibcPuJrfQL3M9qw1REY="
         "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
       trusted-users = [
         "root"
@@ -44,9 +45,10 @@
   };
   nixpkgs = {
     overlays = [
-      inputs.nur.overlay
-      inputs.nixgl.overlay
+      inputs.blender-bin.overlays.default
       inputs.flakes.overlays.default
+      inputs.nixgl.overlay
+      inputs.nur.overlay
       self.overlays.default
     ];
     config = {

diff --git a/settings/user/nix/default.nix b/settings/user/nix/default.nix
@@ -12,14 +12,14 @@
       keep-outputs = true;
       keep-derivations = true;
       substituters = [
-        "https://cache.nixos.org/"
         "https://misumisumi.cachix.org"
         "https://cuda-maintainers.cachix.org"
+        "https://nix-community.cachix.org"
       ];
       trusted-public-keys = [
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
         "misumisumi.cachix.org-1:f+5BKpIhAG+00yTSoyG/ihgCibcPuJrfQL3M9qw1REY="
         "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
       trusted-users = [
         "root"

diff --git a/settings/user/nixpkgs/default.nix b/settings/user/nixpkgs/default.nix
@@ -11,6 +11,7 @@
       allowUnfree = true;
     };
     overlays = [
+      inputs.blender-bin.overlays.default
       inputs.flakes.overlays.default
       inputs.nixgl.overlay
       inputs.nur.overlay