diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a751307..f8c53f9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,3 +17,10 @@ repos:
         config\/zsh\/.*|
         home/\.zshenv
       )$
+
+- repo: https://github.com/rwxcorp/pre-commit-lua.git
+  rev: v1.0.0
+  hooks:
+    - id: stylua
+      args: [-f, config/nvim/stylua.toml]
+      files: ^config\/nvim\/.*lua$
diff --git a/config/nvim/after/ftplugin/cpp.lua b/config/nvim/after/ftplugin/cpp.lua
index f398d66..56ce0bf 100644
--- a/config/nvim/after/ftplugin/cpp.lua
+++ b/config/nvim/after/ftplugin/cpp.lua
@@ -1 +1 @@
-vim.bo.commentstring = '// %s'
+vim.bo.commentstring = "// %s"
diff --git a/config/nvim/after/ftplugin/cs.lua b/config/nvim/after/ftplugin/cs.lua
index f398d66..56ce0bf 100644
--- a/config/nvim/after/ftplugin/cs.lua
+++ b/config/nvim/after/ftplugin/cs.lua
@@ -1 +1 @@
-vim.bo.commentstring = '// %s'
+vim.bo.commentstring = "// %s"
diff --git a/config/nvim/after/ftplugin/editorconfig.lua b/config/nvim/after/ftplugin/editorconfig.lua
index e3c5666..ea55aa5 100644
--- a/config/nvim/after/ftplugin/editorconfig.lua
+++ b/config/nvim/after/ftplugin/editorconfig.lua
@@ -1 +1 @@
-vim.bo.commentstring = '# %s'
+vim.bo.commentstring = "# %s"
diff --git a/config/nvim/after/ftplugin/lua.lua b/config/nvim/after/ftplugin/lua.lua
index f4efb8c..578d130 100644
--- a/config/nvim/after/ftplugin/lua.lua
+++ b/config/nvim/after/ftplugin/lua.lua
@@ -1,18 +1,18 @@
 vim.bo.tabstop = 2
 
-local lua = require('fschauen.util.lua')
+local lua = require("fschauen.util.lua")
+local map = vim.keymap.set
+local opts = function(desc) return { desc = desc, buffer = true, silent = true } end
 
-local opts = function(desc)
-  return { desc = desc, buffer = true, silent = true }
-end
+-- stylua: ignore start
+map("n", "gf",                          lua.go_to_module,         opts("Go to module under cursor"))
 
-vim.keymap.set('n', 'gf', lua.go_to_module, opts('Go to module under cursor'))
+map("n", "<localleader>x",              lua.execute_lines,        opts("Execute current line"))
+map("x", "<localleader>x",              lua.execute_selection,    opts("Execute selection"))
+map("n", "<localleader><localleader>x", lua.execute_file,         opts("Execute current file"))
 
-vim.keymap.set('n', '<localleader>x', lua.execute_lines, opts('Execute current line'))
-vim.keymap.set('x', '<localleader>x', lua.execute_selection, opts('Execute selection'))
-vim.keymap.set('n', '<localleader><localleader>x', lua.execute_file, opts('Execute current file'))
-
-vim.keymap.set('n', [[<localleader>']], [[:.s/"/'/g | nohl<cr>]], opts([[Replace: " 󱦰 ']]))
-vim.keymap.set('n', [[<localleader>"]], [[:.s/'/"/g | nohl<cr>]], opts([[Replace: ' 󱦰 "]]))
-vim.keymap.set('x', [[<localleader>']], [[:s/"/'/g  | nohl<cr>]], opts([[Replace: " 󱦰 ']]))
-vim.keymap.set('x', [[<localleader>"]], [[:s/'/"/g  | nohl<cr>]], opts([[Replace: ' 󱦰 "]]))
+map("n", [[<localleader>']],            [[:.s/"/'/g | nohl<cr>]], opts([[Replace: " 󱦰 ']]))
+map("n", [[<localleader>"]],            [[:.s/'/"/g | nohl<cr>]], opts([[Replace: ' 󱦰 "]]))
+map("x", [[<localleader>']],            [[:s/"/'/g  | nohl<cr>]], opts([[Replace: " 󱦰 ']]))
+map("x", [[<localleader>"]],            [[:s/'/"/g  | nohl<cr>]], opts([[Replace: ' 󱦰 "]]))
+-- stylua: ignore end
diff --git a/config/nvim/after/ftplugin/markdown.lua b/config/nvim/after/ftplugin/markdown.lua
index 9b26e69..a0fe8ec 100644
--- a/config/nvim/after/ftplugin/markdown.lua
+++ b/config/nvim/after/ftplugin/markdown.lua
@@ -1,4 +1,4 @@
 vim.bo.tabstop = 2
 vim.bo.shiftwidth = 0 -- use 'tabstop' for indenting
-vim.opt.formatoptions:append('t') -- wrap text on 'textwidth'
-vim.opt.spell = true              -- turn on spell checking
+vim.opt.formatoptions:append("t") -- wrap text on 'textwidth'
+vim.opt.spell = true -- turn on spell checking
diff --git a/config/nvim/after/ftplugin/python.lua b/config/nvim/after/ftplugin/python.lua
index 0b1fdd3..d22d6fb 100644
--- a/config/nvim/after/ftplugin/python.lua
+++ b/config/nvim/after/ftplugin/python.lua
@@ -1,2 +1,2 @@
-vim.opt.foldmethod = 'indent'
-vim.opt.foldignore = '#'
+vim.opt.foldmethod = "indent"
+vim.opt.foldignore = "#"
diff --git a/config/nvim/after/ftplugin/text.lua b/config/nvim/after/ftplugin/text.lua
index 341401b..e9002ae 100644
--- a/config/nvim/after/ftplugin/text.lua
+++ b/config/nvim/after/ftplugin/text.lua
@@ -1,2 +1,2 @@
-vim.opt.formatoptions:append('t') -- wrap text on 'textwidth'
-vim.opt.spell = true              -- turn on spell checking
+vim.opt.formatoptions:append("t") -- wrap text on 'textwidth'
+vim.opt.spell = true -- turn on spell checking
diff --git a/config/nvim/after/ftplugin/vim.lua b/config/nvim/after/ftplugin/vim.lua
index cb1a1f0..fd55d57 100644
--- a/config/nvim/after/ftplugin/vim.lua
+++ b/config/nvim/after/ftplugin/vim.lua
@@ -1 +1 @@
-vim.opt.foldmethod = 'marker'
+vim.opt.foldmethod = "marker"
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 346981f..1073eda 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -1,5 +1,3 @@
-if vim.loader then
-  vim.loader.enable()
-end
+if vim.loader then vim.loader.enable() end
 
 require("fschauen")