From 5cd720cc4d1254752959300635cc098bff4fa05e Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo@ivuorinen.net>
Date: Fri, 17 Mar 2023 10:54:58 +0200
Subject: [PATCH] Moved $HOME root dotfiles to base folder

---
 README.md                         | 24 +++++++-----------------
 bashrc => base/bashrc             |  0
 ecrc => base/ecrc                 |  0
 git_profiles => base/git_profiles |  0
 huskyrc => base/huskyrc           |  0
 plan => base/plan                 |  0
 shellcheckrc => base/shellcheckrc |  0
 vuerc => base/vuerc               |  0
 zshrc => base/zshrc               |  0
 install                           |  1 +
 install.conf.yaml                 | 16 ++++++----------
 11 files changed, 14 insertions(+), 27 deletions(-)
 rename bashrc => base/bashrc (100%)
 rename ecrc => base/ecrc (100%)
 rename git_profiles => base/git_profiles (100%)
 rename huskyrc => base/huskyrc (100%)
 rename plan => base/plan (100%)
 rename shellcheckrc => base/shellcheckrc (100%)
 rename vuerc => base/vuerc (100%)
 rename zshrc => base/zshrc (100%)

diff --git a/README.md b/README.md
index 6831833..a3976ee 100644
--- a/README.md
+++ b/README.md
@@ -13,14 +13,10 @@ fork or download the repo as a zip and go from there with your own configs.
 ### First time setup
 
 1. Clone this repository to `$HOME/.dotfiles`
-2. `bash $HOME/.dotfiles/scripts/settler.sh`
+2. `./install`
 3. ???
 4. Profit
 
-Note: there's a bit chicken/egg situation,
-because settler assumes you don't have git,
-and you need git to clone the repo. This will change soon&trade;.
-
 ## Interesting files and locations
 
 ### Interesting folders
@@ -36,6 +32,7 @@ and you need git to clone the repo. This will change soon&trade;.
 
 | Repo      | Destination | Description                                 |
 | --------- | ----------- | ------------------------------------------- |
+| `base/`   | `.*`        | `$HOME` level files.                        |
 | `config/` | `.config/`  | Configurations for applications.            |
 | `local/`  | `.local/`   | XDG Base folder: `bin`, `share` and `state` |
 | `ssh/`    | `.ssh/`     | SSH Configurations.                         |
@@ -44,13 +41,6 @@ and you need git to clone the repo. This will change soon&trade;.
 
 `.local/bin/dfm` is a shell script that has some tools that help with dotfiles management.
 
-### `scripts/install-dotfiles.sh` - dotfiles linker
-
-The `scripts/install-dotfiles.sh` is a `rcm` generated shell script
-that does all the necessary linking.
-
-To refresh the file, you can run `dfm dotfiles update`
-
 ## Configuration
 
 The folder structure follows [XDG Base Directory Specification][xdg] where possible.
@@ -95,9 +85,9 @@ The folder structure follows [XDG Base Directory Specification][xdg] where possi
 
 ### Interesting dotfiles repos
 
-- [https://dotfiles.github.io/inspiration/](dotfiles.github.io/inspiration)
-- [https://github.com/frdmn/dotfiles](github.com/frdmn/dotfiles) - Ansible-based
+- [dotfiles.github.io/inspiration/](https://dotfiles.github.io/inspiration)
+- [frdmn/dotfiles](https://github.com/github.com/frdmn/dotfiles) - Ansible-based
   dotfile setup for macOS
-- [https://github.com/mvdan/dotfiles](mvdan/dotfiles) - Here be dragons
-- [https://github.com/vsouza/dotfiles](vsouza/dotfiles) - 🏡 My dotfiles
-- [https://github.com/freekmurze/dotfiles](freekmurze/dotfiles) - My personal dotfiles
+- [mvdan/dotfiles](https://github.com/mvdan/dotfiles) - Here be dragons
+- [vsouza/dotfiles](https://github.com/vsouza/dotfiles) - 🏡 My dotfiles
+- [freekmurze/dotfiles](https://github.com/freekmurze/dotfiles) - My personal dotfiles
diff --git a/bashrc b/base/bashrc
similarity index 100%
rename from bashrc
rename to base/bashrc
diff --git a/ecrc b/base/ecrc
similarity index 100%
rename from ecrc
rename to base/ecrc
diff --git a/git_profiles b/base/git_profiles
similarity index 100%
rename from git_profiles
rename to base/git_profiles
diff --git a/huskyrc b/base/huskyrc
similarity index 100%
rename from huskyrc
rename to base/huskyrc
diff --git a/plan b/base/plan
similarity index 100%
rename from plan
rename to base/plan
diff --git a/shellcheckrc b/base/shellcheckrc
similarity index 100%
rename from shellcheckrc
rename to base/shellcheckrc
diff --git a/vuerc b/base/vuerc
similarity index 100%
rename from vuerc
rename to base/vuerc
diff --git a/zshrc b/base/zshrc
similarity index 100%
rename from zshrc
rename to base/zshrc
diff --git a/install b/install
index 7eeedb1..f81e89f 100755
--- a/install
+++ b/install
@@ -18,5 +18,6 @@ git submodule update --init --recursive
   --plugin-dir=dotbot-plugins/dotbot-gh-extension \
   --plugin-dir=dotbot-plugins/dotbot-golang \
   --plugin-dir=dotbot-plugins/dotbot-if \
+  -p dotbot-plugins/dotbot-if/if.py \
   -c "${CONFIG}" \
   "${@}"
diff --git a/install.conf.yaml b/install.conf.yaml
index e76a6ce..045fbe1 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -4,6 +4,7 @@
       stderr: true
       stdout: true
     brewfile:
+      stderr: true
       stdout: true
     link:
       create: true
@@ -26,13 +27,6 @@
     ~/Code:
 
 - link:
-    ~/.bashrc:
-    ~/.ecrc:
-    ~/.git_profiles:
-    ~/.huskyrc:
-    ~/.plan:
-    ~/.shellcheckrc:
-    ~/.vuerc:
     ~/.config/:
       glob: true
       path: config/**
@@ -44,11 +38,13 @@
       glob: true
       mode: 600
       path: ssh/**
-    ~/.zshrc:
+    ~/:
       force: true
-      path: zshrc
+      glob: true
+      path: base/**
+      prefix: '.'
 
-- shell: [git submodule update --init --recursive, Installing submodules]
+- shell: [git submodule update --init --recursive --force, Installing submodules]
 
 - if:
   - cond: "[ $(uname) = Darwin ]"