dannydannydanny/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: unpin clan-community now that dm-pull-deploy fix merged 🔧

Browse source 
PR clan/clan-community#25 (machine.name hyphen sanitization) merged
upstream, so swap clan-community.url from the fork branch back to
clan/clan-community/archive/main.tar.gz and update flake.lock to
upstream rev 81e4c9c. Eval confirms byte-identical host closures.

Also finishes the dotfiles-rebuild retirement: phantom-ship.nix still
referenced the now-deleted modules/dotfiles-rebuild.nix in comments.
This commit is contained in:
DannyDannyDanny 2026-05-22 21:15:20 +02:00
parent b11add8525
commit 3dcbdd408a
3 changed files with 19 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

43
flake.lock generated
View file

@ -9,22 +9,18 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1778267301, "lastModified": 1779453564,
"narHash": "sha256-/SEnX0wGQuvQ78EKWTIDA8nCUaJhCD0nVbtP5evFdSQ=", "narHash": "sha256-q7iVGGhZYtAwsjf7sIKcYD5IgsTTTobWP/EStaDCUZc=",
"ref": "fix/dm-pull-deploy-hyphen-hostnames", "rev": "81e4c9cded645d0384812dd6b8f05bd2475ffe64",
"rev": "bd2f9c63ed5613eb52a03116df88b06275171f55", "type": "tarball",
"revCount": 47, "url": "https://git.clan.lol/api/v1/repos/clan/clan-community/archive/81e4c9cded645d0384812dd6b8f05bd2475ffe64.tar.gz"
"type": "git",
"url": "https://git.clan.lol/dannydannydanny/clan-community.git"
}, },
"original": { "original": {
"ref": "fix/dm-pull-deploy-hyphen-hostnames", "type": "tarball",
"type": "git", "url": "https://git.clan.lol/clan/clan-community/archive/main.tar.gz"
"url": "https://git.clan.lol/dannydannydanny/clan-community.git"
} }
}, },
"clan-core": { "clan-core": {
@ -40,7 +36,7 @@
"nixpkgs" "nixpkgs"
], ],
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"systems": "systems_2", "systems": "systems",
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
@ -182,7 +178,7 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -200,7 +196,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
@ -536,21 +532,6 @@
} }
}, },
"systems": { "systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": { "locked": {
"lastModified": 1774449309, "lastModified": 1774449309,
"narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
@ -566,7 +547,7 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": { "systems_2": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -581,7 +562,7 @@
"type": "github" "type": "github"
} }
}, },
"systems_4": { "systems_3": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

7
flake.nix
View file

@ -29,10 +29,9 @@
clan-core.inputs.nixpkgs.follows = "nixpkgs"; clan-core.inputs.nixpkgs.follows = "nixpkgs";
clan-core.inputs.flake-parts.follows = "flake-parts"; clan-core.inputs.flake-parts.follows = "flake-parts";
# clan-community: dm-pull-deploy etc. Pinned to our fork's fix branch # clan-community: dm-pull-deploy etc. Back on upstream main since
# until clan/clan-community#25 (machine.name hyphen sanitization) lands. # clan/clan-community#25 (machine.name hyphen sanitization) merged.
# Swap back to `archive/main.tar.gz` when merged. clan-community.url = "https://git.clan.lol/clan/clan-community/archive/main.tar.gz";
clan-community.url = "git+https://git.clan.lol/dannydannydanny/clan-community.git?ref=fix/dm-pull-deploy-hyphen-hostnames";
clan-community.inputs.nixpkgs.follows = "nixpkgs"; clan-community.inputs.nixpkgs.follows = "nixpkgs";
clan-community.inputs.clan-core.follows = "clan-core"; clan-community.inputs.clan-core.follows = "clan-core";
}; };

7
nixos/hosts/phantom-ship.nix
View file

@ -111,7 +111,7 @@ in
# Passwordless sudo for wheel. # Passwordless sudo for wheel.
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
git # clone/bootstrap and dotfiles-rebuild timer git # clone/bootstrap and dm-pull-deploy
nodejs # npm for openclaw plugin installs nodejs # npm for openclaw plugin installs
python3 # node-gyp dependency for openclaw plugins python3 # node-gyp dependency for openclaw plugins
wakeonlan # wake rusty-anchor: wakeonlan 00:16:cb:87:20:ba wakeonlan # wake rusty-anchor: wakeonlan 00:16:cb:87:20:ba
@ -581,6 +581,7 @@ in
}; };
}; };
# Auto-rebuild service/timer + safe.directory provided by the # Deploys flow through clan dm-pull-deploy: the dm-pull-deploy.path
# shared dotfiles-rebuild NixOS module (see nixos/modules/dotfiles-rebuild.nix). # watcher rebuilds when sunken-ship announces a new origin/main rev.
# The legacy pull-based dotfiles-rebuild module was retired 2026-05-19.
} }