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:
2026-09-14 14:24:37 -04:00
commit e6644d0616
462 changed files with 23524 additions and 0 deletions
+3
View File
@@ -0,0 +1,3 @@
[user]
email = c@rcjohnstone.com
name = Connor Johnstone
+15
View File
@@ -0,0 +1,15 @@
# Hyprland with colors from wallust
# The
# You can use this template by adding the following to wallust.toml:
# hypr = { src = "hyprland-colors.conf", dst = "~/.config/hypr/colors.conf" }
# and then on hyprland.conf:
# source = ~/.config/hypr/colors.conf
general {
# Here we use `saturate` filter to have more vibrant colors,
# not matter the scheme, since the border should seek the attention
col.active_border = rgb(357EBD) rgb(B66F37) rgb(B57638) rgb(BA8234) rgb(C4823A) rgb(DD9B43)
# color0 is almost the same as the background color,
# by putting ee as the alpha, it makes it 100% transparent
col.inactive_border = rgba(3B3A39ee)
}
+34
View File
@@ -0,0 +1,34 @@
general {
lock_cmd = pidof hyprlock || hyprlock # avoid starting multiple hyprlock instances.
before_sleep_cmd = loginctl lock-session # lock before suspend.
after_sleep_cmd = hyprctl dispatch dpms on # to avoid having to press a key twice to turn on the display.
}
listener {
timeout = 600 # 10min.
on-timeout = brightnessctl -s set 10 # set monitor backlight to minimum, avoid 0 on OLED monitor.
on-resume = brightnessctl -r # monitor backlight restore.
}
# turn off keyboard backlight, comment out this section if you dont have a keyboard backlight.
listener {
timeout = 600 # 10min.
on-timeout = brightnessctl -sd rgb:kbd_backlight set 0 # turn off keyboard backlight.
on-resume = brightnessctl -rd rgb:kbd_backlight # turn on keyboard backlight.
}
listener {
timeout = 900 # 15min
on-timeout = loginctl lock-session # lock screen when timeout has passed
}
listener {
timeout = 930 # 15.5min
on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed
on-resume = hyprctl dispatch dpms on && brightnessctl -r # screen on when activity is detected after timeout has fired.
}
listener {
timeout = 1800 # 30min
on-timeout = systemctl suspend # suspend pc
}
+9
View File
@@ -0,0 +1,9 @@
# Sourced near the top of common/hypr/hyprland.conf. Anything used later in
# that file — $browser, env vars, monitor layout — must be defined here.
monitor = ,preferred,auto,auto
env = XCURSOR_SIZE,24
env = HYPRCURSOR_SIZE,24
$browser = qutebrowser
+16
View File
@@ -0,0 +1,16 @@
# Sourced at the very end of common/hypr/hyprland.conf.
general {
gaps_in = 10
gaps_out = 40
}
# Lid switch drives way-displays here; the work laptop uses kanshi instead.
bindl = , switch:off:Lid Switch, exec, hyprctl keyword monitor "eDP-1, auto, auto, auto"
bindl = , switch:off:Lid Switch, exec, way-displays
bindl = , switch:on:Lid Switch, exec, hyprctl keyword monitor "eDP-1, disable"
bindl = , switch:on:Lid Switch, exec, way-displays
workspace = special:playlistBuilder, gapsout:200
bind = $mainMod SHIFT, S, exec, hypr_workspace "playlistBuilder" "zsh -lc 'kitty --title playlistBuilder -e play'"
bind = $mainMod SHIFT, P, exec, cat /tmp/screenshot.png | swayimg --size=image --class "custom_screenshot" -
@@ -0,0 +1,11 @@
[Unit]
Description=Refresh Hyprland Wallpaper and Colors
After=graphical-session.target
[Service]
Type=simple
ExecStart=%h/.dotfiles/common/bin/hypr_refresh
Restart=on-failure
[Install]
WantedBy=default.target
@@ -0,0 +1,9 @@
[Unit]
Description=Run hypr_refresh every minute after boot
[Timer]
OnBootSec=1min
OnUnitActiveSec=1min
[Install]
WantedBy=timers.target
+19
View File
@@ -0,0 +1,19 @@
@define-color cursor #D4C4B4;
@define-color background #141211;
@define-color foreground #F3EBE0;
@define-color color0 #3B3A39;
@define-color color1 #85A3BD;
@define-color color2 #B69D89;
@define-color color3 #B5A08B;
@define-color color4 #BAA383;
@define-color color5 #C4AC92;
@define-color color6 #DDC6A7;
@define-color color7 #E5DACA;
@define-color color8 #A1998E;
@define-color color9 #85A3BD;
@define-color color10 #B69D89;
@define-color color11 #B5A08B;
@define-color color12 #BAA383;
@define-color color13 #C4AC92;
@define-color color14 #DDC6A7;
@define-color color15 #E5DACA;
+2
View File
@@ -0,0 +1,2 @@
/* Wider bezel padding than the work laptop's external monitors want. */
#waybar > box { padding-left: 2in; padding-right: 2in; }
+1
View File
@@ -0,0 +1 @@
alias dc="docker compose"