diff --git a/lua/custom/default.lua b/lua/custom/default.lua
index 56ab866..fbedfe4 100644
--- a/lua/custom/default.lua
+++ b/lua/custom/default.lua
@@ -38,8 +38,8 @@ pcode.progress = 1
 -- 4 = off
 pcode.show_mode = 3
 
--- 1 ( format jalan)  0 (fromat off)
-pcode.format_on_save = 1
+-- true or false
+pcode.format_on_save = true
 pcode.format_timeout_ms = 5000
 
 -- https://github.com/mfussenegger/nvim-lint
diff --git a/lua/plugins/nonels.lua b/lua/plugins/nonels.lua
index b39c619..c700a78 100644
--- a/lua/plugins/nonels.lua
+++ b/lua/plugins/nonels.lua
@@ -18,65 +18,7 @@ return {
       "nvimtools/none-ls-extras.nvim",
     },
     event = "InsertEnter",
-    opts = function()
-      local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
-      local sources = {}
-      local data_ok, data_sources = pcall(require, "custom.null-ls")
-      if data_ok then
-        for _, cfg in pairs(data_sources.sources) do
-          table.insert(sources, cfg)
-        end
-      end
-      local on_save = pcode.format_on_save or 0
-      if on_save == 1 then
-        return {
-          debug = false,
-          sources = sources,
-          on_attach = function(client, bufnr)
-            vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
-            local filetype = vim.bo.filetype
-            local n = require("null-ls")
-            local s = require("null-ls.sources")
-            local method = n.methods.FORMATTING
-            local available_formatters = s.get_available(filetype, method)
-
-            if
-              (#available_formatters > 0 and client.name == "null-ls")
-              or client.supports_method("textDocument/formatting")
-            then
-              vim.api.nvim_create_autocmd("BufWritePre", {
-                group = augroup,
-                buffer = bufnr,
-                callback = function()
-                  vim.lsp.buf.format({ bufnr = bufnr, timeout_ms = pcode.format_timeout_ms or 5000 })
-                end,
-              })
-            else
-              vim.api.nvim_create_autocmd("BufWritePre", {
-                group = augroup,
-                buffer = bufnr,
-                callback = function()
-                  vim.lsp.buf.format({ bufnr = bufnr, timeout_ms = pcode.format_timeout_ms or 5000, filter = nil })
-                end,
-              })
-            end
-          end,
-        }
-      else
-        vim.schedule(function()
-          pcall(function()
-            vim.api.nvim_clear_autocmds({ group = "LspFormatting" })
-          end)
-        end)
-
-        return {
-          debug = false,
-          sources = sources,
-        }
-      end
-    end,
-    config = function(_, opts)
-      require("null-ls").setup(opts)
-    end,
+    opts = {},
+    config = true,
   },
 }
diff --git a/lua/user/lsp/handlers.lua b/lua/user/lsp/handlers.lua
index 7292e3c..f4d9067 100644
--- a/lua/user/lsp/handlers.lua
+++ b/lua/user/lsp/handlers.lua
@@ -2,7 +2,7 @@ local M = {}
 
 local status_cmp_ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
 if not status_cmp_ok then
-	return
+  return
 end
 
 local lspvitualtext = pcode.lsp_virtualtext or false
@@ -13,95 +13,130 @@ M.capabilities.textDocument.completion.completionItem.snippetSupport = true
 M.capabilities = cmp_nvim_lsp.default_capabilities(M.capabilities)
 
 M.setup = function()
-	local signs = {
-		{ name = "DiagnosticSignError", text = icons.diagnostics.Error },
-		{ name = "DiagnosticSignWarn", text = icons.diagnostics.Warning },
-		{ name = "DiagnosticSignHint", text = icons.diagnostics.Hint },
-		{ name = "DiagnosticSignInfo", text = icons.diagnostics.Info },
-	}
+  local signs = {
+    { name = "DiagnosticSignError", text = icons.diagnostics.Error },
+    { name = "DiagnosticSignWarn", text = icons.diagnostics.Warning },
+    { name = "DiagnosticSignHint", text = icons.diagnostics.Hint },
+    { name = "DiagnosticSignInfo", text = icons.diagnostics.Info },
+  }
 
-	for _, sign in ipairs(signs) do
-		vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = "" })
-	end
+  for _, sign in ipairs(signs) do
+    vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = "" })
+  end
 
-	local config = {
-		virtual_text = lspvitualtext, -- disable virtual text
-		signs = {
-			active = signs, -- show signs
-		},
-		update_in_insert = true,
-		underline = true,
-		severity_sort = true,
-		float = {
-			focusable = true,
-			style = "minimal",
-			border = "rounded",
-			source = "always",
-			header = "",
-			prefix = "",
-		},
-	}
+  local config = {
+    virtual_text = lspvitualtext, -- disable virtual text
+    signs = {
+      active = signs, -- show signs
+    },
+    update_in_insert = true,
+    underline = true,
+    severity_sort = true,
+    float = {
+      focusable = true,
+      style = "minimal",
+      border = "rounded",
+      source = "always",
+      header = "",
+      prefix = "",
+    },
+  }
 
-	vim.diagnostic.config(config)
+  vim.diagnostic.config(config)
 
-	vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
-		border = "rounded",
-	})
+  vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
+    border = "rounded",
+  })
 
-	vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
-		border = "rounded",
-	})
+  vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
+    border = "rounded",
+  })
 end
 
 local function attach_navic(client, bufnr)
-	vim.g.navic_silence = true
-	local status_ok, navic = pcall(require, "nvim-navic")
-	if not status_ok then
-		return
-	end
-	navic.attach(client, bufnr)
+  vim.g.navic_silence = true
+  local status_ok, navic = pcall(require, "nvim-navic")
+  if not status_ok then
+    return
+  end
+  navic.attach(client, bufnr)
 end
 
-local function lsp_keymaps(bufnr)
-	local opts = { noremap = true, silent = true }
-	local keymap = vim.api.nvim_buf_set_keymap
-	keymap(bufnr, "n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts)
-	keymap(bufnr, "n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", opts)
-	keymap(bufnr, "n", "K", "<cmd>lua vim.lsp.buf.hover()<CR>", opts)
-	keymap(bufnr, "n", "gI", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
-	keymap(bufnr, "n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
-	keymap(bufnr, "n", "gl", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
-	keymap(bufnr, "n", "<leader>lf", "<cmd>lua vim.lsp.buf.format{ async = true }<cr>", opts)
-	keymap(bufnr, "n", "<leader>li", "<cmd>LspInfo<cr>", opts)
-	keymap(bufnr, "n", "<leader>lI", "<cmd>Mason<cr>", opts)
-	keymap(bufnr, "n", "<leader>la", "<cmd>lua vim.lsp.buf.code_action()<cr>", opts)
-	keymap(bufnr, "n", "<leader>lj", "<cmd>lua vim.diagnostic.goto_next({buffer=0})<cr>", opts)
-	keymap(bufnr, "n", "<leader>lk", "<cmd>lua vim.diagnostic.goto_prev({buffer=0})<cr>", opts)
-	keymap(bufnr, "n", "<leader>lr", "<cmd>lua vim.lsp.buf.rename()<cr>", opts)
-	keymap(bufnr, "n", "<leader>ls", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
-	keymap(bufnr, "n", "<leader>lq", "<cmd>lua vim.diagnostic.setloclist()<CR>", opts)
+function FORMAT_FILTER(client)
+  local filetype = vim.bo.filetype
+  local n = require("null-ls")
+  local s = require("null-ls.sources")
+  local method = n.methods.FORMATTING
+  local available_formatters = s.get_available(filetype, method)
+
+  if #available_formatters > 0 then
+    return client.name == "null-ls"
+  elseif client.supports_method("textDocument/formatting") then
+    return true
+  else
+    return false
+  end
+end
+
+-- stylua: ignore
+local function lsp_keymaps(bufnr, on_save)
+  local opts = { noremap = true, silent = true }
+  local keymap = vim.api.nvim_buf_set_keymap
+  keymap(bufnr, "n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts)
+  keymap(bufnr, "n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", opts)
+  keymap(bufnr, "n", "K", "<cmd>lua vim.lsp.buf.hover()<CR>", opts)
+  keymap(bufnr, "n", "gI", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
+  keymap(bufnr, "n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
+  keymap(bufnr, "n", "gl", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
+  keymap(bufnr, "n", "<leader>lf", "<cmd>lua vim.lsp.buf.format{ async = true }<cr>", opts)
+  keymap(bufnr, "n", "<leader>li", "<cmd>LspInfo<cr>", opts)
+  keymap(bufnr, "n", "<leader>lI", "<cmd>Mason<cr>", opts)
+  keymap(bufnr, "n", "<leader>la", "<cmd>lua vim.lsp.buf.code_action()<cr>", opts)
+  keymap(bufnr, "n", "<leader>lj", "<cmd>lua vim.diagnostic.goto_next({buffer=0})<cr>", opts)
+  keymap(bufnr, "n", "<leader>lk", "<cmd>lua vim.diagnostic.goto_prev({buffer=0})<cr>", opts)
+  keymap(bufnr, "n", "<leader>lr", "<cmd>lua vim.lsp.buf.rename()<cr>", opts)
+  keymap(bufnr, "n", "<leader>ls", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
+  keymap(bufnr, "n", "<leader>lq", "<cmd>lua vim.diagnostic.setloclist()<CR>", opts)
+  if on_save then
+    local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
+    vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
+    vim.api.nvim_create_autocmd("BufWritePre", {
+      group = augroup,
+      buffer = bufnr,
+      callback = function()
+        vim.lsp.buf.format({ bufnr = bufnr, timeout_ms = pcode.format_timeout_ms or 5000, filter = FORMAT_FILTER })
+      end,
+    })
+  else
+    vim.schedule(function()
+      pcall(function()
+        vim.api.nvim_clear_autocmds({ group = "LspFormatting" })
+      end)
+    end)
+  end
 end
 M.on_attach = function(client, bufnr)
-	attach_navic(client, bufnr)
-	if client.name == "tsserver" then
-		client.server_capabilities.documentFormattingProvider = false
-	end
+  attach_navic(client, bufnr)
+  if client.name == "tsserver" then
+    client.server_capabilities.documentFormattingProvider = false
+  end
 
-	if client.name == "lua_ls" then
-		client.server_capabilities.documentFormattingProvider = false
-	end
+  if client.name == "lua_ls" then
+    client.server_capabilities.documentFormattingProvider = false
+  end
 
-	if client.supports_method("textDocument/inlayHint") then
-		-- vim.lsp.inlay_hint.enable(bufnr, true)
-		vim.lsp.inlay_hint.enable(true)
-	end
+  if client.supports_method("textDocument/inlayHint") then
+    -- vim.lsp.inlay_hint.enable(bufnr, true)
+    vim.lsp.inlay_hint.enable(true)
+  end
 
-	lsp_keymaps(bufnr)
-	local status_ok, illuminate = pcall(require, "illuminate")
-	if not status_ok then
-		return
-	end
-	illuminate.on_attach(client)
+  local on_save = pcode.format_on_save or false
+  lsp_keymaps(bufnr, on_save)
+  local status_ok, illuminate = pcall(require, "illuminate")
+  if not status_ok then
+    return
+  end
+  illuminate.on_attach(client)
 end
 
 return M