towry · towry · Dec 23, 2024 · Dec 21, 2024 · Dec 21, 2024 · Dec 21, 2024
diff --git a/.github/workflows/sync-gitlab.yml b/.github/workflows/sync-gitlab.yml
@@ -7,10 +7,11 @@ on:
 
 jobs:
   sync:
+    if: false
     runs-on: ubuntu-latest
     steps:
-    - uses: keninkujovic/[email protected]
-      with:
-        gitlab_url: ${{ secrets.GITLAB_URL }}
-        username: ${{ secrets.USERNAME }}
-        gitlab_pat: ${{ secrets.GITLAB_PAT }}
+      - uses: keninkujovic/[email protected]
+        with:
+          gitlab_url: ${{ secrets.GITLAB_URL }}
+          username: ${{ secrets.USERNAME }}
+          gitlab_pat: ${{ secrets.GITLAB_PAT }}
diff --git a/conf/ghostty/config b/conf/ghostty/config
@@ -4,23 +4,27 @@
 
 
 theme = dark:Kanagawa Dragon,light:Builtin Solarized Light
-font-family  = Berkeley Mono Nerd Font
+font-family = Berkeley Mono Nerd Font
+# font-family = Iosevka Nerd Font Mono
 font-size = 14
-font-thicken = false
-shell-integration-features = no-cursor,sudo,title
+font-thicken = true
+font-codepoint-map = U+4E00-U+9FFF,U+3400-U+4DBF=LXGW WenKai Mono
+shell-integration-features = cursor,sudo,title
 cursor-style = block
 cursor-invert-fg-bg = true
 macos-option-as-alt = true
 macos-titlebar-style = tabs
-macos-window-shadow  = false
+macos-window-shadow  = true
 adjust-underline-position = 45%
-adjust-underline-thickness = -60%
+adjust-underline-thickness = -65%
 mouse-hide-while-typing = true
 focus-follows-mouse = false
 unfocused-split-opacity = 1
+window-padding-balance = true
+window-padding-x = 6
 
-background-opacity = 0.98
-background-blur-radius = 18
+background-opacity = 1
+background-blur-radius = 0
 
 # Quick terminal
 
@@ -48,6 +52,7 @@ keybind = super+backslash=toggle_quick_terminal
 
 # ====
 keybind = super+v=paste_from_clipboard
+keybind = super+c=copy_to_clipboard
 keybind = super+n=new_window
 keybind = super+t=new_tab
 keybind = super+w=close_surface

diff --git a/conf/karabiner/karabiner.json b/conf/karabiner/karabiner.json
@@ -115,15 +115,15 @@
                         ]
                     },
                     {
-                        "description": "Change left_command+hjkl to arrow keys",
-                        "disable": true,
+                        "description": "Change right_option+hjkl to arrow keys",
+                        "disable": false,
                         "manipulators": [
                             {
                                 "from": {
                                     "key_code": "h",
                                     "modifiers": {
                                         "mandatory": [
-                                            "right_command"
+                                            "right_option"
                                         ],
                                         "optional": [
                                             "any"
@@ -142,7 +142,7 @@
                                     "key_code": "j",
                                     "modifiers": {
                                         "mandatory": [
-                                            "right_command"
+                                            "right_option"
                                         ],
                                         "optional": [
                                             "any"
@@ -161,7 +161,7 @@
                                     "key_code": "k",
                                     "modifiers": {
                                         "mandatory": [
-                                            "right_command"
+                                            "right_option"
                                         ],
                                         "optional": [
                                             "any"
@@ -180,7 +180,7 @@
                                     "key_code": "l",
                                     "modifiers": {
                                         "mandatory": [
-                                            "right_command"
+                                            "right_option"
                                         ],
                                         "optional": [
                                             "any"

diff --git a/conf/yabai/yabairc b/conf/yabai/yabairc
@@ -1,4 +1,5 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+
 # the scripting-addition must be loaded manually if
 # you are running yabai on macOS Big Sur. Uncomment
 # the following line to have the injection performed
@@ -42,15 +43,11 @@ yabai -m config insert_feedback_color 0xaad75f5f
 yabai -m config split_ratio 0.50
 yabai -m config auto_balance on
 yabai -m config window_opacity off
-# yabai -m config window_opacity_duration 0.0
-# yabai -m config active_window_opacity 1.0
-# yabai -m config normal_window_opacity 1.0
 
 # -- space --
-
 yabai -m config layout stack
-# yabai -m config --space 1 layout stack
-# yabai -m config --space 2 layout bsp
+yabai -m config --space 1 layout stack
+yabai -m config --space 2 layout bsp
 # yabai -m config --space 3 layout bsp
 yabai -m config top_padding 4
 yabai -m config bottom_padding 4
@@ -65,8 +62,8 @@ yabai -m space 2 --label code
 #-- rules --
 ## see: https://github.com/koekeishiya/yabai/issues/1929
 yabai -m rule --add app=".*" sub-layer=normal
-yabai -m rule --add app="^(Safari|Firefox)$" space=web role=AXWindow subrole=AXStandardWindow
-yabai -m rule --add app="(System Preferences|系统偏好设置|系统设置|微信|wechat|\.dmg)$" manage=off sub-layer=normal
+yabai -m rule --add app="^(Safari|Firefox|Google Chrome)$" space=web role=AXWindow subrole=AXStandardWindow
+yabai -m rule --add app="^(Ghostty|Cursor)$" space=code role=AXWindow subrole=AXStandardWindow
 yabai -m rule --add app="(微信|钉钉|Wechat|企业微信|Telegram|Numi|MenubarX|备忘录|Notes)" manage=off sub-layer=normal
 yabai -m rule --add app="(腾讯会议|快速会议|会议|Capacities|数码测色计|富途牛牛)" manage=off sub-layer=normal
 yabai -m rule --add app="^\s*$" manage=off sub-layer=normal
@@ -75,6 +72,11 @@ yabai -m rule --add app="QQ音乐" manage=off sub-layer=normal
 yabai -m rule --add app="(Finder|访达|DevTools|模拟器|Kap|Bartender|TradingView)" manage=off sub-layer=normal
 yabai -m rule --apply
 
+yabai -m signal --add event=window_destroyed active=yes action="yabai -m query --windows --window &> /dev/null || yabai -m window --focus mouse &> /dev/null || yabai -m window --focus \$(yabai -m query --windows --space | jq .[0].id) &> /dev/null"
+yabai -m signal --add event=window_minimized active=yes action="if \$(yabai -m query --windows --window \$YABAI_WINDOW_ID | jq -r '.\"is-floating\"'); then yabai -m query --windows --window &> /dev/null || yabai -m window --focus mouse &> /dev/null || yabai -m window --focus \$(yabai -m query --windows --space | jq .[0].id) &> /dev/null; fi"
+
+
+
 # stackline specific tweaks
 # yabai -m signal --add event=window_created action="~/.config/yabai/adjust-padding-for-stacked-windows.sh"
 # yabai -m signal --add event=window_destroyed action="~/.config/yabai/adjust-padding-for-stacked-windows.sh"

diff --git a/nix/darwin/apple.nix b/nix/darwin/apple.nix
@@ -27,14 +27,14 @@
         # "com.apple.keyboard.fnState" = true;
       };
       dock = {
-        autohide = true;
+        autohide = false;
         magnification = true;
         mineffect = "scale";
         # minimize-to-application = true;
         orientation = "bottom";
         showhidden = true;
         show-recents = true;
-        tilesize = 40;
+        tilesize = 36;
         largesize = 42;
       };
       finder = {

diff --git a/nix/darwin/configuration.nix b/nix/darwin/configuration.nix
@@ -9,7 +9,7 @@
     ./vars.nix
     ./apps.nix
     ./yabai.nix
-    ./jankyborders.nix
+    # ./jankyborders.nix
   ];
 
   users.users.${username} = {

diff --git a/nix/darwin/jankyborders.nix b/nix/darwin/jankyborders.nix
@@ -7,10 +7,10 @@ let
     "style=round"
     "active_color=0xffbd93f9"
     "inactive_color=0xffabb2bf"
-    "width=7.0"
+    "width=4.0"
     "hidpi=on"
     "ax_focus=on"
-    "blacklist='Dropover,LaunchBar'"
+    "blacklist='LaunchBar'"
   ];
 in
 {

diff --git a/nix/darwin/yabai.nix b/nix/darwin/yabai.nix
@@ -3,9 +3,13 @@
   pkgs,
   ...
 }: {
+  environment.etc."sudoers.d/yabai".source = pkgs.runCommand "sudoers-yabai" {} ''
+    YABAI_BIN="/etc/profiles/per-user/${username}/bin/yabai"
+    SHASUM=$(sha256sum "$YABAI_BIN" | cut -d' ' -f1)
+    cat <<EOF >"$out"
+    ${username} ALL=(root) NOPASSWD: sha256:$SHASUM $YABAI_BIN --load-sa
+    EOF
+  '';
   # csrutil enable --without fs --without debug --without nvram
   # nvram boot-args=-arm64e_preview_abi
-  environment.etc."sudoers.d/yabai".text = ''
-    ${username} ALL = (root) NOPASSWD: ${pkgs.yabai}/bin/yabai --load-sa
-  '';
 }