diff --git a/apps/user/desktop/tool/develop/pkgs/default.nix b/apps/user/desktop/tool/develop/pkgs/default.nix index 94b7dc2b..6e5daebf 100644 --- 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 index c74e847f..c714f7f4 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,25 @@ { "nodes": { + "blender-bin": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "dir": "blender", + "lastModified": 1727864973, + "narHash": "sha256-Z9ekAxNnoOKnkFm7DPZibIay9nEiWTC0inSYzJAaQmg=", + "owner": "edolstra", + "repo": "nix-warez", + "rev": "b00dabc0345500ca50db06334dd0488f0b94ece3", + "type": "github" + }, + "original": { + "dir": "blender", + "owner": "edolstra", + "repo": "nix-warez", + "type": "github" + } + }, "catppuccin": { "locked": { "lastModified": 1731088327, @@ -58,7 +78,7 @@ }, "devshell_3": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1728330715, @@ -410,18 +430,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1722221733, "owner": "NixOS", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "12bf09802d77264e441f48e25459c10c93eada2e", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-24.05", + "type": "indirect" } }, "nixpkgs-lib": { @@ -462,15 +480,15 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1730883749, - "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", - "owner": "NixOS", + "lastModified": 1730963269, + "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", + "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" @@ -478,11 +496,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { @@ -493,6 +511,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1722073938, "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", @@ -527,7 +561,7 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1718252448, @@ -568,6 +602,7 @@ }, "root": { "inputs": { + "blender-bin": "blender-bin", "catppuccin": "catppuccin", "devshell": "devshell", "disko": "disko", @@ -578,7 +613,7 @@ "nixgl": "nixgl", "nixos-anywhere": "nixos-anywhere", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "nvimdots": "nvimdots", diff --git a/flake.nix b/flake.nix index 21dfb158..14a1c8d1 100644 --- 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 index 17014c45..f8a7f022 100644 --- 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 index f46cae26..8b950b2b 100644 --- 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 index 87197902..c4f0094a 100644 --- 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