diff --git a/configs/neovim.lua b/configs/neovim.lua
index 658a36d..4c7cd80 100644
--- a/configs/neovim.lua
+++ b/configs/neovim.lua
@@ -73,7 +73,7 @@ lspc.lua_ls.setup {
 	settings = {
 		Lua = {
 			diagnostics = {
-				globals = {'vim'},
+				globals = { 'vim' },
 			},
 		},
 	},
@@ -116,6 +116,7 @@ vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
 vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
 vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
 vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
+vim.keymap.set('n', '<space>f', ':Neoformat<CR>')
 
 vim.api.nvim_create_autocmd('LspAttach', {
 	group = vim.api.nvim_create_augroup('UserLspConfig', {}),
@@ -125,9 +126,9 @@ vim.api.nvim_create_autocmd('LspAttach', {
 		vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
 		vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
 		vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
-		vim.keymap.set('n', '<space>f', function()
-			vim.lsp.buf.format { async = true }
-		end, opts)
+		--vim.keymap.set('n', '<space>f', function()
+		--	vim.lsp.buf.format { async = true }
+		--end, opts)
 	end,
 })
 
diff --git a/configs/neovim.nix b/configs/neovim.nix
index b530949..e28439c 100644
--- a/configs/neovim.nix
+++ b/configs/neovim.nix
@@ -112,6 +112,7 @@ with pkgs; let
     fugitive
     fzf-vim
     haskell-vim
+    neoformat
     nvim-compe
     nvim-lspconfig
     nvim-tree-lua
diff --git a/default.nix b/default.nix
index 87956f1..acd31fd 100644
--- a/default.nix
+++ b/default.nix
@@ -162,7 +162,6 @@ in {
         minisign
         mosh
         nix-diff
-        nixfmt
         nix-index
         nix-top
         pass
diff --git a/hosts/box/default.nix b/hosts/box/default.nix
index b4374d8..8ebd627 100644
--- a/hosts/box/default.nix
+++ b/hosts/box/default.nix
@@ -155,7 +155,6 @@ in {
   nixpkgs.config.allowUnfree = true;
 
   environment.systemPackages = with pkgs; [
-    nixfmt
     tmux
     mosh
     apg
diff --git a/hosts/plq/default.nix b/hosts/plq/default.nix
index db45218..e5b2355 100644
--- a/hosts/plq/default.nix
+++ b/hosts/plq/default.nix
@@ -62,7 +62,6 @@ in {
     go
     mosh
     neovim
-    nixfmt
     nmap
     rage
     statix
diff --git a/install_template.nix b/install_template.nix
index 18e396a..fb0dbf0 100644
--- a/install_template.nix
+++ b/install_template.nix
@@ -42,7 +42,7 @@ in {
   };
 
   # neovim will overwrite my neovim!!
-  environment.systemPackages = with pkgs; [neovim nixfmt jq];
+  environment.systemPackages = with pkgs; [neovim jq];
 
   services.openssh = {
     enable = true;
diff --git a/installer.nix b/installer.nix
index 7b57edc..d390a0f 100644
--- a/installer.nix
+++ b/installer.nix
@@ -102,7 +102,7 @@ in {
     '';
     boot.tmp.cleanOnBoot = true;
 
-    environment.systemPackages = with pkgs; [apg inetutils nixfmt];
+    environment.systemPackages = with pkgs; [apg inetutils];
 
     environment.interactiveShellInit = ''
       alias vi=nvim