88c51399d0
clan-cli silently ignores the `?dir=` URL parameter when resolving a
flake source, so with the flake at nixos/flake.nix `clan machines
update` fails with "flake.nix does not exist". Move the flake tree up
so the repo root contains flake.nix, flake.lock, flake-modules/, lib/,
modules/, sops/, and vars/. Host-specific NixOS modules stay in
nixos/{hosts,home,fish.nix,neovim.nix,…}; flake-module paths updated
accordingly.
- dotfiles-rebuild flakeRef is now "${dotfilesDir}#<host>" (was
"${dotfilesDir}/nixos#<host>").
- CLAUDE.md build commands + clan section updated. nixupdate fish alias
updated. sunken-ship hostsfile comment updated.
- Existing /etc/dotfiles checkouts on the servers will pick up the new
layout on the next `dotfiles-rebuild` timer tick; the rebuild service
was pre-updated via rsync so its flakeRef matches before the pull.
Also includes 4b follow-through: zerotier identities are now live on
both servers (sunken-ship=d553a2de33 controller, phantom-ship=6c048abbdc
peer) and IPv6 ping across the ZT mesh works.
22 lines
697 B
Nix
22 lines
697 B
Nix
{ inputs, ... }: {
|
|
flake.darwinConfigurations."Daniel-Macbook-Air" = inputs.nix-darwin.lib.darwinSystem {
|
|
modules = [
|
|
# Overlay: make zen-browser available as pkgs.zen-browser
|
|
{ nixpkgs.overlays = [ (final: prev: {
|
|
zen-browser = inputs.zen-browser.packages.${final.stdenv.hostPlatform.system}.default;
|
|
}) ];
|
|
}
|
|
|
|
../nixos/hosts/daniel-macbook-air.nix
|
|
../nixos/fish.nix
|
|
|
|
inputs.home-manager.darwinModules.home-manager
|
|
(import ../lib/home-manager-user.nix {
|
|
lib = inputs.nixpkgs.lib;
|
|
user = "danny";
|
|
homeDirectory = "/Users/danny";
|
|
userImports = [ ../nixos/home/danny/home.nix ];
|
|
})
|
|
];
|
|
};
|
|
}
|