Skip to content

Commit 4edde1f

Browse files
eapolinarioclaude
andcommitted
refactor: reorganize dotfiles into per-platform top-level directories
Group all configs by platform to make the repo easier to navigate and extend. The flat top-level layout mixed three unrelated setups; this commit gives each its own directory. Layout changes: - omarchy/ ← hypr, waybar, eca, starship, systemd, uwsm, xcompose, install.sh (was install_dotfiles_linux.sh) - macos/ ← zsh, pip, skhd, tmux, yabai, Brewfile, install.sh (was install_dotfiles_macos.sh) - common/ ← doom, authinfo (shared across platforms) - nixos/ unchanged Script / config updates: - omarchy/install.sh: doom stow now uses -d "$SCRIPT_DIR/../common" - macos/install.sh: add SCRIPT_DIR; all stow calls get explicit -d flags; doom and authinfo resolved via common/ - nixos/home/eduardo/default.nix: authinfo out-of-store symlink updated to dotfiles/common/authinfo/.authinfo - Makefile: update install-linux, install-macos, brewfile-update targets Also add readme.org describing the new layout and installation steps. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent aaa7dc1 commit 4edde1f

File tree

40 files changed

+160
-14
lines changed

40 files changed

+160
-14
lines changed

Makefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ BASELINE := gitleaks.baseline
66
# Executable; override if you have gitleaks elsewhere, e.g. `make GITLEAKS=/path/to/gitleaks gitleaks`
77
GITLEAKS ?= gitleaks
88

9-
.PHONY: gitleaks install-linux install-macos gitleaks-baseline-regen brewfile-update
9+
.PHONY: gitleaks install-linux install-macos gitleaks-baseline-regen brewfile-update help
1010
# Scan the repository for new secrets. Fails (non-zero exit status) if any leak
1111
# that is *not* in $(BASELINE) is detected.
1212
gitleaks:
@@ -16,16 +16,17 @@ gitleaks-baseline-regen:
1616
$(GITLEAKS) detect --source . --config .gitleaks.toml --report-format json --report-path $(BASELINE)
1717

1818
install-linux:
19-
./install_dotfiles_linux.sh
19+
./omarchy/install.sh
2020

2121
install-macos:
22-
./install_dotfiles_macos.sh
22+
./macos/install.sh
2323

2424
brewfile-update:
25-
brew bundle dump --file ./Brewfile --force
25+
brew bundle dump --file ./macos/Brewfile --force
2626

27-
.PHONY: help
2827
help:
2928
@echo "Available targets:"
3029
@echo " gitleaks – Run gitleaks with baseline $(BASELINE)"
30+
@echo " install-linux – Install dotfiles on Arch Linux / omarchy"
31+
@echo " install-macos – Install dotfiles on macOS"
3132
@echo " brewfile-update – Update Brewfile from current Homebrew state"
File renamed without changes.
File renamed without changes.

common/doom/custom.el

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
;;; -*- lexical-binding: t -*-
2+
(custom-set-variables
3+
;; custom-set-variables was added by Custom.
4+
;; If you edit it by hand, you could mess it up, so be careful.
5+
;; Your init file should contain only one such instance.
6+
;; If there is more than one, they won't work right.
7+
'(custom-safe-themes
8+
'("7771c8496c10162220af0ca7b7e61459cb42d18c35ce272a63461c0fc1336015"
9+
"0f1341c0096825b1e5d8f2ed90996025a0d013a0978677956a9e61408fcd2c77"
10+
"a368631abdadffb6882f9994637d7216167912311447f1ec02f9dc58e9cc62a9"
11+
"9d5124bef86c2348d7d4774ca384ae7b6027ff7f6eb3c401378e298ce605f83a"
12+
"e4d4cc443964b8a64defc06de3edb2363f7cb1b3c3ae2272b2c1487f626e4318"
13+
"d12b1d9b0498280f60e5ec92e5ecec4b5db5370d05e787bc7cc49eae6fb07bc0"
14+
"7de64ff2bb2f94d7679a7e9019e23c3bf1a6a04ba54341c36e7cf2d2e56e2bcc"
15+
"f1e8339b04aef8f145dd4782d03499d9d716fdc0361319411ac2efc603249326"
16+
"21d2bf8d4d1df4859ff94422b5e41f6f2eeff14dd12f01428fa3cb4cb50ea0fb"
17+
"d97ac0baa0b67be4f7523795621ea5096939a47e8b46378f79e78846e0e4ad3d"
18+
"19d62171e83f2d4d6f7c31fc0a6f437e8cec4543234f0548bad5d49be8e344cd"
19+
"b7a09eb77a1e9b98cafba8ef1bd58871f91958538f6671b22976ea38c2580755"
20+
"0c83e0b50946e39e237769ad368a08f2cd1c854ccbcd1a01d39fdce4d6f86478"
21+
"f253a920e076213277eb4cbbdf3ef2062e018016018a941df6931b995c6ff6f6"
22+
"b5fd9c7429d52190235f2383e47d340d7ff769f141cd8f9e7a4629a81abc6b19"
23+
"3f24dd8f542f4aa8186a41d5770eb383f446d7228cd7a3413b9f5e0ec0d5f3c0"
24+
"fd22a3aac273624858a4184079b7134fb4e97104d1627cb2b488821be765ff17"
25+
"e4a702e262c3e3501dfe25091621fe12cd63c7845221687e36a79e17cf3a67e0" default))
26+
'(elfeed-feeds
27+
'("https://feeds.bbci.co.uk/news/rss.xml"
28+
"https://this-week-in-rust.org/rss.xml"
29+
("http://feeds.bbci.co.uk/news/rss.xml" news tops)
30+
("https://this-week-in-rust.org/rss.xml" programming rust))))
31+
(custom-set-faces
32+
;; custom-set-faces was added by Custom.
33+
;; If you edit it by hand, you could mess it up, so be careful.
34+
;; Your init file should contain only one such instance.
35+
;; If there is more than one, they won't work right.
36+
'(evil-ex-lazy-highlight ((t nil)))
37+
'(lazy-highlight ((t (:background "gainsboro" :foreground "dark slate gray"))))
38+
'(org-todo ((t nil))))
39+
(put 'narrow-to-region 'disabled nil)
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)