fix: 修复首次 darwin-rebuild 的构建错误

- nix.enable=false 兼容 Determinate Nix (macOS)
- 禁用 catppuccin.nvim (require check 失败)
- fl-clash 用完整 tap 路径放入 casks
- 修复 SSH/git 废弃选项警告
- 更新 flake.lock
This commit is contained in:
2026-04-10 23:30:35 +08:00
parent 3ccdd8d2e2
commit 215e09910c
5 changed files with 9 additions and 11 deletions
+2
View File
@@ -3,6 +3,7 @@
{ {
programs.git = { programs.git = {
enable = true; enable = true;
signing.format = null;
settings = { settings = {
user = { user = {
name = "imbytecat"; name = "imbytecat";
@@ -48,6 +49,7 @@
programs.ssh = { programs.ssh = {
enable = true; enable = true;
enableDefaultConfig = false;
matchBlocks."*" = { matchBlocks."*" = {
identityFile = "~/.ssh/id_ed25519"; identityFile = "~/.ssh/id_ed25519";
addKeysToAgent = "yes"; addKeysToAgent = "yes";
+1 -1
View File
@@ -4,6 +4,6 @@
catppuccin = { catppuccin = {
enable = true; enable = true;
flavor = "mocha"; flavor = "mocha";
# Automatically themes: bat, btop, delta, fish, fzf, lazygit, starship, tmux, etc. nvim.enable = false; # catppuccin-nvim require check broken in nixpkgs
}; };
} }
+1 -1
View File
@@ -63,7 +63,7 @@
"dbeaver-community" "dbeaver-community"
"discord" "discord"
"feishu" "feishu"
"fl-clash" "goooler/repo/fl-clash"
"ghostty" "ghostty"
"keka" "keka"
"logitech-g-hub" "logitech-g-hub"
+5 -7
View File
@@ -1,17 +1,15 @@
{ lib, ... }: { lib, pkgs, ... }:
{ {
nix.settings = { # Determinate Nix manages the daemon on macOS
nix.enable = !pkgs.stdenv.isDarwin;
nix.settings = lib.mkIf (!pkgs.stdenv.isDarwin) {
experimental-features = [ experimental-features = [
"nix-command" "nix-command"
"flakes" "flakes"
]; ];
warn-dirty = false; warn-dirty = false;
# 国内镜像(按需取消注释)
# substituters = [
# "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
# "https://cache.nixos.org"
# ];
}; };
nixpkgs = { nixpkgs = {
-2
View File
@@ -1,5 +1,3 @@
final: prev: { final: prev: {
# ── Custom overlays ──────────────────────────────────
# Override or extend nixpkgs packages here.
comment-checker = final.callPackage ../pkgs/comment-checker { }; comment-checker = final.callPackage ../pkgs/comment-checker { };
} }