From b8ba8400290982fcb3a73025d7c498cf18b6a5bf Mon Sep 17 00:00:00 2001
From: Jisu Kim <webmaster@alien.moe>
Date: Tue, 13 Apr 2021 21:00:02 +0900
Subject: [PATCH] Update

---
 darwin/spacebar/spacebarrc      | 12 ++++++------
 darwin/yabai/yabairc            | 25 ++++++++++++++++++++-----
 omz/plugins/git-flow-completion |  1 +
 zshrc                           |  2 +-
 4 files changed, 28 insertions(+), 12 deletions(-)
 create mode 160000 omz/plugins/git-flow-completion

diff --git a/darwin/spacebar/spacebarrc b/darwin/spacebar/spacebarrc
index 8631815..24b4ced 100755
--- a/darwin/spacebar/spacebarrc
+++ b/darwin/spacebar/spacebarrc
@@ -6,13 +6,13 @@ spacebar -m config spacing_left       25
 spacebar -m config spacing_right      15
 spacebar -m config text_font          "TerminessTTF Nerd Font:Normal:17.0"
 spacebar -m config icon_font          "TerminessTTF Nerd Font:Bold:17.0"
-spacebar -m config background_color   0xff282a36
-spacebar -m config foreground_color   0xffa8a8a8
-spacebar -m config space_icon_color   0xffbd93f9
-spacebar -m config power_icon_color   0xffcd950c
+spacebar -m config background_color   0x00282a36
+spacebar -m config foreground_color   0xffFFFFFF
+spacebar -m config space_icon_color   0xffFFFFFF
+spacebar -m config power_icon_color   0xffFFFFFF
 spacebar -m config battery_icon_color 0xffd75f5f
-spacebar -m config dnd_icon_color     0xffa8a8a8
-spacebar -m config clock_icon_color   0xffa8a8a8
+spacebar -m config dnd_icon_color     0xffFFFFFF
+spacebar -m config clock_icon_color   0xffFFFFFF
 spacebar -m config space_icon_strip   1: 2: 3: 4: 5:
 spacebar -m config power_icon_strip    
 spacebar -m config space_icon         
diff --git a/darwin/yabai/yabairc b/darwin/yabai/yabairc
index b33ee2c..c71cdb5 100755
--- a/darwin/yabai/yabairc
+++ b/darwin/yabai/yabairc
@@ -3,7 +3,6 @@
 sudo yabai --load-sa
 sleep 5
 yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa"
-brew services restart spacebar
 open -a /Applications/Telegram.app
 
 yabai -m config layout bsp
@@ -12,7 +11,7 @@ yabai -m config mouse_follows_focus          off
 yabai -m config focus_follows_mouse          autofocus
 yabai -m config window_placement             second_child
 
-yabai -m config external_bar   main:30:0
+yabai -m config external_bar   main:25:0
 yabai -m config top_padding    20
 yabai -m config bottom_padding 20
 yabai -m config left_padding   20
@@ -32,13 +31,29 @@ yabai -m config normal_window_opacity        0.90
 yabai -m config mouse_modifier alt
 
 yabai -m rule --add app="^IINA$" sticky=on layer=above manage=off border=off
-yabai -m rule --add app="^시스템 환경설정$" layer=above manage=off
-yabai -m rule --add app="^Telegram$" layer=above manage=off sticky=on
-yabai -m rule --add app="^Transmission Remote GUI$" layer=above manage=off
+yabai -m rule --add app="^시스템 환경설정$" layer=above manage=off border=off
+yabai -m rule --add app="^Telegram$" layer=above manage=off sticky=on border=off
+yabai -m rule --add app="^Transmission Remote GUI$" layer=above manage=off border=off
 yabai -m rule --add app="^Finder$" layer=above manage=off border=off
+yabai -m rule --add app="^카카오톡$" layer=above manage=off sticky=on
 
 yabai -m rule --add app=Google\ Chrome space=3
+yabai -m rule --add app=Microsoft\ Edge space=3
 yabai -m rule --add app="^Code$" space=4
 
+yabai -m space 1 --label ""
+yabai -m space 2 --label ""
+yabai -m space 3 --label ""
+yabai -m space 4 --label ""
+yabai -m space 5 --label ""
+
+yabai -m signal --add event=application_activated \
+    action="osascript -e 'tell application \"Übersicht\" to refresh widget id \"vbalien-title-jsx\"'"
+yabai -m signal --add event=window_title_changed \
+    action="osascript -e 'tell application \"Übersicht\" to refresh widget id \"vbalien-title-jsx\"'"
+yabai -m signal --add event=space_changed \
+    action="osascript -e 'tell application \"Übersicht\" to refresh widget id \"vbalien-workspace-jsx\"'"
+osascript -e 'tell application "Übersicht" to refresh widget id "vbalien-workspace-jsx"'
+
 echo "yabai configuration loaded.."
 
diff --git a/omz/plugins/git-flow-completion b/omz/plugins/git-flow-completion
new file mode 160000
index 0000000..cba3ad7
--- /dev/null
+++ b/omz/plugins/git-flow-completion
@@ -0,0 +1 @@
+Subproject commit cba3ad7b5b51af7de26bb82cb6a1011b86084cad
diff --git a/zshrc b/zshrc
index fdd24c7..ab54f93 100644
--- a/zshrc
+++ b/zshrc
@@ -75,7 +75,7 @@ ZSH_CUSTOM=$HOME/.config/omz
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git deno)
+plugins=(git deno git-flow git-flow-completion)
 
 source $ZSH/oh-my-zsh.sh