diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 1688756..8eca7e6 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,3 +1,5 @@
+require("key/leader")
+
 require("plugin/init")
 
 require("config/autoread")
@@ -5,7 +7,6 @@ require("config/search")
 require("config/tab")
 require("config/etc")
 
-require("key/leader")
 require("key/filetree")
 require("key/lsp")
 require("key/whichkey")
@@ -19,7 +20,7 @@ require("key/window")
 require("key/telescope")
 require("key/common")
 require("key/todo")
-require("key/align")
+-- require("key/align")
 require("key/fold")
 require("key/update")
 require("key/macro")
diff --git a/.config/nvim/lua/plugin/align.lua b/.config/nvim/lua/plugin/align.lua
new file mode 100644
index 0000000..8bb6610
--- /dev/null
+++ b/.config/nvim/lua/plugin/align.lua
@@ -0,0 +1,8 @@
+require('mini.align').setup {
+  -- Module mappings. Use `''` (empty string) to disable one.
+  mappings = {
+    start = '<Leader>a',
+    start_with_preview = '<Leader>A',
+  },
+}
+
diff --git a/.config/nvim/lua/plugin/init.lua b/.config/nvim/lua/plugin/init.lua
index bda1d27..e2e7b15 100644
--- a/.config/nvim/lua/plugin/init.lua
+++ b/.config/nvim/lua/plugin/init.lua
@@ -21,7 +21,7 @@ local available = function(commands)
 end
 
 return require("packer").startup(function(use)
-	--[[ 
+	--[[
 		host requirements
 			- gcc-c++
 	]]--
@@ -46,9 +46,10 @@ return require("packer").startup(function(use)
 	use "https://git.voronind.com/mirror/telescope.nvim.git"
 	use "https://git.voronind.com/mirror/nvim-treesitter.git"
 	use "https://git.voronind.com/mirror/todo-comments.nvim.git"
-	use "https://git.voronind.com/mirror/align.nvim.git"
+	-- use "https://git.voronind.com/mirror/align.nvim.git"
 	use "https://git.voronind.com/mirror/gruvbox-material.git"
 	use "https://git.voronind.com/mirror/indent-o-matic.git"
+	use "https://github.com/echasnovski/mini.align" -- Temporary while align is broken. See https://git.voronind.com/voronind/linux/issues/2
 
 	-- Automatically set up your configuration after cloning packer.nvim
 	-- Put this at the end after all plugins
@@ -75,6 +76,7 @@ return require("packer").startup(function(use)
 	require("plugin/telescope")
 	require("plugin/todo")
 	require("plugin/indent")
+	require("plugin/align")
 
 	if available({"g++"}) then
 		if treesitter then