diff --git a/.config/awesome/lib/layout-machi b/.config/awesome/lib/layout-machi
new file mode 160000
index 0000000..497d076
--- /dev/null
+++ b/.config/awesome/lib/layout-machi
@@ -0,0 +1 @@
+Subproject commit 497d076903e6f5375c0456593f24adcca3db07e6
diff --git a/.config/awesome/main/layout.lua b/.config/awesome/main/layout.lua
index 1b11475..06f37ed 100644
--- a/.config/awesome/main/layout.lua
+++ b/.config/awesome/main/layout.lua
@@ -1,30 +1,27 @@
 local awful = require("awful")
+local bling = require("lib.bling")
+local machi = require("lib.layout-machi")
+
+machi.editor.nested_layouts = {
+	["0"] = bling.layout.deck,
+	["1"] = awful.layout.suit.spiral,
+	["2"] = awful.layout.suit.fair,
+	["3"] = awful.layout.suit.fair.horizontal,
+}
 
 -- Table of layouts to cover with awful.layout.inc, order matters.
 awful.layout.layouts = {
-	awful.layout.suit.floating,
 	awful.layout.suit.tile,
-	awful.layout.suit.tile.left,
-	awful.layout.suit.tile.bottom,
-	awful.layout.suit.tile.top,
-	awful.layout.suit.fair,
-	awful.layout.suit.fair.horizontal,
-	awful.layout.suit.spiral,
 	awful.layout.suit.spiral.dwindle,
+	awful.layout.suit.floating,
 	awful.layout.suit.max,
-	awful.layout.suit.max.fullscreen,
-	awful.layout.suit.magnifier,
-	awful.layout.suit.corner.nw,
-	-- awful.layout.suit.corner.ne,
-	-- awful.layout.suit.corner.sw,
-	-- awful.layout.suit.corner.se,
+	bling.layout.centered,
+	bling.layout.mstab,
+	bling.layout.equalarea,
+	machi.default_layout,
 }
 
 client.connect_signal("manage", function(c)
-	-- Set the windows at the slave,
-	-- i.e. put it at the end of others instead of setting it master.
-	-- if not awesome.startup then awful.client.setslave(c) end
-
 	if awesome.startup and not c.size_hints.user_position and not c.size_hints.program_position then
 		-- Prevent clients from being unreachable after screen count changes.
 		awful.placement.no_offscreen(c)
diff --git a/.config/git/gitmoji-fuzzy-hook b/.config/git/gitmoji-fuzzy-hook
new file mode 160000
index 0000000..36b2402
--- /dev/null
+++ b/.config/git/gitmoji-fuzzy-hook
@@ -0,0 +1 @@
+Subproject commit 36b2402500231a6d69b849e31d5667983f2effb0
diff --git a/.gitconfig b/.gitconfig
index b4f468b..741cd94 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -4,3 +4,5 @@
 [credential "https://gist.github.com"]
 	helper = 
 	helper = !/usr/bin/gh auth git-credential
+[core]
+	hooksPath = ~/.config/git/hooks
diff --git a/.gitmodules b/.gitmodules
index c1c452b..ba282ec 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,15 @@
 [submodule "/home/marley/.config/awesome/lib/bling"]
 	path = /home/marley/.config/awesome/lib/bling
 	url = https://github.com/BlingCorp/bling.git
+[submodule "/home/marley/.config/awesome/lib/layout-machi"]
+	path = /home/marley/.config/awesome/lib/layout-machi
+	url = git@github.com:xinhaoyuan/layout-machi.git
+[submodule "/home/marley/.tmux/plugins/tpm"]
+	path = /home/marley/.tmux/plugins/tpm
+	url = https://github.com/tmux-plugins/tpm
+[submodule "/home/marley/.config/git/gitmoji-fuzzy-hook"]
+	path = /home/marley/.config/git/gitmoji-fuzzy-hook
+	url = https://gitlab.com/raabf/gitmoji-fuzzy-hook.git
+[submodule "/home/marley/.themes/lazygit/catppuccin"]
+	path = /home/marley/.themes/lazygit/catppuccin
+	url = git@github.com:catppuccin/lazygit.git
diff --git a/.themes/lazygit/catppuccin b/.themes/lazygit/catppuccin
new file mode 160000
index 0000000..a544cef
--- /dev/null
+++ b/.themes/lazygit/catppuccin
@@ -0,0 +1 @@
+Subproject commit a544cef9a18c3a94e0344281e0ddcf99a18a8ede
diff --git a/.tmux/plugins/tpm b/.tmux/plugins/tpm
new file mode 160000
index 0000000..99469c4
--- /dev/null
+++ b/.tmux/plugins/tpm
@@ -0,0 +1 @@
+Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946