fix: darwin - use XDG base directories, fix secrets

This commit is contained in:
Ryan Yin
2025-01-26 20:30:11 +08:00
parent 922a59a68b
commit 935c80ef5a
5 changed files with 11 additions and 3 deletions
Generated
+3 -3
View File
@@ -763,10 +763,10 @@
"mysecrets": { "mysecrets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732893968, "lastModified": 1737951151,
"narHash": "sha256-Bi0vjWt2S4PKfBToZNc8zUwlwZRUB5/OpDMC8k0hoig=", "narHash": "sha256-HwAOhqXAAmpwMtExiDglZEw4A6c1Y/wJRDnvQOQwDWk=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "0d2564a2feb4f6fcc9cb98a3410fe5531e409043", "rev": "cdc5b9e272cb61e088f3194bd423f4759aae609d",
"shallow": true, "shallow": true,
"type": "git", "type": "git",
"url": "ssh://git@github.com/ryan4yin/nix-secrets.git" "url": "ssh://git@github.com/ryan4yin/nix-secrets.git"
@@ -22,6 +22,7 @@
"cmp-tailwind-colors": { "branch": "main", "commit": "4b200e280e9051a26ade776589c2ac246350f5dc" }, "cmp-tailwind-colors": { "branch": "main", "commit": "4b200e280e9051a26ade776589c2ac246350f5dc" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conjure": { "branch": "main", "commit": "9197941c0ef05bd594bf8fbcc907129361ed456f" }, "conjure": { "branch": "main", "commit": "9197941c0ef05bd594bf8fbcc907129361ed456f" },
"copilot.lua": { "branch": "fix_issue_330", "commit": "538ed7e66cb07186e8083da42e5b3c9752897d72" },
"crates.nvim": { "branch": "main", "commit": "bd35b13e94a292ee6e32c351e05ca2202dc9f070" }, "crates.nvim": { "branch": "main", "commit": "bd35b13e94a292ee6e32c351e05ca2202dc9f070" },
"deno-nvim": { "branch": "master", "commit": "4bc9b5db13e8152b01aed51ce0451cdd38ca6743" }, "deno-nvim": { "branch": "master", "commit": "4bc9b5db13e8152b01aed51ce0451cdd38ca6743" },
"dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" }, "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" },
+3
View File
@@ -12,4 +12,7 @@
../base/gui ../base/gui
../base/home.nix ../base/home.nix
]; ];
# enable management of XDG base directories on macOS.
xdg.enable = true;
} }
+3
View File
@@ -188,6 +188,9 @@ in {
# "jdk-mission-control" # Java Mission Control # "jdk-mission-control" # Java Mission Control
# "google-cloud-sdk" # Google Cloud SDK # "google-cloud-sdk" # Google Cloud SDK
"miniforge" # Miniconda's community-driven distribution "miniforge" # Miniconda's community-driven distribution
# Setup macfuse: https://github.com/macfuse/macfuse/wiki/Getting-Started
"macfuse" # for rclone to mount a fuse filesystem
]; ];
}; };
} }
+1
View File
@@ -99,6 +99,7 @@
}; };
# place secrets in /etc/ # place secrets in /etc/
# NOTE: this will fail for the first time. cause it's running before "activate-agenix"
environment.etc = { environment.etc = {
# wireguard config used with `wg-quick up wg-business` # wireguard config used with `wg-quick up wg-business`
# Fix DNS for WireGuard on macOS: https://github.com/ryan4yin/nix-config/issues/5 # Fix DNS for WireGuard on macOS: https://github.com/ryan4yin/nix-config/issues/5