diff options
| author | zachir <zachir@librem.one> | 2025-06-30 22:29:41 -0500 |
|---|---|---|
| committer | zachir <zachir@librem.one> | 2025-06-30 22:29:41 -0500 |
| commit | cd5c43d1c22297a4da818b46e946b6a8e9287842 (patch) | |
| tree | b3e6b6dba62dd90cfba99f1c039bf5b4cb77b6ea /Makefile | |
| parent | da43b9a0634849720840c5fcd1f3cd4663087d85 (diff) | |
| parent | 64187650dcb08fc08a219412024ab454613ac596 (diff) | |
Merge branch 'master' into cas
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 26 |
1 files changed, 11 insertions, 15 deletions
@@ -1,20 +1,25 @@ VIM := $(shell command -v vim 2>/dev/null) -NVIM := $(shell command -v nvim 2>/dev/null) -ZCONFS := zsh/.zshenv +ZCONFS := zsh/zshenv zsh/zshrc +SCONFS := sh/profile DCONFS := doas.conf all: -install: install-zshconfigs vimplug-vim vimplug-nvim +install: install-zshconfigs install-shconfigs vimplug-vim install-zshconfigs: $(ZCONFS) @echo "Installing zsh conf files..." - @echo "Setting ZSHDOTDIR globally..." - @$(shell sudo installers/set_zshdirs.sh) @echo ".zshenv..." - @ln -sf `pwd`/zsh/.zshenv ~/.zshenv + @ln -sf `pwd`/zsh/zshenv ~/.zshenv + @echo ".zshrc..." + @ln -sf `pwd`/zsh/zshrc ~/.zshrc @echo "Done." +install-shconfigs: $(SCONFS) + @echo "Installing sh conf files..." + @echo ".profile..." + @ln -sf `pwd`/sh/profile ~/.profile + vimplug-vim: installers/vimplug_vim.sh ifdef VIM @echo "Installing vim-plug for vim..." @@ -24,15 +29,6 @@ else @echo "vim not installed." endif -vimplug-nvim: installers/vimplug_nvim.sh -ifdef NVIM - @echo "Installing vim-plug for nvim..." - @$(shell installers/vimplug_nvim.sh) - @echo "Done." -else - @echo "nvim not installed." -endif - doas-conf: $(DCONFS) @echo "Installing doas config files..." @echo "doas.conf..." |