Move dotfiles from HOME into sub directory, make discovery automatic

like config
This commit is contained in:
Evie Litherland-Smith 2023-02-09 08:53:40 +00:00
parent d2c5ba1d1e
commit 8383f7d019
5 changed files with 18 additions and 21 deletions

View file

@ -4,6 +4,8 @@ FONT_DIR := $(HOME)/.local/share/fonts
ZSH_DIR := $(if $(ZSH), $(ZSH), $(HOME)/.oh-my-zsh)
ZSH_CUSTOM_DIR := $(if $(ZSH_CUSTOM), $(ZSH_CUSTOM), $(ZSH_DIR)/custom)
HOME_ITEMS := $(wildcard home/*)
HOME_TARGETS := $(HOME_ITEMS:home/%=$(HOME)/.%)
CONFIG_ITEMS := $(wildcard config/*)
CONFIG_TARGETS := $(CONFIG_ITEMS:config/%=$(CONFIG_DIR)/%)
ZSH_ITEMS := $(wildcard ohmyzsh/*.zsh)
@ -14,38 +16,35 @@ PACKER_DIR := $(HOME)/.local/share/nvim/site/pack/packer/start/packer.nvim
POWERLEVEL_REPO := https://github.com/romkatv/powerlevel10k.git
POWERLEVEL_DIR := $(ZSH_CUSTOM_DIR)/themes/powerlevel10k
.PHONY := all config packages clean zsh ssh nvim
.PHONY := install clean home packages config zsh ssh nvim
install: config packages
install: home packages config zsh ssh nvim
config: $(CONFIG_TARGETS) zsh ssh nvim
clean:
for link in $(HOME_TARGETS); do rm "$$link"; done
for link in $(CONFIG_TARGETS); do rm "$$link"; done
rm $(HOME)/.ssh/config
rm -rf $(PACKER_DIR)
rm -rf $(ZSH_DIR)
home: $(HOME_TARGETS)
packages:
pacman -T - < pkglist.txt || sudo pacman --needed -S - < pkglist.txt
clean:
for link in $(CONFIG_TARGETS); do rm "$$link"; done
for link in $(ZSH_TARGETS); do rm "$$link"; done
rm $(HOME)/.zprofile
rm $(HOME)/.zshrc
rm $(HOME)/.p10k.zsh
rm $(HOME)/.ssh/config
rm -rf $(PACKER_DIR)
rm -rf $(POWERLEVEL_DIR)
config: $(CONFIG_TARGETS)
zsh: $(HOME)/.zprofile $(HOME)/.zshrc $(ZSH_DIR) $(ZSH_CUSTOM_DIR) $(POWERLEVEL_DIR) $(HOME)/.p10k.zsh $(ZSH_TARGETS)
zsh: $(ZSH_DIR) $(POWERLEVEL_DIR) $(ZSH_TARGETS)
ssh: $(HOME)/.ssh/config $(HOME)/.ssh/sockets $(HOME)/.ssh/config.d
nvim: $(PACKER_DIR)
$(HOME_TARGETS): $(HOME)/.%: home/%
$(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/%
$(ZSH_TARGETS): $(ZSH_CUSTOM_DIR)/%.zsh: ohmyzsh/%.zsh
$(HOME)/.zprofile: .zprofile
$(HOME)/.zshrc: .zshrc
$(HOME)/.p10k.zsh: .p10k.zsh
$(HOME)/.ssh/config: $(HOME)/.ssh/%: ssh-%
$(CONFIG_TARGETS) $(ZSH_TARGETS) $(HOME)/.zprofile $(HOME)/.zshrc $(HOME)/.p10k.zsh $(HOME)/.ssh/config:
$(HOME_TARGETS) $(CONFIG_TARGETS) $(ZSH_TARGETS) $(HOME)/.ssh/config:
ln -s $(PWD)/$? $@
$(PACKER_DIR):
@ -54,10 +53,8 @@ $(PACKER_DIR):
$(ZSH_DIR):
sh -c "$$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
$(ZSH_CUSTOM_DIR): $(ZSH_DIR)
$(POWERLEVEL_DIR): $(ZSH_CUSTOM_DIR)
$(POWERLEVEL_DIR): $(ZSH_DIR)
git clone --depth 1 $(POWERLEVEL_REPO) $@
$(LOCAL_BIN) $(CONFIG_DIR) $(FONT_DIR) $(HOME)/.ssh $(HOME)/.ssh/sockets $(HOME)/.ssh/config.d:
$(LOCAL_BIN) $(CONFIG_DIR) $(FONT_DIR) $(HOME)/.ssh/sockets $(HOME)/.ssh/config.d:
mkdir -p $@

View file