diff --git a/dot_claude/settings.json b/dot_claude/settings.json
index f143f66..5230f56 100644
--- a/dot_claude/settings.json
+++ b/dot_claude/settings.json
@@ -1,16 +1,32 @@
 {
-  "preferredNotifChannel": "ghostty",
+  "hooks": {
+    "SessionStart": [
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"$HOME/.claude/hooks/herdr-agent-state.sh\" session",
+            "timeout": 10
+          }
+        ]
+      }
+    ]
+  },
   "statusLine": {
     "type": "command",
     "command": "~/.claude/statusline.py"
   },
   "enabledPlugins": {
-    "swift-lsp@claude-plugins-official": true,
-    "gopls-lsp@claude-plugins-official": true,
+    "crit@crit": true,
     "frontend-design@claude-plugins-official": true,
-    "superpowers@claude-plugins-official": true,
+    "gopls-lsp@claude-plugins-official": true,
     "security-guidance@claude-plugins-official": true,
-    "crit@crit": true
+    "superpowers@claude-plugins-official": true,
+    "swift-lsp@claude-plugins-official": true,
+    "dart-flutter@dart-flutter": true,
+    "modern-web-guidance@googlechrome": true,
+    "claude-security@claude-plugins-official": true
   },
   "extraKnownMarketplaces": {
     "datadog-pup": {
@@ -24,6 +40,26 @@
         "source": "github",
         "repo": "obra/superpowers-marketplace"
       }
+    },
+    "crit": {
+      "source": {
+        "source": "github",
+        "repo": "tomasz-tomczyk/crit"
+      }
+    },
+    "dart-flutter": {
+      "source": {
+        "source": "github",
+        "repo": "flutter/agent-plugins"
+      }
+    },
+    "googlechrome": {
+      "source": {
+        "source": "github",
+        "repo": "GoogleChrome/modern-web-guidance"
+      }
     }
-  }
+  },
+  "skipWorkflowUsageWarning": true,
+  "preferredNotifChannel": "ghostty"
 }
diff --git a/private_dot_config/ghostty/config b/private_dot_config/ghostty/config
index 78d8f13..c073057 100644
--- a/private_dot_config/ghostty/config
+++ b/private_dot_config/ghostty/config
@@ -2,4 +2,4 @@ background-blur-radius = 20
 background-opacity = 0.85
 font-feature = -dlig
 macos-titlebar-style = transparent
-theme = Monokai Pro Machine
\ No newline at end of file
+theme = Monokai Pro Machine
diff --git a/private_dot_config/git/config.tmpl b/private_dot_config/git/config.tmpl
index f6cdeb8..95e83ef 100644
--- a/private_dot_config/git/config.tmpl
+++ b/private_dot_config/git/config.tmpl
@@ -15,6 +15,8 @@
 	preloadindex = true
 	fscache = true
 	hooksPath = githooks
+	fsmonitor = true
+	untrackedCache = true
 [interactive]
 	diffFilter = delta --color-only
 [delta]
@@ -91,3 +93,9 @@
 	gpgsign = true
 [include]
 	path = ~/.gitconfig.local
+[credential "https://github.com"]
+	helper =
+	helper = !/opt/homebrew/bin/gh auth git-credential
+[credential "https://gist.github.com"]
+	helper =
+	helper = !/opt/homebrew/bin/gh auth git-credential
diff --git a/private_dot_config/snapzy/config.toml b/private_dot_config/snapzy/config.toml
index 27cff64..1ca7783 100644
--- a/private_dot_config/snapzy/config.toml
+++ b/private_dot_config/snapzy/config.toml
@@ -1,5 +1,5 @@
 schema_version = 1
-snapzy_min_version = "1.29.1"
+snapzy_min_version = "1.30.1"
 
 [general]
 language = "ja"
@@ -7,8 +7,8 @@ appearance = "system"
 play_sounds = true
 url_scheme_enabled = true
 show_menu_bar_icon = true
-start_at_login = false
-export_location = "~/Desktop/Snapzy"
+start_at_login = true
+export_location = "~/Pictures/Snapzy"
 
 [updates]
 check_automatically = true
@@ -49,14 +49,12 @@ save = true
 quick_access = true
 copy_file = true
 open_annotate = false
-upload_to_cloud = false
 
 [capture.after.recording]
 save = true
 quick_access = true
 copy_file = true
 open_annotate = false
-upload_to_cloud = false
 
 [recording]
 format = "mov"
@@ -69,6 +67,7 @@ microphone_device_id = "system-default"
 remember_last_area = true
 include_snapzy = false
 show_cursor = true
+dim_non_selected_area = true
 highlight_clicks = false
 show_keystrokes = false
 video_editor_zoom_transition_duration = 0.4
@@ -144,6 +143,7 @@ clipboard_image_open_behavior = "ask"
 close_after_drag = true
 bring_forward_after_drag = false
 quick_properties_sync = true
+combine_save_as_edit = true
 
 [shortcuts]
 enabled = true