From 6d24e187fe55daf50eaecb3356c0de36de240d85 Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Tue, 10 Sep 2024 08:58:29 +0100 Subject: [PATCH] checkpoint: remove Makefile and helper scripts --- .helpers/X11/generate-x11-config | 14 ----- .helpers/amfora/generate-amfora-config | 15 ----- .helpers/ansible/generate-ansible-config | 21 ------- .helpers/bash/generate-bash-config | 31 ---------- .helpers/dunst/generate-dunst-config | 14 ----- .helpers/git/generate-git-config | 63 -------------------- .helpers/lf/generate-lf-config | 14 ----- .helpers/lib/install-config | 8 --- .helpers/logrotate/generate-logrotate-config | 15 ----- .helpers/scripts/install-scripts | 15 ----- .helpers/tmux/generate-tmux-config | 14 ----- .helpers/vim/generate-vim-config | 37 ------------ .helpers/xdg/check-xdg-settings | 23 ------- .helpers/xdg/generate-user-dirs-config | 11 ---- Makefile | 46 -------------- 15 files changed, 341 deletions(-) delete mode 100755 .helpers/X11/generate-x11-config delete mode 100755 .helpers/amfora/generate-amfora-config delete mode 100755 .helpers/ansible/generate-ansible-config delete mode 100755 .helpers/bash/generate-bash-config delete mode 100755 .helpers/dunst/generate-dunst-config delete mode 100755 .helpers/git/generate-git-config delete mode 100755 .helpers/lf/generate-lf-config delete mode 100755 .helpers/lib/install-config delete mode 100755 .helpers/logrotate/generate-logrotate-config delete mode 100755 .helpers/scripts/install-scripts delete mode 100755 .helpers/tmux/generate-tmux-config delete mode 100755 .helpers/vim/generate-vim-config delete mode 100755 .helpers/xdg/check-xdg-settings delete mode 100755 .helpers/xdg/generate-user-dirs-config delete mode 100644 Makefile diff --git a/.helpers/X11/generate-x11-config b/.helpers/X11/generate-x11-config deleted file mode 100755 index fe796fd..0000000 --- a/.helpers/X11/generate-x11-config +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -GIT_ROOT_DIR="$( cd "$( dirname $0 )/../.." && pwd )" -X11_DOTFILES_SOURCE_DIR="${GIT_ROOT_DIR}/config/X11" -X11_DOTFILES_DESTINATION_DIR="${XDG_CONFIG_HOME}/X11" - -if ! [ -d ${X11_DOTFILES_DESTINATION_DIR} ]; then - echo "INFO: Creating directory ${X11_DOTFILES_DESTINATION_DIR}" - mkdir ${X11_DOTFILES_DESTINATION_DIR} -fi - -rsync -avh ${X11_DOTFILES_SOURCE_DIR}/xinitrc ${X11_DOTFILES_DESTINATION_DIR}/xinitrc && chmod a-rwx,u+rw $_ diff --git a/.helpers/amfora/generate-amfora-config b/.helpers/amfora/generate-amfora-config deleted file mode 100755 index 4b33a72..0000000 --- a/.helpers/amfora/generate-amfora-config +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -GIT_ROOT_DIR="$( cd "$( dirname $0 )/../.." && pwd )" -AMFORA_CONFIG_SOURCE_DIR="${GIT_ROOT_DIR}/config/amfora" -AMFORA_CONFIG_DESTINATION_DIR="${XDG_CONFIG_HOME}/amfora" - -if ! [ -d ${AMFORA_CONFIG_DESTINATION_DIR} ]; then - echo "INFO: Creating directory ${AMFORA_CONFIG_DESTINATION_DIR}" - mkdir ${AMFORA_CONFIG_DESTINATION_DIR} -fi - -rsync -avh ${AMFORA_CONFIG_SOURCE_DIR}/ ${AMFORA_CONFIG_DESTINATION_DIR} -chmod a-rwx,u+rw ${AMFORA_CONFIG_DESTINATION_DIR}/* diff --git a/.helpers/ansible/generate-ansible-config b/.helpers/ansible/generate-ansible-config deleted file mode 100755 index 0a68ef9..0000000 --- a/.helpers/ansible/generate-ansible-config +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -GIT_ROOT_DIR="$( cd "$( dirname $0 )/../.." && pwd )" -ANSIBLE_DOTFILES_DIR="${GIT_ROOT_DIR}/config/ansible" -ANSIBLE_CONFIG_DIR=${XDG_CONFIG_HOME}/ansible -ANSIBLE_DATA_DIR=${XDG_DATA_HOME}/ansible -ANSIBLE_CACHE_DIR=${XDG_CACHE_HOME}/ansible - -for d in ${ANSIBLE_CONFIG_DIR} ${ANSIBLE_DATA_DIR} ${ANSIBLE_CACHE_DIR}; do - if ! [ -d ${d} ]; then - echo "INFO: Creating directory ${d}" - mkdir ${d} - fi -done - -for f in $( find ${ANSIBLE_DOTFILES_DIR} -type f -exec basename {} \; ); do - echo "INFO: Installing ${f}" - rsync -avh ${ANSIBLE_DOTFILES_DIR}/${f} ${ANSIBLE_CONFIG_DIR}/${f} && chmod a-rwx,u+rw $_ -done diff --git a/.helpers/bash/generate-bash-config b/.helpers/bash/generate-bash-config deleted file mode 100755 index ad97fc8..0000000 --- a/.helpers/bash/generate-bash-config +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -GIT_ROOT_DIR="$( cd "$( dirname $0 )/../.." && pwd )" -BASH_DOTFILES_DIR="${GIT_ROOT_DIR}/config/bash" -BASHRC_DIRNAME="bashrc.d" -BASHRC_CONFIG_DIR=${XDG_CONFIG_HOME}/bash/${BASHRC_DIRNAME} -BASH_DATA_DIR=${XDG_DATA_HOME}/bash - -source ${GIT_ROOT_DIR}/helpers/lib/install-config - -for d in ${BASHRC_CONFIG_DIR} ${BASH_DATA_DIR}; do - if ! [ -d ${d} ]; then - mkdir -p ${d} - fi -done - -for f in $(find ${BASH_DOTFILES_DIR}/${BASHRC_DIRNAME} -mindepth 1 -maxdepth 1 -type f -exec basename {} \;); do - configFilename=${f} - - if [ -f ${BASHRC_CONFIG_DIR}/${f}.disabled ]; then - configFilename=${f}.disabled - fi - - install_config ${BASH_DOTFILES_DIR}/${BASHRC_DIRNAME}/${f} ${BASHRC_CONFIG_DIR}/${configFilename} -done - -for f in "bashrc" "bash_profile"; do - install_config ${BASH_DOTFILES_DIR}/${f} ${HOME}/.${f} -done diff --git a/.helpers/dunst/generate-dunst-config b/.helpers/dunst/generate-dunst-config deleted file mode 100755 index b8399b1..0000000 --- a/.helpers/dunst/generate-dunst-config +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -GIT_ROOT_DIR="$( cd "$( dirname $0 )/../.." && pwd )" -DUNST_DOTFILES_SOURCE_DIR="${GIT_ROOT_DIR}/config/dunst" -DUNST_DOTFILES_DESTINATION_DIR="${XDG_CONFIG_HOME}/dunst" - -if ! [ -d ${DUNST_DOTFILES_DESTINATION_DIR} ]; then - echo "INFO: Creating directory ${DUNST_DOTFILES_DESTINATION_DIR}" - mkdir ${DUNST_DOTFILES_DESTINATION_DIR} -fi - -rsync -avh ${DUNST_DOTFILES_SOURCE_DIR}/dunstrc ${DUNST_DOTFILES_DESTINATION_DIR}/dunstrc && chmod a-rwx,u+rw $_ diff --git a/.helpers/git/generate-git-config b/.helpers/git/generate-git-config deleted file mode 100755 index e9be8d5..0000000 --- a/.helpers/git/generate-git-config +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -GIT_ROOT_DIR="$( cd "$( dirname $0 )/../.." && pwd )" -GIT_DOTFILES_DIR="${GIT_ROOT_DIR}/config/git" -PARAMETER_FILE="${GIT_DOTFILES_DIR}/config/gitconfig-parameters" - -GITCONFIG_FILE="${GIT_DOTFILES_DIR}/gitconfig" -GITIGNORE_FILE="${GIT_DOTFILES_DIR}/gitignore" -GITMESSAGE_FILE="${GIT_DOTFILES_DIR}/gitmessage" - -GIT_OUTPUT_ROOT_DIR="${XDG_CONFIG_HOME}/git" -GITCONFIG_OUTPUT="${GIT_OUTPUT_ROOT_DIR}/config" -GITIGNORE_OUTPUT="${GIT_OUTPUT_ROOT_DIR}/ignore" -GITMESSAGE_OUTPUT="${GIT_OUTPUT_ROOT_DIR}/message" - -validate_params() { - if [ -z ${GIT_USER_NAME+x} ]; then - echo "ERROR: 'GIT_USER_NAME' is not set or is empty in ${PARAMETER_FILE}" - return 1 - fi - - if [ -z ${GIT_USER_EMAIL+x} ]; then - echo "ERROR: 'GIT_USER_EMAIL' is not set or is empty in ${PARAMETER_FILE}" - return 1 - fi - - if [ -z ${GIT_USER_SIGNINGKEY+x} ]; then - echo "ERROR: 'GIT_USER_SIGNINGKEY' is not set or is empty in ${PARAMETER_FILE}" - return 1 - fi - - return 0 -} - -echo "INFO: Attempting to source parameters from ${PARAMETER_FILE}." -test -f ${PARAMETER_FILE} && source ${PARAMETER_FILE} - -echo "INFO: Validating parameters." -validate_params || exit 1 - -if ! [ -d ${GIT_OUTPUT_ROOT_DIR} ]; then - echo "INFO: Creating directory ${GIT_OUTPUT_ROOT_DIR}" - mkdir ${GIT_OUTPUT_ROOT_DIR} -fi - -echo "INFO: Generating the gitconfig file and installing it to ${GITCONFIG_OUTPUT}." - -gitmessage_output=${GITMESSAGE_OUTPUT} \ -gitignore_output=${GITIGNORE_OUTPUT} \ -git_user_name=${GIT_USER_NAME} \ -git_user_email=${GIT_USER_EMAIL} \ -git_user_signingkey=${GIT_USER_SIGNINGKEY} \ -envsubst < ${GITCONFIG_FILE} > ${GITCONFIG_OUTPUT} - -chmod a-rwx,u+rw ${GITCONFIG_OUTPUT} - -echo "INFO: Installing ${GITIGNORE_OUTPUT}." -rsync -avh ${GITIGNORE_FILE} ${GITIGNORE_OUTPUT} && chmod a-rwx,u+rw $_ - -echo "INFO: Installing ${GITMESSAGE_OUTPUT}." -rsync -avh ${GITMESSAGE_FILE} ${GITMESSAGE_OUTPUT} && chmod a-rwx,u+rw $_ diff --git a/.helpers/lf/generate-lf-config b/.helpers/lf/generate-lf-config deleted file mode 100755 index 12f10d9..0000000 --- a/.helpers/lf/generate-lf-config +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -GIT_ROOT_DIR="$( cd "$( dirname $0 )/../.." && pwd )" -LF_DOTFILES_SOURCE_DIR="${GIT_ROOT_DIR}/config/lf" -LF_DOTFILES_DESTINATION_DIR="${XDG_CONFIG_HOME}/lf" - -if ! [ -d ${LF_DOTFILES_DESTINATION_DIR} ]; then - echo "INFO: Creating directory ${LF_DOTFILES_DESTINATION_DIR}" - mkdir ${LF_DOTFILES_DESTINATION_DIR} -fi - -rsync -avh ${LF_DOTFILES_SOURCE_DIR}/lfrc ${LF_DOTFILES_DESTINATION_DIR}/lfrc && chmod a-rwx,u+rw $_ diff --git a/.helpers/lib/install-config b/.helpers/lib/install-config deleted file mode 100755 index 2350614..0000000 --- a/.helpers/lib/install-config +++ /dev/null @@ -1,8 +0,0 @@ -# vi: set ft=bash : - -install_config() { - [ -f ${2} ] && rm -rf ${2} - echo "INFO: Installing ${1} to ${2}" - cp ${1} ${2} - chmod -R a-rwx,u+rw ${2} -} diff --git a/.helpers/logrotate/generate-logrotate-config b/.helpers/logrotate/generate-logrotate-config deleted file mode 100755 index bb4250f..0000000 --- a/.helpers/logrotate/generate-logrotate-config +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -GIT_ROOT_DIR="$( cd "$( dirname $0 )/../.." && pwd )" -LF_DOTFILES_SOURCE_DIR="${GIT_ROOT_DIR}/config/logrotate" -LF_DOTFILES_DESTINATION_DIR="${XDG_CONFIG_HOME}/logrotate" - -if ! [ -d ${LF_DOTFILES_DESTINATION_DIR} ]; then - echo "INFO: Creating directory ${LF_DOTFILES_DESTINATION_DIR}" - mkdir ${LF_DOTFILES_DESTINATION_DIR} -fi - -envsubst < ${LF_DOTFILES_SOURCE_DIR}/logrotate.conf > ${LF_DOTFILES_DESTINATION_DIR}/logrotate.conf -chmod a-rwx,u+rw ${LF_DOTFILES_DESTINATION_DIR}/logrotate.conf diff --git a/.helpers/scripts/install-scripts b/.helpers/scripts/install-scripts deleted file mode 100755 index cdcedb5..0000000 --- a/.helpers/scripts/install-scripts +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -GIT_ROOT_DIR="$( cd "$( dirname $0 )/../.." && pwd )" -SCRIPTS_SOURCE_DIR="${GIT_ROOT_DIR}/scripts" -SCRIPTS_DESTINATION_DIR="${HOME}/.local/scripts" - -if ! [ -d ${SCRIPTS_DESTINATION_DIR} ]; then - echo "INFO: Creating directory ${SCRIPTS_DESTINATION_DIR}" - mkdir ${SCRIPTS_DESTINATION_DIR} -fi - -rsync -avh ${SCRIPTS_SOURCE_DIR}/ ${SCRIPTS_DESTINATION_DIR} -chmod -R 0700 ${SCRIPTS_DESTINATION_DIR} diff --git a/.helpers/tmux/generate-tmux-config b/.helpers/tmux/generate-tmux-config deleted file mode 100755 index 4243d11..0000000 --- a/.helpers/tmux/generate-tmux-config +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -GIT_ROOT_DIR="$( cd "$( dirname $0 )/../.." && pwd )" -TMUX_DOTFILES_SOURCE_DIR="${GIT_ROOT_DIR}/config/tmux" -TMUX_DOTFILES_DESTINATION_DIR="${XDG_CONFIG_HOME}/tmux" - -if ! [ -d ${TMUX_DOTFILES_DESTINATION_DIR} ]; then - echo "INFO: Creating directory ${TMUX_DOTFILES_DESTINATION_DIR}" - mkdir ${TMUX_DOTFILES_DESTINATION_DIR} -fi - -rsync -avh ${TMUX_DOTFILES_SOURCE_DIR}/tmux.conf ${TMUX_DOTFILES_DESTINATION_DIR}/tmux.conf && chmod a-rwx,u+rw $_ diff --git a/.helpers/vim/generate-vim-config b/.helpers/vim/generate-vim-config deleted file mode 100755 index b804185..0000000 --- a/.helpers/vim/generate-vim-config +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -GIT_ROOT_DIR="$( cd "$( dirname $0 )/../.." && pwd )" -VIM_CONFIG_SOURCE_DIR="${GIT_ROOT_DIR}/config/vim" -VIM_CONFIG_DESTINATION_DIR="${XDG_CONFIG_HOME}/vim" - -MINPAC_SOURCE="https://github.com/k-takata/minpac.git" -MINPAC_DESTINATION="${XDG_DATA_HOME}/vim/pack/bundle/opt/minpac" - -GOTAGS_SOURCE="github.com/jstemmer/gotags" - -# Creating essential vim directories -mkdir -p ${VIM_CONFIG_DESTINATION_DIR} -mkdir -p ${XDG_CACHE_HOME}/vim/{backup,swap,undo,view} && chmod 0700 ${XDG_CACHE_HOME}/vim/{backup,swap,undo,view} -mkdir -p ${XDG_DATA_HOME}/vim/spell && chmod 0700 ${XDG_DATA_HOME}/vim/spell - -# Syncing the vim configuration files -echo "INFO: syncing ${VIM_CONFIG_SOURCE_DIR} to ${VIM_CONFIG_DESTINATION_DIR}" -rsync -avh --exclude=*.gitkeep ${VIM_CONFIG_SOURCE_DIR}/ ${VIM_CONFIG_DESTINATION_DIR} -chmod a-rwx,u+rwx ${VIM_CONFIG_DESTINATION_DIR} -find ${VIM_CONFIG_DESTINATION_DIR} -type d -not -wholename */pack/bundle/opt/* -not -wholename */pack/bundle/start/* \ - | xargs chmod a-rwx,u+rwx - -# Ensuring minpac and gotags are installed -if ! [ -d ${MINPAC_DESTINATION}/.git ]; then - echo "INFO: Cloning ${MINPAC_SOURCE} to ${MINPAC_DESTINATION}" - git clone --depth=1 ${MINPAC_SOURCE} ${MINPAC_DESTINATION} -fi - -if [ -x "$( command -v go )" ]; then - if ! [ -x "$( command -v gotags )" ]; then - echo "INFO: Installing gotags" - go get -u ${GOTAGS_SOURCE} - fi -fi diff --git a/.helpers/xdg/check-xdg-settings b/.helpers/xdg/check-xdg-settings deleted file mode 100755 index 2bec192..0000000 --- a/.helpers/xdg/check-xdg-settings +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -if [ -z ${XDG_CONFIG_HOME+x} ]; then - echo "ERROR: 'XDG_CONFIG_HOME' is not set." - exit 1 -fi - -if [ -z ${XDG_DATA_HOME+x} ]; then - echo "ERROR: 'XDG_DATA_HOME' is not set." - exit 1 -fi - -if [ -z ${XDG_CACHE_HOME+x} ]; then - echo "ERROR: 'XDG_CACHE_HOME' is not set." - exit 1 -fi - -if [ -z ${XDG_STATE_HOME+x} ]; then - echo "ERROR: 'XDG_STATE_HOME' is not set." - exit 1 -fi diff --git a/.helpers/xdg/generate-user-dirs-config b/.helpers/xdg/generate-user-dirs-config deleted file mode 100755 index 2524d12..0000000 --- a/.helpers/xdg/generate-user-dirs-config +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -GIT_ROOT_DIR="$( cd "$( dirname $0 )/../.." && pwd )" -XDG_DOTFILES_DIR="${GIT_ROOT_DIR}/config/xdg" - -for f in $( find ${XDG_DOTFILES_DIR} -type f -exec basename {} \; ); do - echo "INFO: Installing ${f}" - rsync -avh ${XDG_DOTFILES_DIR}/${f} ${XDG_CONFIG_HOME}/${f} && chmod a-rwx,u+rw $_ -done diff --git a/Makefile b/Makefile deleted file mode 100644 index c1b5c44..0000000 --- a/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -check_xdg_settings: - @./.helpers/xdg/check-xdg-settings - -.PHONY: scripts -scripts: - @./.helpers/scripts/install-scripts - -.PHONY: ansible_configs -ansible_configs: check_xdg_settings - @./.helpers/ansible/generate-ansible-config - -.PHONY: bash_configs -bash_configs: - @./.helpers/bash/generate-bash-config - -.PHONY: git_configs -git_configs: check_xdg_settings - @./.helpers/git/generate-git-config - -.PHONY: tmux_configs -tmux_configs: check_xdg_settings - @./.helpers/tmux/generate-tmux-config - -.PHONY: xdg_configs -xdg_configs: check_xdg_settings - @./.helpers/xdg/generate-user-dirs-config - -.PHONY: x11_configs -x11_configs: check_xdg_settings - @./.helpers/X11/generate-x11-config - -.PHONY: lf_configs -lf_configs: check_xdg_settings - @./.helpers/lf/generate-lf-config - -.PHONY: amfora_configs -amfora_configs: check_xdg_settings - @./.helpers/amfora/generate-amfora-config - -.PHONY: dunst_configs -dunst_configs: check_xdg_settings - @./.helpers/dunst/generate-dunst-config - -.PHONY: logrotate_configs -logrotate_configs: check_xdg_settings - @./.helpers/logrotate/generate-logrotate-config