From 47179e46ba57fd6cd992f1d510a51e38cb7d19b2 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 13 Apr 2025 15:46:41 +0800 Subject: [PATCH] fix: use blender-bin, update cache mirror, disable rustdesk & others. --- flake.lock | 78 ++++++++++++++----- flake.nix | 2 + home/linux/gui/base/creative.nix | 4 +- modules/base.nix | 4 +- .../nixos/desktop/remote-desktop/default.nix | 14 ++-- 5 files changed, 71 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 25854211..970fd806 100644 --- a/flake.lock +++ b/flake.lock @@ -45,6 +45,26 @@ "type": "github" } }, + "blender-bin": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "dir": "blender", + "lastModified": 1742939360, + "narHash": "sha256-YeM/A4SWHlz2trSNjriPi4QR5zsYMC8vkQawSlRw2+w=", + "owner": "edolstra", + "repo": "nix-warez", + "rev": "c9d2d5c61a37f2217e9241ccfa6c394ed2f3e52b", + "type": "github" + }, + "original": { + "dir": "blender", + "owner": "edolstra", + "repo": "nix-warez", + "type": "github" + } + }, "cachix": { "inputs": { "devenv": "devenv_2", @@ -159,7 +179,7 @@ "cachix": "cachix", "flake-compat": "flake-compat_4", "nix": "nix_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { @@ -236,7 +256,7 @@ "flake-compat" ], "nix": "nix", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "poetry2nix": "poetry2nix", "pre-commit-hooks": [ "nur-ataraxiasjel", @@ -873,7 +893,7 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1744513856, @@ -958,7 +978,7 @@ ], "flake-parts": "flake-parts_5", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression_3", "pre-commit-hooks": "pre-commit-hooks" @@ -1054,18 +1074,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744502386, - "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-24.11", + "type": "indirect" } }, "nixpkgs-23-11": { @@ -1272,6 +1291,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1744502386, + "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1744463964, "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", @@ -1287,7 +1322,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1701436327, "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", @@ -1301,7 +1336,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1692808169, "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", @@ -1317,7 +1352,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1717432640, "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", @@ -1333,7 +1368,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1716977621, "narHash": "sha256-Q1UQzYcMJH4RscmpTkjlgqQDX5yi1tZL0O345Ri6vXQ=", @@ -1349,7 +1384,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -1365,7 +1400,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1702921762, "narHash": "sha256-O/rP7gulApQAB47u6szEd8Pn8Biw0d84j5iuP2tcxzY=", @@ -1383,7 +1418,7 @@ }, "nuenv": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -1405,7 +1440,7 @@ "devenv": "devenv", "devenv-root": "devenv-root", "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1742205455, @@ -1423,7 +1458,7 @@ }, "nur-ryan4yin": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1741747508, @@ -1605,6 +1640,7 @@ "inputs": { "agenix": "agenix", "anyrun": "anyrun", + "blender-bin": "blender-bin", "disko": "disko", "doomemacs": "doomemacs", "ghostty": "ghostty", @@ -1618,7 +1654,7 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-unstable": "nixpkgs-unstable_2", diff --git a/flake.nix b/flake.nix index d47e635f..2eae63fd 100644 --- a/flake.nix +++ b/flake.nix @@ -117,6 +117,8 @@ url = "github:ghostty-org/ghostty"; }; + blender-bin.url = "github:edolstra/nix-warez?dir=blender"; + ######################## Some non-flake repositories ######################################### # doom-emacs is a configuration framework for GNU Emacs. diff --git a/home/linux/gui/base/creative.nix b/home/linux/gui/base/creative.nix index 87992f15..37495be6 100644 --- a/home/linux/gui/base/creative.nix +++ b/home/linux/gui/base/creative.nix @@ -3,11 +3,13 @@ pkgs-unstable, # pkgs-stable, nur-ryan4yin, + blender-bin, ... }: { home.packages = with pkgs; [ # creative - blender # 3d modeling + # https://github.com/edolstra/nix-warez/blob/master/blender/flake.nix + blender-bin.packages.${pkgs.system}.blender_4_2 # 3d modeling # gimp # image editing, I prefer using figma in browser instead of this one inkscape # vector graphics krita # digital painting diff --git a/modules/base.nix b/modules/base.nix index 18fd454e..1c41e07b 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -100,9 +100,9 @@ # status: https://mirrors.ustc.edu.cn/status/ # "https://mirrors.ustc.edu.cn/nix-channels/store" # status: https://mirror.sjtu.edu.cn/ - # "https://mirror.sjtu.edu.cn/nix-channels/store" + "https://mirror.sjtu.edu.cn/nix-channels/store" # others - "https://mirrors.sustech.edu.cn/nix-channels/store" + # "https://mirrors.sustech.edu.cn/nix-channels/store" "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store" "https://nix-community.cachix.org" diff --git a/modules/nixos/desktop/remote-desktop/default.nix b/modules/nixos/desktop/remote-desktop/default.nix index 3ab750cd..f40f7993 100644 --- a/modules/nixos/desktop/remote-desktop/default.nix +++ b/modules/nixos/desktop/remote-desktop/default.nix @@ -3,11 +3,11 @@ mylib, ... }: { - imports = mylib.scanPaths ./.; - - environment.systemPackages = with pkgs; [ - waypipe - moonlight-qt # moonlight client, for streaming games/desktop from a PC - rustdesk # p2p remote desktop - ]; + # imports = mylib.scanPaths ./.; + # + # environment.systemPackages = with pkgs; [ + # waypipe + # moonlight-qt # moonlight client, for streaming games/desktop from a PC + # rustdesk # p2p remote desktop + # ]; }