From 366c44ecef1cd34d43dbcc21834af918ef3445da Mon Sep 17 00:00:00 2001
From: Ein Verne <git@einverne.info>
Date: Sat, 2 Jul 2022 09:49:42 +0800
Subject: [PATCH] Update bootstrap

---
 config/bootstrap.conf.yml | 35 +++++++++++++++++++++++++++++++++++
 config/install.conf.yml   | 33 ---------------------------------
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/config/bootstrap.conf.yml b/config/bootstrap.conf.yml
index 8da4795..850aab8 100644
--- a/config/bootstrap.conf.yml
+++ b/config/bootstrap.conf.yml
@@ -3,6 +3,9 @@
   - ~/.zinit
   - ~/.tmux
 
+- create:
+    - ~/.config/kitty
+
 - shell:
   - description: Clone zinit
     quiet: true
@@ -38,3 +41,35 @@
       }
 
       update_shell
+
+- link:
+    ~/.config/espanso:
+      if: '[ `uname` = Linux ]'
+      path: espanso
+    ~/Library/Preferences/espanso:
+      if: '[ `uname` = Darwin ]'
+      path: espanso
+    ~/.hammerspoon:
+      if: '[ `uname` = Darwin ]'
+      path: hammerspoon
+    ~/.mackup.cfg:
+      if: '[ `uname` = Darwin ]'
+      path: mackup/mackup.cfg
+    ~/.Brewfile:
+      if: '[ `uname` = Darwin ]'
+      path: Brewfile
+    ~/.config/kitty/kitty.conf:
+      if: '[ `uname` = Darwin ]'
+      path: kitty/kitty.conf
+    ~/.config/kitty/base16-solarized-dark-256.conf:
+      if: '[ `uname` = Darwin ]'
+      path: kitty/base16-solarized-dark-256.conf
+    ~/.skhdrc:
+      if: '[ `uname` = Darwin ]'
+      path: skhd/skhdrc
+    ~/.yabairc:
+      if: '[ `uname` = Darwin ]'
+      path: yabai/yabairc
+    ~/.yabai_focus_display:
+      if: '[ `uname` = Darwin ]'
+      path: yabai/yabai_focus_display
diff --git a/config/install.conf.yml b/config/install.conf.yml
index 9a8f9ba..dba451e 100644
--- a/config/install.conf.yml
+++ b/config/install.conf.yml
@@ -5,9 +5,6 @@
 
 - clean: ['~']
 
-- create:
-    - ~/.config/kitty
-
 - link:
    ~/.dotfiles:
       force: true
@@ -37,33 +34,3 @@
     ~/.ideavimrc:
       if: '[ `uname` = Darwin ]'
       path: idea/.ideavimrc
-    ~/.config/espanso:
-      if: '[ `uname` = Linux ]'
-      path: espanso
-    ~/Library/Preferences/espanso:
-      if: '[ `uname` = Darwin ]'
-      path: espanso
-    ~/.hammerspoon:
-      if: '[ `uname` = Darwin ]'
-      path: hammerspoon
-    ~/.mackup.cfg:
-      if: '[ `uname` = Darwin ]'
-      path: mackup/mackup.cfg
-    ~/.Brewfile:
-      if: '[ `uname` = Darwin ]'
-      path: Brewfile
-    ~/.config/kitty/kitty.conf:
-      if: '[ `uname` = Darwin ]'
-      path: kitty/kitty.conf
-    ~/.config/kitty/base16-solarized-dark-256.conf:
-      if: '[ `uname` = Darwin ]'
-      path: kitty/base16-solarized-dark-256.conf
-    ~/.skhdrc:
-      if: '[ `uname` = Darwin ]'
-      path: skhd/skhdrc
-    ~/.yabairc:
-      if: '[ `uname` = Darwin ]'
-      path: yabai/yabairc
-    ~/.yabai_focus_display:
-      if: '[ `uname` = Darwin ]'
-      path: yabai/yabai_focus_display