From b34f5e6f3ad7f9db6880f44913b1cfbf91797e39 Mon Sep 17 00:00:00 2001
From: sinarf <sinarf@sinarf.org>
Date: Fri, 4 Aug 2023 17:19:10 +0200
Subject: [PATCH] [workaround] use --dotfiles with directory

Thanks to https://github.com/aspiers/stow/issues/33#issuecomment-524577789
---
 {all/dot-config => all-config}/espanso/default.yml              | 0
 {all/dot-config => all-config}/groovylintrc.json                | 0
 {all/dot-config => all-config}/pycodestyle                      | 0
 {all/dot-config => all-config}/shell/alias                      | 0
 {all/dot-config => all-config}/shell/completion.zsh             | 0
 {all/dot-config => all-config}/shell/lib/async.zsh              | 0
 {all/dot-config => all-config}/shell/theme.zsh                  | 0
 .../dot-config => all-config}/shell/zsh-syntax-highlighting.zsh | 0
 {all/dot-config => all-config}/shell/zshrc.custom               | 0
 {all/dot-config => all-config}/starship.toml                    | 0
 {all/dot-config => all-config}/vifm/colors/Default.vifm         | 0
 {all/dot-config => all-config}/vifm/colors/gruvbox.vifm         | 0
 {all/dot-config => all-config}/vifm/scripts/README              | 0
 {all/dot-config => all-config}/vifm/vifm-help.txt               | 0
 {all/dot-config => all-config}/vifm/vifminfo.json               | 0
 {all/dot-config => all-config}/vifm/vifmrc                      | 0
 bin/update_dotfiles.sh                                          | 2 ++
 .../gtk-2.0/gtk-2.0/gtk-2.0/gtkfilechooser.ini                  | 0
 {linux/dot-config => linux-config}/gtk-2.0/gtkfilechooser.ini   | 0
 {linux/dot-config => linux-config}/gtk-3.0/bookmarks            | 0
 {linux/dot-config => linux-config}/gtk-3.0/settings.ini         | 0
 {linux/dot-config => linux-config}/i3/config                    | 0
 {linux/dot-config => linux-config}/i3/scripts/battery-plus      | 0
 {linux/dot-config => linux-config}/i3/scripts/battery.py        | 0
 {linux/dot-config => linux-config}/i3status/config              | 0
 {linux/dot-config => linux-config}/kitty/dracula.conf           | 0
 {linux/dot-config => linux-config}/kitty/gruvbox_dark.conf      | 0
 {linux/dot-config => linux-config}/kitty/kitty.conf             | 0
 {linux/dot-config => linux-config}/paru/paru.conf               | 0
 {linux/dot-config => linux-config}/polybar/config.ini           | 0
 {linux/dot-config => linux-config}/polybar/launch.sh            | 0
 .../dot-config => linux-config}/polybar/modules/measure_ping.py | 0
 .../dot-config => linux-config}/polybar/modules/now_playing.py  | 0
 .../polybar/scripts/check_updates.sh                            | 0
 {linux/dot-config => linux-config}/rofi/config.rasi             | 0
 {linux/dot-config => linux-config}/rofi/dracula.rasi            | 0
 {linux/dot-config => linux-config}/rofi/dracula1.rasi           | 0
 {linux/dot-config => linux-config}/rofi/dracula2.rasi           | 0
 {linux/dot-config => linux-config}/rofi/gruvbox.rasi            | 0
 {linux/dot-config => linux-config}/rofi/rounded-common.rasi     | 0
 {linux/dot-config => linux-config}/rofi/rounded-nord-dark.rasi  | 0
 {linux/dot-config => linux-config}/syncthingtray.ini            | 0
 {linux/dot-config => linux-config}/taskrc                       | 0
 {linux/dot-config => linux-config}/tealdeer/config.toml         | 0
 .../share/applications/ErrandList.desktop                       | 0
 .../share/applications/dailynotes.desktop                       | 0
 .../share/applications/install_all_softwares.desktop            | 0
 .../share/applications/messages.desktop                         | 0
 .../share/applications/onivim2.desktop                          | 0
 .../share/applications/ovh-mail.desktop                         | 0
 .../share/applications/proton-mail.desktop                      | 0
 .../share/applications/remap_escape.desktop                     | 0
 .../share/applications/rofi-power-menu.desktop                  | 0
 .../share/applications/rofi-search-ddg.desktop                  | 0
 .../share/applications/taskwarrior-tui.desktop                  | 0
 .../dot-local => linux-local}/share/applications/toot.desktop   | 0
 .../dot-local => linux-local}/share/applications/tuir.desktop   | 0
 .../share/applications/update_dotfiles.desktop                  | 0
 {linux/dot-local => linux-local}/share/applications/vit.desktop | 0
 .../share/applications/wip_note.desktop                         | 0
 60 files changed, 2 insertions(+)
 rename {all/dot-config => all-config}/espanso/default.yml (100%)
 rename {all/dot-config => all-config}/groovylintrc.json (100%)
 rename {all/dot-config => all-config}/pycodestyle (100%)
 rename {all/dot-config => all-config}/shell/alias (100%)
 rename {all/dot-config => all-config}/shell/completion.zsh (100%)
 rename {all/dot-config => all-config}/shell/lib/async.zsh (100%)
 rename {all/dot-config => all-config}/shell/theme.zsh (100%)
 rename {all/dot-config => all-config}/shell/zsh-syntax-highlighting.zsh (100%)
 rename {all/dot-config => all-config}/shell/zshrc.custom (100%)
 rename {all/dot-config => all-config}/starship.toml (100%)
 rename {all/dot-config => all-config}/vifm/colors/Default.vifm (100%)
 rename {all/dot-config => all-config}/vifm/colors/gruvbox.vifm (100%)
 rename {all/dot-config => all-config}/vifm/scripts/README (100%)
 rename {all/dot-config => all-config}/vifm/vifm-help.txt (100%)
 rename {all/dot-config => all-config}/vifm/vifminfo.json (100%)
 rename {all/dot-config => all-config}/vifm/vifmrc (100%)
 rename {linux/dot-config => linux-config}/gtk-2.0/gtk-2.0/gtk-2.0/gtkfilechooser.ini (100%)
 rename {linux/dot-config => linux-config}/gtk-2.0/gtkfilechooser.ini (100%)
 rename {linux/dot-config => linux-config}/gtk-3.0/bookmarks (100%)
 rename {linux/dot-config => linux-config}/gtk-3.0/settings.ini (100%)
 rename {linux/dot-config => linux-config}/i3/config (100%)
 rename {linux/dot-config => linux-config}/i3/scripts/battery-plus (100%)
 rename {linux/dot-config => linux-config}/i3/scripts/battery.py (100%)
 rename {linux/dot-config => linux-config}/i3status/config (100%)
 rename {linux/dot-config => linux-config}/kitty/dracula.conf (100%)
 rename {linux/dot-config => linux-config}/kitty/gruvbox_dark.conf (100%)
 rename {linux/dot-config => linux-config}/kitty/kitty.conf (100%)
 rename {linux/dot-config => linux-config}/paru/paru.conf (100%)
 rename {linux/dot-config => linux-config}/polybar/config.ini (100%)
 rename {linux/dot-config => linux-config}/polybar/launch.sh (100%)
 rename {linux/dot-config => linux-config}/polybar/modules/measure_ping.py (100%)
 rename {linux/dot-config => linux-config}/polybar/modules/now_playing.py (100%)
 rename {linux/dot-config => linux-config}/polybar/scripts/check_updates.sh (100%)
 rename {linux/dot-config => linux-config}/rofi/config.rasi (100%)
 rename {linux/dot-config => linux-config}/rofi/dracula.rasi (100%)
 rename {linux/dot-config => linux-config}/rofi/dracula1.rasi (100%)
 rename {linux/dot-config => linux-config}/rofi/dracula2.rasi (100%)
 rename {linux/dot-config => linux-config}/rofi/gruvbox.rasi (100%)
 rename {linux/dot-config => linux-config}/rofi/rounded-common.rasi (100%)
 rename {linux/dot-config => linux-config}/rofi/rounded-nord-dark.rasi (100%)
 rename {linux/dot-config => linux-config}/syncthingtray.ini (100%)
 rename {linux/dot-config => linux-config}/taskrc (100%)
 rename {linux/dot-config => linux-config}/tealdeer/config.toml (100%)
 rename {linux/dot-local => linux-local}/share/applications/ErrandList.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/dailynotes.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/install_all_softwares.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/messages.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/onivim2.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/ovh-mail.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/proton-mail.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/remap_escape.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/rofi-power-menu.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/rofi-search-ddg.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/taskwarrior-tui.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/toot.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/tuir.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/update_dotfiles.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/vit.desktop (100%)
 rename {linux/dot-local => linux-local}/share/applications/wip_note.desktop (100%)

diff --git a/all/dot-config/espanso/default.yml b/all-config/espanso/default.yml
similarity index 100%
rename from all/dot-config/espanso/default.yml
rename to all-config/espanso/default.yml
diff --git a/all/dot-config/groovylintrc.json b/all-config/groovylintrc.json
similarity index 100%
rename from all/dot-config/groovylintrc.json
rename to all-config/groovylintrc.json
diff --git a/all/dot-config/pycodestyle b/all-config/pycodestyle
similarity index 100%
rename from all/dot-config/pycodestyle
rename to all-config/pycodestyle
diff --git a/all/dot-config/shell/alias b/all-config/shell/alias
similarity index 100%
rename from all/dot-config/shell/alias
rename to all-config/shell/alias
diff --git a/all/dot-config/shell/completion.zsh b/all-config/shell/completion.zsh
similarity index 100%
rename from all/dot-config/shell/completion.zsh
rename to all-config/shell/completion.zsh
diff --git a/all/dot-config/shell/lib/async.zsh b/all-config/shell/lib/async.zsh
similarity index 100%
rename from all/dot-config/shell/lib/async.zsh
rename to all-config/shell/lib/async.zsh
diff --git a/all/dot-config/shell/theme.zsh b/all-config/shell/theme.zsh
similarity index 100%
rename from all/dot-config/shell/theme.zsh
rename to all-config/shell/theme.zsh
diff --git a/all/dot-config/shell/zsh-syntax-highlighting.zsh b/all-config/shell/zsh-syntax-highlighting.zsh
similarity index 100%
rename from all/dot-config/shell/zsh-syntax-highlighting.zsh
rename to all-config/shell/zsh-syntax-highlighting.zsh
diff --git a/all/dot-config/shell/zshrc.custom b/all-config/shell/zshrc.custom
similarity index 100%
rename from all/dot-config/shell/zshrc.custom
rename to all-config/shell/zshrc.custom
diff --git a/all/dot-config/starship.toml b/all-config/starship.toml
similarity index 100%
rename from all/dot-config/starship.toml
rename to all-config/starship.toml
diff --git a/all/dot-config/vifm/colors/Default.vifm b/all-config/vifm/colors/Default.vifm
similarity index 100%
rename from all/dot-config/vifm/colors/Default.vifm
rename to all-config/vifm/colors/Default.vifm
diff --git a/all/dot-config/vifm/colors/gruvbox.vifm b/all-config/vifm/colors/gruvbox.vifm
similarity index 100%
rename from all/dot-config/vifm/colors/gruvbox.vifm
rename to all-config/vifm/colors/gruvbox.vifm
diff --git a/all/dot-config/vifm/scripts/README b/all-config/vifm/scripts/README
similarity index 100%
rename from all/dot-config/vifm/scripts/README
rename to all-config/vifm/scripts/README
diff --git a/all/dot-config/vifm/vifm-help.txt b/all-config/vifm/vifm-help.txt
similarity index 100%
rename from all/dot-config/vifm/vifm-help.txt
rename to all-config/vifm/vifm-help.txt
diff --git a/all/dot-config/vifm/vifminfo.json b/all-config/vifm/vifminfo.json
similarity index 100%
rename from all/dot-config/vifm/vifminfo.json
rename to all-config/vifm/vifminfo.json
diff --git a/all/dot-config/vifm/vifmrc b/all-config/vifm/vifmrc
similarity index 100%
rename from all/dot-config/vifm/vifmrc
rename to all-config/vifm/vifmrc
diff --git a/bin/update_dotfiles.sh b/bin/update_dotfiles.sh
index f336cecb..f294073e 100755
--- a/bin/update_dotfiles.sh
+++ b/bin/update_dotfiles.sh
@@ -23,10 +23,12 @@ fi
 
 echo "Linking dotfiles..."
 stow -v1 --dotfiles all
+stow -v1 --target="${HOME}"/.config all-config
 if [[ "$(uname)" == Darwin ]] ; then
   stow -v1 --dotfiles mac
 else
   stow -v1 --dotfiles linux
+  stow -v1 --target="${HOME}"/.config linux-config
 fi
 if ${pulled} ; then
   echo "Pushing local modifications..."
diff --git a/linux/dot-config/gtk-2.0/gtk-2.0/gtk-2.0/gtkfilechooser.ini b/linux-config/gtk-2.0/gtk-2.0/gtk-2.0/gtkfilechooser.ini
similarity index 100%
rename from linux/dot-config/gtk-2.0/gtk-2.0/gtk-2.0/gtkfilechooser.ini
rename to linux-config/gtk-2.0/gtk-2.0/gtk-2.0/gtkfilechooser.ini
diff --git a/linux/dot-config/gtk-2.0/gtkfilechooser.ini b/linux-config/gtk-2.0/gtkfilechooser.ini
similarity index 100%
rename from linux/dot-config/gtk-2.0/gtkfilechooser.ini
rename to linux-config/gtk-2.0/gtkfilechooser.ini
diff --git a/linux/dot-config/gtk-3.0/bookmarks b/linux-config/gtk-3.0/bookmarks
similarity index 100%
rename from linux/dot-config/gtk-3.0/bookmarks
rename to linux-config/gtk-3.0/bookmarks
diff --git a/linux/dot-config/gtk-3.0/settings.ini b/linux-config/gtk-3.0/settings.ini
similarity index 100%
rename from linux/dot-config/gtk-3.0/settings.ini
rename to linux-config/gtk-3.0/settings.ini
diff --git a/linux/dot-config/i3/config b/linux-config/i3/config
similarity index 100%
rename from linux/dot-config/i3/config
rename to linux-config/i3/config
diff --git a/linux/dot-config/i3/scripts/battery-plus b/linux-config/i3/scripts/battery-plus
similarity index 100%
rename from linux/dot-config/i3/scripts/battery-plus
rename to linux-config/i3/scripts/battery-plus
diff --git a/linux/dot-config/i3/scripts/battery.py b/linux-config/i3/scripts/battery.py
similarity index 100%
rename from linux/dot-config/i3/scripts/battery.py
rename to linux-config/i3/scripts/battery.py
diff --git a/linux/dot-config/i3status/config b/linux-config/i3status/config
similarity index 100%
rename from linux/dot-config/i3status/config
rename to linux-config/i3status/config
diff --git a/linux/dot-config/kitty/dracula.conf b/linux-config/kitty/dracula.conf
similarity index 100%
rename from linux/dot-config/kitty/dracula.conf
rename to linux-config/kitty/dracula.conf
diff --git a/linux/dot-config/kitty/gruvbox_dark.conf b/linux-config/kitty/gruvbox_dark.conf
similarity index 100%
rename from linux/dot-config/kitty/gruvbox_dark.conf
rename to linux-config/kitty/gruvbox_dark.conf
diff --git a/linux/dot-config/kitty/kitty.conf b/linux-config/kitty/kitty.conf
similarity index 100%
rename from linux/dot-config/kitty/kitty.conf
rename to linux-config/kitty/kitty.conf
diff --git a/linux/dot-config/paru/paru.conf b/linux-config/paru/paru.conf
similarity index 100%
rename from linux/dot-config/paru/paru.conf
rename to linux-config/paru/paru.conf
diff --git a/linux/dot-config/polybar/config.ini b/linux-config/polybar/config.ini
similarity index 100%
rename from linux/dot-config/polybar/config.ini
rename to linux-config/polybar/config.ini
diff --git a/linux/dot-config/polybar/launch.sh b/linux-config/polybar/launch.sh
similarity index 100%
rename from linux/dot-config/polybar/launch.sh
rename to linux-config/polybar/launch.sh
diff --git a/linux/dot-config/polybar/modules/measure_ping.py b/linux-config/polybar/modules/measure_ping.py
similarity index 100%
rename from linux/dot-config/polybar/modules/measure_ping.py
rename to linux-config/polybar/modules/measure_ping.py
diff --git a/linux/dot-config/polybar/modules/now_playing.py b/linux-config/polybar/modules/now_playing.py
similarity index 100%
rename from linux/dot-config/polybar/modules/now_playing.py
rename to linux-config/polybar/modules/now_playing.py
diff --git a/linux/dot-config/polybar/scripts/check_updates.sh b/linux-config/polybar/scripts/check_updates.sh
similarity index 100%
rename from linux/dot-config/polybar/scripts/check_updates.sh
rename to linux-config/polybar/scripts/check_updates.sh
diff --git a/linux/dot-config/rofi/config.rasi b/linux-config/rofi/config.rasi
similarity index 100%
rename from linux/dot-config/rofi/config.rasi
rename to linux-config/rofi/config.rasi
diff --git a/linux/dot-config/rofi/dracula.rasi b/linux-config/rofi/dracula.rasi
similarity index 100%
rename from linux/dot-config/rofi/dracula.rasi
rename to linux-config/rofi/dracula.rasi
diff --git a/linux/dot-config/rofi/dracula1.rasi b/linux-config/rofi/dracula1.rasi
similarity index 100%
rename from linux/dot-config/rofi/dracula1.rasi
rename to linux-config/rofi/dracula1.rasi
diff --git a/linux/dot-config/rofi/dracula2.rasi b/linux-config/rofi/dracula2.rasi
similarity index 100%
rename from linux/dot-config/rofi/dracula2.rasi
rename to linux-config/rofi/dracula2.rasi
diff --git a/linux/dot-config/rofi/gruvbox.rasi b/linux-config/rofi/gruvbox.rasi
similarity index 100%
rename from linux/dot-config/rofi/gruvbox.rasi
rename to linux-config/rofi/gruvbox.rasi
diff --git a/linux/dot-config/rofi/rounded-common.rasi b/linux-config/rofi/rounded-common.rasi
similarity index 100%
rename from linux/dot-config/rofi/rounded-common.rasi
rename to linux-config/rofi/rounded-common.rasi
diff --git a/linux/dot-config/rofi/rounded-nord-dark.rasi b/linux-config/rofi/rounded-nord-dark.rasi
similarity index 100%
rename from linux/dot-config/rofi/rounded-nord-dark.rasi
rename to linux-config/rofi/rounded-nord-dark.rasi
diff --git a/linux/dot-config/syncthingtray.ini b/linux-config/syncthingtray.ini
similarity index 100%
rename from linux/dot-config/syncthingtray.ini
rename to linux-config/syncthingtray.ini
diff --git a/linux/dot-config/taskrc b/linux-config/taskrc
similarity index 100%
rename from linux/dot-config/taskrc
rename to linux-config/taskrc
diff --git a/linux/dot-config/tealdeer/config.toml b/linux-config/tealdeer/config.toml
similarity index 100%
rename from linux/dot-config/tealdeer/config.toml
rename to linux-config/tealdeer/config.toml
diff --git a/linux/dot-local/share/applications/ErrandList.desktop b/linux-local/share/applications/ErrandList.desktop
similarity index 100%
rename from linux/dot-local/share/applications/ErrandList.desktop
rename to linux-local/share/applications/ErrandList.desktop
diff --git a/linux/dot-local/share/applications/dailynotes.desktop b/linux-local/share/applications/dailynotes.desktop
similarity index 100%
rename from linux/dot-local/share/applications/dailynotes.desktop
rename to linux-local/share/applications/dailynotes.desktop
diff --git a/linux/dot-local/share/applications/install_all_softwares.desktop b/linux-local/share/applications/install_all_softwares.desktop
similarity index 100%
rename from linux/dot-local/share/applications/install_all_softwares.desktop
rename to linux-local/share/applications/install_all_softwares.desktop
diff --git a/linux/dot-local/share/applications/messages.desktop b/linux-local/share/applications/messages.desktop
similarity index 100%
rename from linux/dot-local/share/applications/messages.desktop
rename to linux-local/share/applications/messages.desktop
diff --git a/linux/dot-local/share/applications/onivim2.desktop b/linux-local/share/applications/onivim2.desktop
similarity index 100%
rename from linux/dot-local/share/applications/onivim2.desktop
rename to linux-local/share/applications/onivim2.desktop
diff --git a/linux/dot-local/share/applications/ovh-mail.desktop b/linux-local/share/applications/ovh-mail.desktop
similarity index 100%
rename from linux/dot-local/share/applications/ovh-mail.desktop
rename to linux-local/share/applications/ovh-mail.desktop
diff --git a/linux/dot-local/share/applications/proton-mail.desktop b/linux-local/share/applications/proton-mail.desktop
similarity index 100%
rename from linux/dot-local/share/applications/proton-mail.desktop
rename to linux-local/share/applications/proton-mail.desktop
diff --git a/linux/dot-local/share/applications/remap_escape.desktop b/linux-local/share/applications/remap_escape.desktop
similarity index 100%
rename from linux/dot-local/share/applications/remap_escape.desktop
rename to linux-local/share/applications/remap_escape.desktop
diff --git a/linux/dot-local/share/applications/rofi-power-menu.desktop b/linux-local/share/applications/rofi-power-menu.desktop
similarity index 100%
rename from linux/dot-local/share/applications/rofi-power-menu.desktop
rename to linux-local/share/applications/rofi-power-menu.desktop
diff --git a/linux/dot-local/share/applications/rofi-search-ddg.desktop b/linux-local/share/applications/rofi-search-ddg.desktop
similarity index 100%
rename from linux/dot-local/share/applications/rofi-search-ddg.desktop
rename to linux-local/share/applications/rofi-search-ddg.desktop
diff --git a/linux/dot-local/share/applications/taskwarrior-tui.desktop b/linux-local/share/applications/taskwarrior-tui.desktop
similarity index 100%
rename from linux/dot-local/share/applications/taskwarrior-tui.desktop
rename to linux-local/share/applications/taskwarrior-tui.desktop
diff --git a/linux/dot-local/share/applications/toot.desktop b/linux-local/share/applications/toot.desktop
similarity index 100%
rename from linux/dot-local/share/applications/toot.desktop
rename to linux-local/share/applications/toot.desktop
diff --git a/linux/dot-local/share/applications/tuir.desktop b/linux-local/share/applications/tuir.desktop
similarity index 100%
rename from linux/dot-local/share/applications/tuir.desktop
rename to linux-local/share/applications/tuir.desktop
diff --git a/linux/dot-local/share/applications/update_dotfiles.desktop b/linux-local/share/applications/update_dotfiles.desktop
similarity index 100%
rename from linux/dot-local/share/applications/update_dotfiles.desktop
rename to linux-local/share/applications/update_dotfiles.desktop
diff --git a/linux/dot-local/share/applications/vit.desktop b/linux-local/share/applications/vit.desktop
similarity index 100%
rename from linux/dot-local/share/applications/vit.desktop
rename to linux-local/share/applications/vit.desktop
diff --git a/linux/dot-local/share/applications/wip_note.desktop b/linux-local/share/applications/wip_note.desktop
similarity index 100%
rename from linux/dot-local/share/applications/wip_note.desktop
rename to linux-local/share/applications/wip_note.desktop