From 213d738520d8d226e06c964c0da0215ad4a0bbc5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 23 Feb 2020 17:36:05 +0100 Subject: [PATCH] [dotbot] replace json with yaml file --- install | 2 +- install.conf.json | 89 --------------------------------------------- install.conf.yaml | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 90 deletions(-) delete mode 100644 install.conf.json create mode 100644 install.conf.yaml diff --git a/install b/install index d844b6e..5a7e72c 100755 --- a/install +++ b/install @@ -2,7 +2,7 @@ set -e -CONFIG="install.conf.json" +CONFIG="install.conf.yaml" DOTBOT_DIR="dotbot" DOTBOT_BIN="bin/dotbot" diff --git a/install.conf.json b/install.conf.json deleted file mode 100644 index 80367af..0000000 --- a/install.conf.json +++ /dev/null @@ -1,89 +0,0 @@ -[ - { - "defaults": { - "link": { - "relink": true - } - } - }, - { - "clean": ["~"] - }, - { - "shell": [ - ["mkdir -p ~/.profile.d/", "Creating local profile dir"], - ["mkdir -p ~/.local/bin", "Creating local bin dir"], - ["mkdir -p ~/.config/alacritty", "Creating alacritty-config dir"], - ["mkdir -p ~/.config/dunst", "Creating dunst dir"], - ["mkdir -p ~/.config/htop", "Creating htop dir"], - ["mkdir -p ~/.config/i3", "Creating i3-config dir"], - ["mkdir -p ~/.config/i3status", "Creating i3-status dir"], - ["mkdir -p ~/.config/redshift/hooks", "Creating redshift dir"], - ["mkdir -p ~/.config/rofi", "Creating rofi dir"], - ["mkdir -p ~/.config/sway", "Creating sway dir"], - ["mkdir -p ~/.config/swaylock", "Creating swaylock dir"], - ["mkdir -p ~/.config/yay", "Creating yay dir"], - ["mkdir -p ~/.vim/pack/dotfiles/", "Creating vim dir"] - ] - }, - { - "link": { - "~/.dotfiles": "", - "~/.bashrc": "bash/bashrc", - "~/.bash_profile": "bash/bashrc", - "~/.config/alacritty/alacritty.yml": "alacritty/alacritty.yml", - "~/.liquidprompt": "bash/liquidprompt", - "~/.local/bin/host-is-on": "bin/host-is-on.sh", - "~/.local/bin/mdo": "bin/mdo.sh", - "~/.local/bin/mon-toggle": "bin/mon-toggle.sh", - "~/.local/bin/git-authors": "bin/git-authors.sh", - "~/.gitconfig": "git/gitconfig", - "~/.config/i3/config": "i3/i3config", - "~/.config/i3status/config": "i3/i3status", - "~/.local/bin/checknofullscreen": "i3/checknofullscreen.sh", - "~/.local/bin/clean": "bin/clean.sh", - "~/.local/bin/lockscreen": "i3/lockscreen.sh", - "~/.local/bin/lock": "sway/lock.sh", - "~/.config/dunst/dunstrc": "dunst/dunstrc", - "~/.profile.d/load": "shell/load", - "~/.profile.d/10-vars.sh": "shell/vars.sh", - "~/.profile.d/10-paths.sh": "shell/paths.sh", - "~/.profile.d/10-gitrepo-commited.sh": "shell/gitrepo-commited.sh", - "~/.profile.d/10-liquidprompt.sh": "shell/liquidprompt.sh", - "~/.profile.d/20-aliases.sh": "shell/aliases.sh", - "~/.profile.d/20-cd.sh": "shell/cd.sh", - "~/.profile.d/40-extract.sh": "shell/extract.sh", - "~/.profile.d/40-mysqlpw.sh": "shell/mysqlpw.sh", - "~/.profile.d/90-keychain.sh": "shell/keychain.sh", - "~/.profile.d/80-command-not-found.sh": "shell/command-not-found.sh", - "~/.profile.d/81-fzf.sh": "shell/fzf.sh", - "~/.config/redshift.conf": "redshift/redshift.conf", - "~/.config/redshift/hooks/hook.sh": "redshift/hook.sh", - "~/.config/rofi/config.rasi": "rofi/config.rasi", - "~/.config/rofi/arc-dark.rasi": "rofi/arc-dark.rasi", - "~/.config/rofi/system.sh": "rofi/system.sh", - "~/.config/sway/config": "sway/config", - "~/.config/sway/thinkman": "sway/thinkman", - "~/.config/swaylock/config": "sway/lock", - "~/.tmux.conf": "tmux/tmux.conf", - "~/.toprc": "top/toprc", - "~/.config/htop/htoprc": "top/htoprc", - "~/.vimrc": "vim/vimrc", - "~/.vim/pack/dotfiles/start": "vim/start", - "~/.wgetrc": "wget/wgetrc", - "~/.Xresources": "i3/Xresources", - "~/.config/yay/config.json": "yay/config.json" - } - }, - { - "shell": [ - ["git submodule update --init --jobs $(nproc) --recursive", "Installing submodules"], - ["cd vim/start/YouCompleteMe && python3 install.py --all"] - ] - }, - { - "link": { - "~/.local/bin/diff-so-fancy": "git/diff-so-fancy/diff-so-fancy" - } - } -] diff --git a/install.conf.yaml b/install.conf.yaml new file mode 100644 index 0000000..0341102 --- /dev/null +++ b/install.conf.yaml @@ -0,0 +1,91 @@ +- defaults: + link: + relink: true + +- clean: ['~'] + +- create: + - ~/.profile.d + - ~/.local/bin + - ~/.config/alacritty + - ~/.config/htop + - ~/.config/i3status + - ~/.config/mako + - ~/.config/redshift/hooks + - ~/.config/rofi + - ~/.config/sway + - ~/.config/swaylock + - ~/.config/yay + - ~/.config/wofi + - ~/.vim/pack/dotfiles + +# casual +- link: + ~/.dotfiles: '' + ~/.bashrc: bash/bashrc + ~/.bash_profile: bash/bashrc + ~/.config/alacritty/alacritty.yml: alacritty/alacritty.yml + ~/.liquidprompt: bash/liquidprompt + ~/.gitconfig: git/gitconfig + ~/.profile.d/load: shell/load + ~/.profile.d/10-vars.sh: shell/vars.sh + ~/.profile.d/10-paths.sh: shell/paths.sh + ~/.profile.d/10-gitrepo-commited.sh: shell/gitrepo-commited.sh + ~/.profile.d/10-liquidprompt.sh: shell/liquidprompt.sh + ~/.profile.d/20-aliases.sh: shell/aliases.sh + ~/.profile.d/20-cd.sh: shell/cd.sh + ~/.profile.d/40-extract.sh: shell/extract.sh + ~/.profile.d/40-mysqlpw.sh: shell/mysqlpw.sh + ~/.profile.d/90-keychain.sh: shell/keychain.sh + ~/.profile.d/80-command-not-found.sh: shell/command-not-found.sh + ~/.profile.d/81-fzf.sh: shell/fzf.sh + ~/.tmux.conf: tmux/tmux.conf + ~/.toprc: top/toprc + ~/.config/htop/htoprc: top/htoprc + ~/.vimrc: vim/vimrc + ~/.vim/pack/dotfiles/start: vim/start + ~/.wgetrc: wget/wgetrc + ~/.config/yay/config.json: yay/config.json + ~/.Xresources: i3/Xresources + +# graphic +- link: + ~/.config/i3status/config: i3/i3status + ~/.local/bin/lock: sway/lock.sh + ~/.config/systemd/user/swayidle.service: sway/swayidle.service + ~/.config/mako/config: mako/config + ~/.config/systemd/user/mako.service: mako/mako.service + ~/.config/redshift.conf: redshift/redshift.conf + ~/.config/redshift/hooks/hook.sh: redshift/hook.sh + ~/.config/rofi/config.rasi: rofi/config.rasi + ~/.config/rofi/arc-dark.rasi: rofi/arc-dark.rasi + ~/.config/rofi/system.sh: rofi/system.sh + ~/.config/wofi/config: wofi/config + ~/.config/wofi/style.css: wofi/style.css + ~/.config/sway/config: sway/config + ~/.config/sway/thinkman: sway/thinkman + ~/.config/swaylock/config: sway/lock + ~/.config/environment.d/sway.conf: sway/env + + +# scripts +- link: + ~/.local/bin/host-is-on: bin/host-is-on.sh + ~/.local/bin/mdo: bin/mdo.sh + ~/.local/bin/git-authors: bin/git-authors.sh + ~/.local/bin/clean: bin/clean.sh + +# systemd +- shell: + - ["systemctl enable --user mako", "enable mako"] + - ["systemctl enable --user swayidle", "enable swayidle"] + +- shell: + - ["git submodule update --init --jobs $(nproc) --recursive", "Installing submodules"] + +- link: + ~/.local/bin/diff-so-fancy: git/diff-so-fancy/diff-so-fancy + +- shell: + - ["cd vim/start/YouCompleteMe && python3 install.py --all"] +