From f22ea044f6c5055e4cc2e0940f1a3b282f9607a2 Mon Sep 17 00:00:00 2001
From: Georgi Gardev <georgi@gardev.com>
Date: Thu, 23 Jan 2025 09:41:25 +0200
Subject: [PATCH] Update dotfiles

---
 README.md                              | 16 ----------------
 install.conf.yaml => default.conf.yaml |  3 +++
 install                                |  6 +++++-
 macos/Caskfile.personal                |  1 -
 personal.conf.yaml                     | 10 ++++++++++
 setup.conf.yaml                        | 14 ++++++++++++++
 6 files changed, 32 insertions(+), 18 deletions(-)
 rename install.conf.yaml => default.conf.yaml (97%)
 create mode 100644 personal.conf.yaml
 create mode 100644 setup.conf.yaml

diff --git a/README.md b/README.md
index db06100..83037f1 100644
--- a/README.md
+++ b/README.md
@@ -2,19 +2,3 @@ dotfiles
 ========
 
 Some of my dotfiles
-
-### Home folder structure
-```
-.aliases
-.aliases.local
-.bash_profile
-.bash_profile.local
-.bashrc
-.gitconfig
-.gitconfig.local
-.vim/
-.vimrc
-.zsh/
-  .zshrc
-  .zshrc.local
-  .zprompt
diff --git a/install.conf.yaml b/default.conf.yaml
similarity index 97%
rename from install.conf.yaml
rename to default.conf.yaml
index 948b9f7..b06267c 100644
--- a/install.conf.yaml
+++ b/default.conf.yaml
@@ -1,3 +1,6 @@
+## TODO:
+## cask_personal using some variable?
+
 - defaults:
     link:
       relink: true
diff --git a/install b/install
index 5a7e72c..e515d6a 100755
--- a/install
+++ b/install
@@ -2,7 +2,8 @@
 
 set -e
 
-CONFIG="install.conf.yaml"
+DEFAULT_CONFIG_PREFIX="default"
+CONFIG_SUFFIX=".conf.yaml"
 DOTBOT_DIR="dotbot"
 
 DOTBOT_BIN="bin/dotbot"
@@ -12,4 +13,7 @@ cd "${BASEDIR}"
 git -C "${DOTBOT_DIR}" submodule sync --quiet --recursive
 git submodule update --init --recursive "${DOTBOT_DIR}"
 
+for conf in ${DEFAULT_CONFIG_PREFIX} ${@}; do
+    "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${conf}${CONFIG_SUFFIX}"
+done
 "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}"
diff --git a/macos/Caskfile.personal b/macos/Caskfile.personal
index 3530c5b..76314ea 100644
--- a/macos/Caskfile.personal
+++ b/macos/Caskfile.personal
@@ -2,7 +2,6 @@
 
 cask_args appdir: '/Applications'
 
-cask 'authy'
 cask 'battle-net'
 cask 'bitwarden'
 cask 'discord'
diff --git a/personal.conf.yaml b/personal.conf.yaml
new file mode 100644
index 0000000..12bdae4
--- /dev/null
+++ b/personal.conf.yaml
@@ -0,0 +1,10 @@
+## TODO:
+## cask_personal using some variable?
+
+- shell:
+  - stdin: true
+    stdout: true
+    command: >
+      if [ "$(uname)" = "Darwin" ]; then
+        brew bundle --file ./macos/Caskfile.personal
+      fi
diff --git a/setup.conf.yaml b/setup.conf.yaml
new file mode 100644
index 0000000..d50125a
--- /dev/null
+++ b/setup.conf.yaml
@@ -0,0 +1,14 @@
+- shell:
+  -
+    stdin: true
+    stdout: true
+    description: Setting Mac OS defaults
+    command: >
+      if [ "$(uname)" = "Darwin" ]; then
+        ./macos/macos_setup.sh
+      fi
+  -
+    command: ./clone.sh
+    description: Cloning Git repos
+    stdout: true
+    quiet: false