pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove profile, make zprofile source profile if available but not version controlled

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-02-03 20:46:06 +00:00
parent c80e7deff9
commit 52deaa9493
4 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.profile
View file

@ -1,3 +0,0 @@
export PYENV_ROOT="$HOME/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init --path)"

2
.zprofile
View file

@ -1,3 +1,5 @@
[ -f "$HOME/.profile" ] && source "$HOME/.profile"
export PYENV_ROOT="$HOME/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init --path)"

6
Makefile
View file

@ -24,7 +24,6 @@ clean:
for link in $(CONFIG_TARGETS); do rm "$$link"; done
for link in $(FONT_TARGETS); do rm "$$link"; done
for link in $(ZSH_TARGETS); do rm "$$link"; done
rm $(HOME)/.profile
rm $(HOME)/.zprofile
rm $(HOME)/.zshrc
rm $(HOME)/.p10k.zsh
@ -32,7 +31,7 @@ clean:
rm -rf $(PACKER_DIR)
rm -rf $(POWERLEVEL_DIR)
zsh: $(HOME)/.profile $(HOME)/.zprofile $(HOME)/.zshrc $(ZSH_DIR) $(ZSH_CUSTOM_DIR) $(POWERLEVEL_DIR) $(HOME)/.p10k.zsh $(ZSH_TARGETS)
zsh: $(HOME)/.zprofile $(HOME)/.zshrc $(ZSH_DIR) $(ZSH_CUSTOM_DIR) $(POWERLEVEL_DIR) $(HOME)/.p10k.zsh $(ZSH_TARGETS)
ssh: $(HOME)/.ssh/config $(HOME)/.ssh/sockets $(HOME)/.ssh/config.d
@ -41,12 +40,11 @@ nvim: $(PACKER_DIR)
$(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/%
$(FONT_TARGETS): $(FONT_DIR)/%: nerdfont_symbols/%
$(ZSH_TARGETS): $(ZSH_CUSTOM_DIR)/%.zsh: ohmyzsh/%.zsh
$(HOME)/.profile: .profile
$(HOME)/.zprofile: .zprofile
$(HOME)/.zshrc: zshrc
$(HOME)/.p10k.zsh: p10k.zsh
$(HOME)/.ssh/config: $(HOME)/.ssh/%: ssh-%
$(CONFIG_TARGETS) $(FONT_TARGETS) $(ZSH_TARGETS) $(HOME)/.profile $(HOME)/.zprofile $(HOME)/.zshrc $(HOME)/.p10k.zsh $(HOME)/.ssh/config:
$(CONFIG_TARGETS) $(FONT_TARGETS) $(ZSH_TARGETS) $(HOME)/.zprofile $(HOME)/.zshrc $(HOME)/.p10k.zsh $(HOME)/.ssh/config:
ln -s $(PWD)/$? $@
$(PACKER_DIR):

2
zshrc
View file

@ -77,7 +77,7 @@ ZSH_THEME="powerlevel10k/powerlevel10k" # set by `omz`
# Custom plugins may be added to $ZSH_CUSTOM/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
plugins=(git fzf)
plugins=(git fzf pyenv poetry)
source $ZSH/oh-my-zsh.sh