From a721f2b1ecb76b02ae54778e161bf5b7f2533759 Mon Sep 17 00:00:00 2001
From: spinach <19keegandeppe@gmail.com>
Date: Tue, 4 Apr 2023 18:37:42 -0400
Subject: [PATCH] fixed oh-my-zsh with proper custom directory and modified
 install script to allow for profile linking to clean up the arch base:

---
 editors/nvim/config/spell/en.utf-8.add        |   2 ++
 editors/nvim/config/spell/en.utf-8.add.spl    | Bin 132 -> 196 bytes
 install-profile                               |  30 +++++++++++++++---
 meta/base.yaml                                |  11 -------
 meta/configs/clean.yaml                       |   8 +++++
 meta/configs/i3.desktop.yaml                  |   4 ---
 meta/configs/oh-my-zsh.yaml                   |   7 +---
 meta/profiles/apple                           |   1 +
 meta/profiles/arch                            |  15 +++++++++
 meta/profiles/desktop                         |   9 ++++++
 .../legacy.arch.desktop}                      |   1 +
 .../legacy.arch.thinkpad}                     |   1 +
 .../{arch.work => legacy/legacy.arch.work}    |   1 +
 meta/profiles/thinkpad                        |   6 ++++
 meta/profiles/work                            |   4 +++
 meta/profiles/wsl                             |   1 +
 shells/zsh/zshrc                              |  12 ++-----
 17 files changed, 78 insertions(+), 35 deletions(-)
 create mode 100644 meta/configs/clean.yaml
 create mode 100644 meta/profiles/arch
 create mode 100644 meta/profiles/desktop
 rename meta/profiles/{arch.desktop => legacy/legacy.arch.desktop} (96%)
 rename meta/profiles/{arch.thinkpad => legacy/legacy.arch.thinkpad} (96%)
 rename meta/profiles/{arch.work => legacy/legacy.arch.work} (95%)
 create mode 100644 meta/profiles/thinkpad
 create mode 100644 meta/profiles/work

diff --git a/editors/nvim/config/spell/en.utf-8.add b/editors/nvim/config/spell/en.utf-8.add
index 3ca18f4..30a024f 100644
--- a/editors/nvim/config/spell/en.utf-8.add
+++ b/editors/nvim/config/spell/en.utf-8.add
@@ -8,3 +8,5 @@ S983
 Airpods
 swiffer
 postlab
+TypeScript
+ADTs
diff --git a/editors/nvim/config/spell/en.utf-8.add.spl b/editors/nvim/config/spell/en.utf-8.add.spl
index b8c134e2101a13c75748af4033fe20a882081463..9181211b9540d17d8b6558da76615536ffd08839 100644
GIT binary patch
literal 196
zcmYk0u?oUK42JVZLEL-*1)rf^bgZ~II9c3Jd&1$-hPwlC^UXD>4iZTI<o`%=J{+_7
z7^^oCg_-mBD7j3!ASlS-7ZL;mI%`-Zh?Yfb0#D%(@kBokdp4`GRP&IPFX}p6K<2MK
rZy(r<XpMlIhPQ5)bcLwSxa!vMy|F0z&x)HCd$elN4?6urbAyOJ^RglU

literal 132
zcmXAiK?;LF3`O&T^aL(Ehi+<b;6mJWKgB7CgAOx-^z?1U=0lR7_aV<=%+ZI?enn)u
zIlqROb%`V*J2M$oTM?-bn+dIO1U_unanpj@(mLI<<qxBd7gBiRwLiIE(T;_;$rtxX
H_V8an`@I#?

diff --git a/install-profile b/install-profile
index 1cb823f..21107c7 100755
--- a/install-profile
+++ b/install-profile
@@ -14,18 +14,40 @@ DOTBOT_BIN="bin/dotbot"
 
 BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
+declare -a CONFIGS
+
+parse_configs() {
+    # parses configs in file $1 and returns array of config names
+
+    while IFS= read -r config; do
+
+        if [[ -z "$config" || "$config" =~ ^# ]] ; then
+            # skip comments and empty lines
+            continue
+        elif [[ "$config" =~ ^profile/ ]] ; then
+            # allows for profile inclusion
+            profile=$(echo "$config" | sed 's/^profile\///')
+            parse_configs "$profile"
+        else
+            CONFIGS+=("$config")
+        fi
+    done < "${META_DIR}/${PROFILES_DIR}/$1"
+}
+
 
 cd "${BASE_DIR}"
 git -C "${BASE_DIR}" submodule sync --quiet --recursive
 git submodule update --init --recursive "${BASE_DIR}"
 
-while IFS= read -r config; do
-    CONFIGS+=" ${config}"
-done < "${META_DIR}/${PROFILES_DIR}/$1"
+# parse initial profile
+parse_configs "$1"
+
+# cleanup at the end
+CONFIGS+=("clean")
 
 shift
 
-for config in ${CONFIGS} ${@}; do
+for config in "${CONFIGS[@]}"; do
     echo -e "\nConfigure $config"
     # create temporary file
     configFile="$(mktemp)"
diff --git a/meta/base.yaml b/meta/base.yaml
index b23c281..cd3036f 100644
--- a/meta/base.yaml
+++ b/meta/base.yaml
@@ -2,14 +2,3 @@
     link:
       create: true
       relink: true
-    shell:
-      stdin: true
-      stdout: true
-      stderr: true
-
-- clean: 
-    ~/:
-    ~/.config:
-    ~/.config/systemd/user:
-    ~/.local/bin:
-    ~/.local/share:
diff --git a/meta/configs/clean.yaml b/meta/configs/clean.yaml
new file mode 100644
index 0000000..6de6c44
--- /dev/null
+++ b/meta/configs/clean.yaml
@@ -0,0 +1,8 @@
+- clean:
+    ~/:
+    ~/.config:
+      recursive: true
+    ~/.local/share:
+      recursive: true
+    ~/.local/bin:
+
diff --git a/meta/configs/i3.desktop.yaml b/meta/configs/i3.desktop.yaml
index 73aa8fc..ee7ec33 100644
--- a/meta/configs/i3.desktop.yaml
+++ b/meta/configs/i3.desktop.yaml
@@ -1,10 +1,6 @@
 - shell:
   - [cd src/i3lock-blur && make install, Building i3lock]
 
-- clean:
-    ~/.config/i3:
-    ~/.local/share/wallpapers:
-
 - link:
     ~/.config/i3/config: gui/i3/desktop.conf
     ~/.local/bin/wallpaper.sh: bin/wallpaper.sh
diff --git a/meta/configs/oh-my-zsh.yaml b/meta/configs/oh-my-zsh.yaml
index 5a4b176..d9965ca 100644
--- a/meta/configs/oh-my-zsh.yaml
+++ b/meta/configs/oh-my-zsh.yaml
@@ -2,9 +2,4 @@
   - [bin/oh-my-zsh-check.sh]
 
 - link:
-    ~/.oh-my-zsh/custom/plugins/:
-      path: shells/oh-my-zsh/custom/plugins/**
-      glob: true
-    ~/.oh-my-zsh/custom/themes/:
-      path: shells/oh-my-zsh/custom/themes/**
-      glob: true
+    ~/.local/share/oh-my-zsh: shells/oh-my-zsh
diff --git a/meta/profiles/apple b/meta/profiles/apple
index e2030e0..617d327 100644
--- a/meta/profiles/apple
+++ b/meta/profiles/apple
@@ -5,3 +5,4 @@ oh-my-zsh
 fzf
 scripts
 calcurse
+clean
diff --git a/meta/profiles/arch b/meta/profiles/arch
new file mode 100644
index 0000000..cb3bd80
--- /dev/null
+++ b/meta/profiles/arch
@@ -0,0 +1,15 @@
+arch.base
+arch.i3
+arch.picom
+arch.polybar
+nvim
+zsh
+oh-my-zsh
+fzf
+tmux.sparse
+tmuxp
+polybar
+picom
+rofi
+lf
+scripts
diff --git a/meta/profiles/desktop b/meta/profiles/desktop
new file mode 100644
index 0000000..4b061cd
--- /dev/null
+++ b/meta/profiles/desktop
@@ -0,0 +1,9 @@
+# include base arch profile
+profile/arch
+
+# desktop specific
+st.desktop
+i3.desktop
+calcurse
+seafile
+passwords
diff --git a/meta/profiles/arch.desktop b/meta/profiles/legacy/legacy.arch.desktop
similarity index 96%
rename from meta/profiles/arch.desktop
rename to meta/profiles/legacy/legacy.arch.desktop
index c754370..706944c 100644
--- a/meta/profiles/arch.desktop
+++ b/meta/profiles/legacy/legacy.arch.desktop
@@ -18,3 +18,4 @@ scripts
 calcurse
 seafile
 passwords
+clean
diff --git a/meta/profiles/arch.thinkpad b/meta/profiles/legacy/legacy.arch.thinkpad
similarity index 96%
rename from meta/profiles/arch.thinkpad
rename to meta/profiles/legacy/legacy.arch.thinkpad
index 70705d3..c35adfa 100644
--- a/meta/profiles/arch.thinkpad
+++ b/meta/profiles/legacy/legacy.arch.thinkpad
@@ -16,3 +16,4 @@ scripts
 calcurse
 seafile
 passwords
+clean
diff --git a/meta/profiles/arch.work b/meta/profiles/legacy/legacy.arch.work
similarity index 95%
rename from meta/profiles/arch.work
rename to meta/profiles/legacy/legacy.arch.work
index 6a7cb73..feab46f 100644
--- a/meta/profiles/arch.work
+++ b/meta/profiles/legacy/legacy.arch.work
@@ -15,3 +15,4 @@ rofi
 lf
 scripts
 timetracker
+clean
diff --git a/meta/profiles/thinkpad b/meta/profiles/thinkpad
new file mode 100644
index 0000000..9c96800
--- /dev/null
+++ b/meta/profiles/thinkpad
@@ -0,0 +1,6 @@
+profile/arch
+st.thinkpad
+i3.thinkpad
+calcurse
+seafile
+passwords
diff --git a/meta/profiles/work b/meta/profiles/work
new file mode 100644
index 0000000..632149d
--- /dev/null
+++ b/meta/profiles/work
@@ -0,0 +1,4 @@
+profile/arch
+st.work
+i3.work
+timetracker
diff --git a/meta/profiles/wsl b/meta/profiles/wsl
index 71acf74..e0bf67d 100644
--- a/meta/profiles/wsl
+++ b/meta/profiles/wsl
@@ -5,3 +5,4 @@ oh-my-zsh
 fzf
 scripts
 calcurse
+clean
diff --git a/shells/zsh/zshrc b/shells/zsh/zshrc
index bac36ea..0c488a1 100644
--- a/shells/zsh/zshrc
+++ b/shells/zsh/zshrc
@@ -86,7 +86,7 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
 # HIST_STAMPS="mm/dd/yyyy"
 
 # Would you like to use another custom folder than $ZSH/custom?
-# ZSH_CUSTOM=/path/to/new-custom-folder
+ZSH_CUSTOM=$HOME/.local/share/oh-my-zsh/custom
 
 # Which plugins would you like to load?
 # Standard plugins can be found in $ZSH/plugins/
@@ -117,16 +117,8 @@ source $ZSH/oh-my-zsh.sh
 # Compilation flags
 # export ARCHFLAGS="-arch x86_64"
 
-# Set personal aliases, overriding those provided by oh-my-zsh libs,
-# plugins, and themes. Aliases can be placed here, though oh-my-zsh
-# users are encouraged to define aliases within the ZSH_CUSTOM folder.
-# For a full list of active aliases, run `alias`.
-#
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
 # 
-# switching to vimrc
+# switching to neovim
 alias vim="nvim"
 # helpful aliasis
 alias ifconfig="/sbin/ifconfig"