Added catpuccin colors to sketchybar and remove mouse on yabai

BitInByte · Mar 27, 2023 · 9460c8f · 9460c8f
1 parent 6ebc11d
commit 9460c8f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 20 deletions.
diff --git a/sketchybar/colors.sh b/sketchybar/colors.sh
@@ -3,22 +3,30 @@
 # Color Palette
 export BLACK=0xff181926
 export WHITE=0xffcad3f5
-export RED=0xffed8796
-export GREEN=0xffa6da95
-export BLUE=0xff8aadf4
-export YELLOW=0xffeed49f
-export ORANGE=0xfff5a97f
+# export RED=0xffed8796
+export RED=0xFFF38BA8
+# export GREEN=0xffa6da95
+export GREEN=0xFFA6E3A1
+# export BLUE=0xff8aadf4
+export BLUE=0xFF89B4FA
+# export YELLOW=0xffeed49f
+export YELLOW=0xFFF9E2AF
+# export ORANGE=0xfff5a97f
+export ORANGE=0xFFFAB387
 export MAGENTA=0xffc6a0f6
 export GREY=0xff939ab7
 export TRANSPARENT=0x00000000
 
 # General bar colors
-export BAR_COLOR=0xff1e1e2e
+# export BAR_COLOR=0xff1e1e2e
+export BAR_COLOR=0xFF1E1E2E
 export BAR_BORDER_COLOR=0xff494d64 #0xa024273a
 export ICON_COLOR=$WHITE # Color of all icons
 export LABEL_COLOR=$WHITE # Color of all labels
 export BACKGROUND_1=0x603c3e4f
 export BACKGROUND_2=0x60494d64
+export TEXT=0xFFCDD6F4
+export LABEL=0xffeceff4
 
 export POPUP_BACKGROUND_COLOR=0xff1e1e2e
 export POPUP_BORDER_COLOR=$WHITE

diff --git a/sketchybar/items/battery.sh b/sketchybar/items/battery.sh
@@ -9,7 +9,7 @@ sketchybar --add item battery right                            \
                         label.padding_right=9 \
                         label.padding_left=6 \
                         label.color=$BLACK \
-                        background.color=0xFFC9DDFF \
+                        background.color=$GREEN \
                         background.height=21 \
                         background.padding_right=2 \
            --subscribe battery system_woke power_source_change
diff --git a/sketchybar/items/clock.sh b/sketchybar/items/clock.sh
@@ -1,14 +1,15 @@
 #!/bin/bash
-#
+
 sketchybar --add item clock right                              \
            --set clock   update_freq=10                        \
                          icon=                                \
                          icon.padding_left=8 \
+                        icon.color=$BAR_COLOR \
                         icon.padding_right=0 \
                         label.padding_right=9 \
                         label.padding_left=6 \
-                        label.color=0xffeceff4 \
-                        background.color=0xff57627A \
+                        label.color=$BAR_COLOR \
+                        background.color=$BLUE \
                         background.height=21 \
                         background.padding_right=2 \
                          script="$PLUGIN_DIR/clock.sh"         \
diff --git a/sketchybar/items/volume.sh b/sketchybar/items/volume.sh
@@ -3,12 +3,12 @@
 sketchybar --add item volume right                             \
            --set volume  script="$PLUGIN_DIR/volume.sh"        \
                          icon.padding_left=8 \
-                         icon.color=$BLACK \
+                         icon.color=$BAR_COLOR \
                         icon.padding_right=0 \
                         label.padding_right=9 \
                         label.padding_left=6 \
-                        label.color=$BLACK \
-                        background.color=0xFFFFF275 \
+                        label.color=$BAR_COLOR \
+                        background.color=$YELLOW \
                         background.height=21 \
                         background.padding_right=2 \
            --subscribe volume volume_change                    \
diff --git a/sketchybar/items/wifi.sh b/sketchybar/items/wifi.sh
@@ -4,10 +4,11 @@ sketchybar --add item wifi right                               \
            --set wifi    script="$PLUGIN_DIR/wifi.sh"          \
                          icon.padding_left=8 \
                         icon.padding_right=0 \
+                         icon.color=$BAR_COLOR \
                         label.padding_right=9 \
                         label.padding_left=6 \
-                        label.color=0xffeceff4 \
-                        background.color=0xFFDE6C83 \
+                        label.color=$BAR_COLOR \
+                        background.color=$RED \
                         background.height=21 \
                         background.padding_right=2 \
                          icon=直                               \

diff --git a/yabai/yabairc b/yabai/yabairc
@@ -18,16 +18,16 @@ yabai -m config right_padding 8
 yabai -m config window_gap 8
 
 # mouse settings
-yabai -m config mouse_follows_focus on
+# yabai -m config mouse_follows_focus on
 
-yabai -m config mouse_modifier alt
+# yabai -m config mouse_modifier alt
 
 # left click + drag
-yabai -m config mouse_action1 move
+# yabai -m config mouse_action1 move
 # right click + drag
-yabai -m config mouse_action2 resize
+# yabai -m config mouse_action2 resize
 
-yabai -m mouse_drop_action swap
+# yabai -m mouse_drop_action swap
 
 # Disable specific apps
 yabai -m rule --add app="^System Settings$" manage=off