From b688ee7503872b7a9963a52606c52abd3c3cd233 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Mon, 8 May 2023 12:16:45 +0300 Subject: [PATCH] Chore(tools): Moved dotbot under tools --- .gitmodules | 6 +++--- add-submodules.sh | 5 +++-- hosts/air/install.conf.yaml | 2 +- hosts/lakka/install.conf.yaml | 2 +- hosts/tunkki/install.conf.yaml | 2 +- hosts/v/install.conf.yaml | 2 +- install | 12 ++++++------ install.conf.yaml | 2 +- dotbot => tools/dotbot | 0 dotbot-brew => tools/dotbot-brew | 0 hosts/defaults.yaml => tools/dotbot-defaults.yaml | 2 +- dotbot-include => tools/dotbot-include | 0 12 files changed, 18 insertions(+), 17 deletions(-) rename dotbot => tools/dotbot (100%) rename dotbot-brew => tools/dotbot-brew (100%) rename hosts/defaults.yaml => tools/dotbot-defaults.yaml (70%) rename dotbot-include => tools/dotbot-include (100%) diff --git a/.gitmodules b/.gitmodules index cb4d32f..6990b6b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,16 +1,16 @@ # vim: set expandtab: [submodule "dotbot"] - path = dotbot + path = tools/dotbot url = https://github.com/anishathalye/dotbot.git ignore = dirty [submodule "dotbot-brew"] - path = dotbot-brew + path = tools/dotbot-brew url = https://github.com/wren/dotbot-brew.git ignore = dirty [submodule "dotbot-include"] - path = dotbot-include + path = tools/dotbot-include url = https://gitlab.com/gnfzdz/dotbot-include.git ignore = dirty diff --git a/add-submodules.sh b/add-submodules.sh index c7620ab..100ad71 100755 --- a/add-submodules.sh +++ b/add-submodules.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash -git submodule add --name dotbot-brew -f https://github.com/wren/dotbot-brew.git dotbot-brew -git submodule add --name dotbot-include -f https://gitlab.com/gnfzdz/dotbot-include.git dotbot-include +git submodule add --name dotbot -f https://github.com/anishathalye/dotbot.git tools/dotbot +git submodule add --name dotbot-brew -f https://github.com/wren/dotbot-brew.git tools/dotbot-brew +git submodule add --name dotbot-include -f https://gitlab.com/gnfzdz/dotbot-include.git tools/dotbot-include git submodule add --name cheat-community -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community git submodule add --name tmux/tpm -f https://github.com/tmux-plugins/tpm.git config/tmux/plugins/tpm diff --git a/hosts/air/install.conf.yaml b/hosts/air/install.conf.yaml index 632da4e..19dd07f 100644 --- a/hosts/air/install.conf.yaml +++ b/hosts/air/install.conf.yaml @@ -1,4 +1,4 @@ -- include: 'hosts/defaults.yaml' +- include: "tools/dotbot-defaults.yaml" - shell: - echo "Configuring air" - brewfile: diff --git a/hosts/lakka/install.conf.yaml b/hosts/lakka/install.conf.yaml index 71d54e0..b743636 100644 --- a/hosts/lakka/install.conf.yaml +++ b/hosts/lakka/install.conf.yaml @@ -1,4 +1,4 @@ -- include: 'hosts/defaults.yaml' +- include: "tools/dotbot-defaults.yaml" - shell: - echo "Configuring lakka" - link: diff --git a/hosts/tunkki/install.conf.yaml b/hosts/tunkki/install.conf.yaml index 483d9b4..7cf907e 100644 --- a/hosts/tunkki/install.conf.yaml +++ b/hosts/tunkki/install.conf.yaml @@ -1,4 +1,4 @@ -- include: 'hosts/defaults.yaml' +- include: "tools/dotbot-defaults.yaml" - shell: - echo "Configuring tunkki" - link: diff --git a/hosts/v/install.conf.yaml b/hosts/v/install.conf.yaml index e2b48e1..9414155 100644 --- a/hosts/v/install.conf.yaml +++ b/hosts/v/install.conf.yaml @@ -1,4 +1,4 @@ -- include: 'hosts/defaults.yaml' +- include: "tools/dotbot-defaults.yaml" - shell: - echo "Configuring v" - brewfile: diff --git a/install b/install index c6eab70..fddb965 100755 --- a/install +++ b/install @@ -3,12 +3,12 @@ set -e CONFIG="install.conf.yaml" -DOTBOT_DIR="dotbot" +DOTBOT_DIR="tools/dotbot" DOTBOT_BIN="bin/dotbot" BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" DOTBOT_BIN_PATH="${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -DOTBOT_HOST="$(hostname -s)" || '' +DOTBOT_HOST="$(hostname -s)" cd "$BASEDIR" git submodule sync --quiet --recursive @@ -16,8 +16,8 @@ git submodule update --init --recursive "${DOTBOT_BIN_PATH}" \ -d "${BASEDIR}" \ - --plugin-dir=dotbot-brew \ - --plugin-dir=dotbot-include \ + --plugin-dir=tools/dotbot-brew \ + --plugin-dir=tools/dotbot-include \ -c "${CONFIG}" \ "${@}" @@ -28,8 +28,8 @@ if [ "${DOTBOT_HOST}" != "" ]; then && echo "(!) Found $DOTBOT_HOST_CONFIG" \ && "$DOTBOT_BIN_PATH" \ -d "$BASEDIR" \ - --plugin-dir=dotbot-brew \ - --plugin-dir=dotbot-include \ + --plugin-dir=tools/dotbot-brew \ + --plugin-dir=tools/dotbot-include \ -c "$DOTBOT_HOST_CONFIG" \ "${@}" fi diff --git a/install.conf.yaml b/install.conf.yaml index a3ebe03..f42ca88 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -1,4 +1,4 @@ -- include: "hosts/defaults.yaml" +- include: "tools/dotbot-defaults.yaml" - clean: ~/: ~/.config: diff --git a/dotbot b/tools/dotbot similarity index 100% rename from dotbot rename to tools/dotbot diff --git a/dotbot-brew b/tools/dotbot-brew similarity index 100% rename from dotbot-brew rename to tools/dotbot-brew diff --git a/hosts/defaults.yaml b/tools/dotbot-defaults.yaml similarity index 70% rename from hosts/defaults.yaml rename to tools/dotbot-defaults.yaml index 952c298..20e0b6e 100644 --- a/hosts/defaults.yaml +++ b/tools/dotbot-defaults.yaml @@ -4,6 +4,6 @@ link: create: true relink: true - exclude: ["*.md", "*renovate*"] + exclude: [ "*.md", "*renovate*", "LICENSE" ] shell: stdout: true diff --git a/dotbot-include b/tools/dotbot-include similarity index 100% rename from dotbot-include rename to tools/dotbot-include