Rebuild dotfiles as one branch with per-host layers
Replaces the previous repo, which had split into two histories that never met (mainframe on a dead GitLab remote, the laptops on Gitea) with 146 dirty files across three machines and the NAS never enrolled at all. Branch-per-machine is gone. One main, with host differences expressed as small files under hosts/<hostname>/ rather than as branches, so there is nothing to merge. The reconciled zsh layer reduces 15-33 line forks to 1-7 effective lines per host; distro differences (oh-my-zsh prefix, syntax-highlighting path, fd vs fdfind) are probed in common/ instead. Fresh history: the old one carried six plaintext credentials, 45 MB of mail caches, browser caches and vendored binaries. 5,096 tracked files and 144 MB become 462 files and 2.6 MB. The .gitignore is now an allowlist, which is what keeps that true. Root cause of the rot: ~/.local/bin was a symlink to scripts/ with GOPATH inside it, so every go install wrote into version control (2.2 GB on the work laptop). PATH now points at the repo instead of the reverse. Also: Hyprland replaces sway and is sourced in two halves so $browser is defined before use; singleton automations carry ConditionHost= alongside host-layer-only placement; ddns moves from cron to a guarded timer; package manifests and pkg-snapshot/pkg-restore replace the X11-era install_scripts/; networkmanager-dmenu added to system76 (the binding always existed, the package never did).
This commit is contained in:
@@ -0,0 +1,28 @@
|
||||
# Headless homelab host. No WM, no terminal emulator, no browser.
|
||||
# Owns every singleton automation in the fleet.
|
||||
- link:
|
||||
~/.config/git/identity: hosts/mainframe/git/identity
|
||||
~/.config/paru: common/paru
|
||||
~/.config/rbw: common/rbw
|
||||
~/.config/opencode/personal.json: common/opencode/personal.json
|
||||
~/.config/opencode/work.json: common/opencode/work.json
|
||||
~/.config/opencode/work-strict.json: common/opencode/work-strict.json
|
||||
~/.config/opencode/local.json: common/opencode/local.json
|
||||
~/.claude/CLAUDE.md: common/claude/CLAUDE.md
|
||||
~/.claude/settings.json: common/claude/settings.json
|
||||
~/.config/sunshine/sunshine.conf: hosts/mainframe/sunshine/sunshine.conf
|
||||
~/.config/sunshine/apps.json: hosts/mainframe/sunshine/apps.json
|
||||
~/.config/systemd/user/inbox-tidy.service: hosts/mainframe/systemd/inbox-tidy.service
|
||||
~/.config/systemd/user/inbox-tidy.timer: hosts/mainframe/systemd/inbox-tidy.timer
|
||||
~/.config/systemd/user/movie-recs.service: hosts/mainframe/systemd/movie-recs.service
|
||||
~/.config/systemd/user/movie-recs.timer: hosts/mainframe/systemd/movie-recs.timer
|
||||
~/.config/systemd/user/rent-utilities.service: hosts/mainframe/systemd/rent-utilities.service
|
||||
~/.config/systemd/user/rent-utilities.timer: hosts/mainframe/systemd/rent-utilities.timer
|
||||
~/.config/systemd/user/ddns.service: hosts/mainframe/systemd/ddns.service
|
||||
~/.config/systemd/user/ddns.timer: hosts/mainframe/systemd/ddns.timer
|
||||
|
||||
- shell:
|
||||
- command: systemctl --user daemon-reload
|
||||
description: Reloading user units
|
||||
- command: systemctl --user enable --now inbox-tidy.timer movie-recs.timer rent-utilities.timer ddns.timer
|
||||
description: Enabling the singleton timers (mainframe only)
|
||||
@@ -0,0 +1,5 @@
|
||||
# Headless server. Shell and nvim should feel identical to the workstations;
|
||||
# nothing else belongs here. The shortness of this file is the point.
|
||||
- link:
|
||||
~/.config/git/identity: hosts/nas/git/identity
|
||||
~/.config/paru: common/paru
|
||||
@@ -0,0 +1,27 @@
|
||||
# Work laptop. Ubuntu 24.04, Hyprland, user connorjohnstone.
|
||||
# No singleton timers here — that is deliberate.
|
||||
- link:
|
||||
~/.config/git/identity: hosts/sctfw004/git/identity
|
||||
~/.config/kitty: common/kitty
|
||||
~/.config/alacritty: common/alacritty
|
||||
~/.config/qutebrowser: common/qutebrowser
|
||||
~/.config/networkmanager-dmenu: common/networkmanager-dmenu
|
||||
~/.colors: common/colors
|
||||
~/.julia/config/startup.jl: common/startup.jl
|
||||
~/.config/opencode/personal.json: common/opencode/personal.json
|
||||
~/.config/opencode/work.json: common/opencode/work.json
|
||||
~/.config/opencode/work-strict.json: common/opencode/work-strict.json
|
||||
~/.config/opencode/local.json: common/opencode/local.json
|
||||
~/.claude/CLAUDE.md: common/claude/CLAUDE.md
|
||||
~/.config/hypr/hyprland.conf: common/hypr/hyprland.conf
|
||||
~/.config/hypr/hyprlock.conf: common/hypr/hyprlock.conf
|
||||
~/.config/hypr/toggleFloating.sh: common/hypr/toggleFloating.sh
|
||||
~/.config/hypr/local-env.conf: hosts/sctfw004/hypr/local-env.conf
|
||||
~/.config/hypr/local.conf: hosts/sctfw004/hypr/local.conf
|
||||
~/.config/hypr/hypridle.conf: hosts/sctfw004/hypr/hypridle.conf
|
||||
~/.config/hypr/clamshell.sh: hosts/sctfw004/hypr/clamshell.sh
|
||||
~/.config/kanshi: hosts/sctfw004/kanshi
|
||||
~/.config/waybar/config: common/waybar/config
|
||||
~/.config/waybar/style.css: common/waybar/style.css
|
||||
~/.config/waybar/sshuttle-status.sh: common/waybar/sshuttle-status.sh
|
||||
~/.config/waybar/local.css: hosts/sctfw004/waybar/local.css
|
||||
@@ -0,0 +1,27 @@
|
||||
# Personal laptop. Hyprland, full desktop.
|
||||
- link:
|
||||
~/.config/git/identity: hosts/system76/git/identity
|
||||
~/.config/paru: common/paru
|
||||
~/.config/rbw: common/rbw
|
||||
~/.config/kitty: common/kitty
|
||||
~/.config/alacritty: common/alacritty
|
||||
~/.config/qutebrowser: common/qutebrowser
|
||||
~/.config/networkmanager-dmenu: common/networkmanager-dmenu
|
||||
~/.colors: common/colors
|
||||
~/.julia/config/startup.jl: common/startup.jl
|
||||
~/.config/hypr/hyprland.conf: common/hypr/hyprland.conf
|
||||
~/.config/hypr/hyprlock.conf: common/hypr/hyprlock.conf
|
||||
~/.config/hypr/toggleFloating.sh: common/hypr/toggleFloating.sh
|
||||
~/.config/hypr/local-env.conf: hosts/system76/hypr/local-env.conf
|
||||
~/.config/hypr/local.conf: hosts/system76/hypr/local.conf
|
||||
~/.config/hypr/hypridle.conf: hosts/system76/hypr/hypridle.conf
|
||||
~/.config/waybar/config: common/waybar/config
|
||||
~/.config/waybar/style.css: common/waybar/style.css
|
||||
~/.config/waybar/sshuttle-status.sh: common/waybar/sshuttle-status.sh
|
||||
~/.config/waybar/local.css: hosts/system76/waybar/local.css
|
||||
~/.config/systemd/user/hypr_refresh.service: hosts/system76/systemd/hypr_refresh.service
|
||||
~/.config/systemd/user/hypr_refresh.timer: hosts/system76/systemd/hypr_refresh.timer
|
||||
|
||||
- shell:
|
||||
- command: systemctl --user daemon-reload
|
||||
description: Reloading user units
|
||||
Reference in New Issue
Block a user