diff --git a/bin/oh-my-zsh-check.sh b/bin/oh-my-zsh-check.sh new file mode 100755 index 0000000..b851c35 --- /dev/null +++ b/bin/oh-my-zsh-check.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +if [ ! -e "$ZSH/oh-my-zsh.sh" ] ; then + /bin/zsh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussel/oh-my-zsh/master/tools/install.sh)" +fi diff --git a/bin/zsh-check b/bin/zsh-check new file mode 100755 index 0000000..9bde4ff --- /dev/null +++ b/bin/zsh-check @@ -0,0 +1,3 @@ +if [ "$SHELL" != "/bin/zsh" ] ; then + chsh -s /bin/zsh +fi diff --git a/gui/i3/wallpaper.jpg b/gui/i3/wallpaper.jpg new file mode 120000 index 0000000..6394a8d --- /dev/null +++ b/gui/i3/wallpaper.jpg @@ -0,0 +1 @@ +/home/spinach/.dotfiles/gui/wallpapers/pine_tree.jpg \ No newline at end of file diff --git a/install-profile b/install-profile index 6ec2050..1cb823f 100755 --- a/install-profile +++ b/install-profile @@ -19,7 +19,6 @@ cd "${BASE_DIR}" git -C "${BASE_DIR}" submodule sync --quiet --recursive git submodule update --init --recursive "${BASE_DIR}" - while IFS= read -r config; do CONFIGS+=" ${config}" done < "${META_DIR}/${PROFILES_DIR}/$1" diff --git a/meta/base.yaml b/meta/base.yaml index 0b0adf0..ad10b04 100644 --- a/meta/base.yaml +++ b/meta/base.yaml @@ -1,14 +1,12 @@ - defaults: - link: - create: true - relink: true - shell: - stdin: true - stdout: true - stderr: true + link: + create: true + relink: true + shell: + stdin: true + stdout: true + stderr: true -- clean: [ - '~', - '~/.vim', - '~/.config' -] +- clean: + ~/: + ~/.config: diff --git a/meta/configs/fzf.yaml b/meta/configs/fzf.yaml index 6c90945..17dcce0 100644 --- a/meta/configs/fzf.yaml +++ b/meta/configs/fzf.yaml @@ -2,6 +2,6 @@ - [cd src/fzf && make install, Building fzf] - link: - ~/.fzf: src/fzf - ~/.local/bin/fzf: src/fzf/bin/fzf - ~/.local/bin/fzf-tmux: src/fzf/bin/fzf-tmux + ~/.fzf: src/fzf + ~/.local/bin/fzf: src/fzf/bin/fzf + ~/.local/bin/fzf-tmux: src/fzf/bin/fzf-tmux diff --git a/meta/configs/i3.yaml b/meta/configs/i3.yaml index 966ef37..8006888 100644 --- a/meta/configs/i3.yaml +++ b/meta/configs/i3.yaml @@ -2,5 +2,5 @@ - [cd src/i3lock-blur && make install, Building i3lock] - link: - ~/.config/i3: gui/i3 - ~/.config/i3/wallpaper.jpg: gui/wallpapers/pine_tree.jpg + ~/.config/i3: gui/i3 + ~/.config/i3/wallpaper.jpg: gui/wallpapers/pine_tree.jpg diff --git a/meta/configs/oh-my-zsh.yaml b/meta/configs/oh-my-zsh.yaml index b328daa..77579ce 100644 --- a/meta/configs/oh-my-zsh.yaml +++ b/meta/configs/oh-my-zsh.yaml @@ -1,7 +1,6 @@ - shell: - - [if [ ! -e "$ZSH/oh-my-zsh.sh" ] ; then /bin/zsh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussel/oh-my-zsh/master/tools/install.sh)" ; fi;] - + - [bin/oh-my-zsh-check.sh] - link: - ~/.oh-my-zsh/custom: - path: shells/oh-my-zsh/custom - force: true + ~/.oh-my-zsh/custom: + path: shells/oh-my-zsh/custom + force: true diff --git a/meta/configs/picom.yaml b/meta/configs/picom.yaml index 7589448..32d6d3c 100644 --- a/meta/configs/picom.yaml +++ b/meta/configs/picom.yaml @@ -1,3 +1,3 @@ - link: - ~/.config/picom: gui/picom - ~/.local/bin/picom-launch.sh: bin/picom-launch.sh + ~/.config/picom: gui/picom + ~/.local/bin/picom-launch.sh: bin/picom-launch.sh diff --git a/meta/configs/polybar.yaml b/meta/configs/polybar.yaml index f7aea12..c76ba4b 100644 --- a/meta/configs/polybar.yaml +++ b/meta/configs/polybar.yaml @@ -1,3 +1,3 @@ - link: - ~/.config/polybar: gui/polybar - ~/.local/bin/polybar-launch.sh: bin/polybar-launch.sh + ~/.config/polybar: gui/polybar + ~/.local/bin/polybar-launch.sh: bin/polybar-launch.sh diff --git a/meta/configs/st.yaml b/meta/configs/st.yaml index ab163c4..ac605d7 100644 --- a/meta/configs/st.yaml +++ b/meta/configs/st.yaml @@ -1,2 +1,2 @@ - shell: - [cd shells/st && sudo make install, Building st] + - [cd shells/st && sudo make install, Installing st] diff --git a/meta/configs/timetracker.yaml b/meta/configs/timetracker.yaml index 646e0dc..8197640 100644 --- a/meta/configs/timetracker.yaml +++ b/meta/configs/timetracker.yaml @@ -1,3 +1,3 @@ - link: - ~/.local/bin/timetracker: src/timetracker/timetracker - ~/.config/systemd/user/timesheet.service: src/timetracker/timesheet.service + ~/.local/bin/timetracker: src/timetracker/timetracker + ~/.config/systemd/user/timesheet.service: src/timetracker/timesheet.service diff --git a/meta/configs/tmux-full.yaml b/meta/configs/tmux-full.yaml index 4cd7b8b..2a2e78e 100644 --- a/meta/configs/tmux-full.yaml +++ b/meta/configs/tmux-full.yaml @@ -1,3 +1,3 @@ -link: - ~/.tmux.conf: terminals/tmux/tmux-full.conf +- link: + ~/.tmux.conf: terminals/tmux/tmux-full.conf diff --git a/meta/configs/tmux-sparse.yaml b/meta/configs/tmux-sparse.yaml index 395bb53..7e51899 100644 --- a/meta/configs/tmux-sparse.yaml +++ b/meta/configs/tmux-sparse.yaml @@ -1,3 +1,2 @@ -link: - ~/.tmux.conf: terminals/tmux/tmux-sparse.conf - +- link: + ~/.tmux.conf: terminals/tmux/tmux-sparse.conf diff --git a/meta/configs/vim.yaml b/meta/configs/vim.yaml index 044058e..0c10873 100644 --- a/meta/configs/vim.yaml +++ b/meta/configs/vim.yaml @@ -1,7 +1,7 @@ - clean: - ~/.vim: + ~/.vim: - link: - ~/.vim/colors: editors/vim/colors - ~/.vim/pack: editors/vim/pack - ~/.vimrc: editors/vim/vimrc + ~/.vim/colors: editors/vim/colors + ~/.vim/pack: editors/vim/pack + ~/.vimrc: editors/vim/vimrc diff --git a/meta/configs/zsh.yaml b/meta/configs/zsh.yaml index 8df237d..5bf9d7f 100644 --- a/meta/configs/zsh.yaml +++ b/meta/configs/zsh.yaml @@ -1,6 +1,6 @@ - shell: - - [if [ "$SHELL" != "/bin/zsh" ] ; then chsh -s /bin/zsh; fi;] + - [bin/zsh-check] - link: - ~/.zshrc: shells/zsh/zshrc - ~/.zprofile: shells/zsh/zprofile + ~/.zshrc: shells/zsh/zshrc + ~/.zprofile: shells/zsh/zprofile