Fix ohmyzsh install
Remove bin and fonts from default install, separate zsh and nvim to keep
This commit is contained in:
parent
e705e9a7a1
commit
b2e6958169
14
Makefile
14
Makefile
|
@ -3,7 +3,7 @@ CONFIG_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME), $(HOME)/.config)
|
|||
SYSTEMD_DIR := $(CONFIG_DIR)/systemd/user
|
||||
FONT_DIR := $(HOME)/.local/share/fonts
|
||||
ZSH_DIR := $(if $(ZSH), $(ZSH), $(HOME)/.oh-my-zsh)
|
||||
ZSH_CUSTOM_DIR := $(if $(ZSH_CUSTOM), $(ZSH_CUSTOM), $(ZSH)/custom)
|
||||
ZSH_CUSTOM_DIR := $(if $(ZSH_CUSTOM), $(ZSH_CUSTOM), $(ZSH_DIR)/custom)
|
||||
|
||||
CONFIG_ITEMS := $(wildcard config/*)
|
||||
CONFIG_TARGETS := $(CONFIG_ITEMS:config/%=$(CONFIG_DIR)/%)
|
||||
|
@ -21,21 +21,21 @@ 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 force clean config bin zsh
|
||||
.PHONY := all force clean config zsh nvim
|
||||
|
||||
all: config bin zsh
|
||||
all: config zsh nvim
|
||||
|
||||
force: clean all
|
||||
|
||||
clean:
|
||||
echo "TODO"
|
||||
|
||||
config: $(CONFIG_TARGETS) $(SYSTEMD_TARGETS) $(FONT_TARGETS)
|
||||
|
||||
bin: $(BIN_TARGETS) $(PACKER_DIR)
|
||||
config: $(CONFIG_TARGETS) $(SYSTEMD_TARGETS)
|
||||
|
||||
zsh: $(ZSH_DIR) $(ZSH_CUSTOM_DIR) $(POWERLEVEL_DIR) $(ZSH_TARGETS)
|
||||
|
||||
nvim: $(PACKER_DIR)
|
||||
|
||||
$(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/%
|
||||
$(SYSTEMD_TARGETS): $(SYSTEMD_DIR)/%: systemd/%
|
||||
$(FONT_TARGETS): $(FONT_DIR)/%: nerdfont_symbols/%
|
||||
|
@ -53,7 +53,7 @@ $(PACKER_DIR):
|
|||
git clone --depth 1 $(PACKER_REPO) $@
|
||||
|
||||
$(ZSH_DIR):
|
||||
curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | sh -
|
||||
sh -c "$$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
|
||||
|
||||
$(ZSH_CUSTOM_DIR): $(ZSH_DIR)
|
||||
|
||||
|
|
Loading…
Reference in a new issue