diff --git a/lua/lsp.lua b/lua/lsp.lua
index 84a0ebc..c1a2405 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -1,3 +1,55 @@
+-- attach using autocommand, much better than doing it during mason
+vim.api.nvim_create_autocmd('LspAttach', {
+  group = vim.api.nvim_create_augroup('sl.lsp', {}),
+  callback = function(args)
+    -- See `:help vim.lsp.*` for documentation on any of the below functions
+    local bufopts = { noremap = true, silent = true, buffer = args.buf }
+    vim.keymap.set('n', 'K', vim.lsp.buf.hover, { desc = "LSP show signature", unpack(bufopts) })
+    vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder,
+      { desc = "Workspace add folder", unpack(bufopts) })
+    vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder,
+      { desc = "Workspace remove folder", unpack(bufopts) })
+    vim.keymap.set('n', '<space>wl', function()
+      print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+    end, { desc = "Workspace list folders", unpack(bufopts) })
+    vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, { desc = "LSP Rename", unpack(bufopts) })
+    vim.keymap.set("n", "<space>f", function()
+      vim.lsp.buf.format({ async = true })
+    end, { desc = "LSP Format buffer", unpack(bufopts) })
+    vim.keymap.set("v", "<space>f", LSPRangeFormatFunction, { desc = "LSP Format region" })
+
+    -- 2024-09-09 - some ccflow commands for diagnostics, symbols and code actions
+    local fzf = require('fzf-lua')
+    vim.keymap.set('n', '<space>d', fzf.diagnostics_document, { desc = "Document diagnostics" })
+    vim.keymap.set('n', '<space>D', fzf.diagnostics_workspace, { desc = "Workspace diagnostics" })
+    vim.keymap.set('n', '<space>e', function()
+      local new_config = not vim.diagnostic.config().virtual_lines
+      vim.diagnostic.config({ virtual_lines = new_config })
+    end, { desc = "Virtual line diagnostics" })
+    vim.keymap.set('n', '<space>s', fzf.lsp_document_symbols, { desc = "Doc symbols" })
+    vim.keymap.set('n', '<space>c', fzf.lsp_code_actions, { desc = "Code Actions" })
+    vim.keymap.set('n', '<space>[', vim.diagnostic.goto_prev, { desc = "Previous diagnostics" })
+    vim.keymap.set('n', '<space>]', vim.diagnostic.goto_next, { desc = "Previous diagnostics" })
+
+    local gitsigns = require('gitsigns')
+    vim.keymap.set('n', '<space>==', gitsigns.preview_hunk_inline, { desc = "Git hunk preview" })
+    vim.keymap.set('n', '<space>=B', gitsigns.blame, { desc = "Git blame file" })
+    vim.keymap.set('n', '<space>=D', function() gitsigns.diffthis('~') end, { desc = "Git diff this (~)" })
+    vim.keymap.set('n', '<space>=R', gitsigns.reset_buffer, { desc = "Git reset file" })
+    vim.keymap.set('n', '<space>=S', gitsigns.stage_buffer, { desc = "Git stage file" })
+    vim.keymap.set('n', '<space>=[', gitsigns.prev_hunk, { desc = "Git previous hunk" })
+    vim.keymap.set('n', '<space>=]', gitsigns.next_hunk, { desc = "Git next hunk" })
+    vim.keymap.set('n', '<space>=b', gitsigns.blame_line, { desc = "Git blame line" })
+    vim.keymap.set('n', '<space>=d', gitsigns.diffthis, { desc = "Git diff this" })
+    vim.keymap.set('n', '<space>=r', gitsigns.reset_hunk, { desc = "Git reset hunk" })
+    vim.keymap.set('n', '<space>=s', gitsigns.stage_hunk, { desc = "Git stage hunk" })
+
+    -- vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
+    vim.keymap.set('n', '<C-,>', fzf.lsp_references, { desc = "Find References" })
+    vim.keymap.set('n', '<C-.>', fzf.lsp_definitions, { desc = "Find References" })
+  end
+})
+
 require('mason').setup({
   ui = {
     icons = {
@@ -31,59 +83,6 @@ function LSPRangeFormatFunction()
   })
 end
 
--- Use an on_attach function to only map the following keys
--- after the language server attaches to the current buffer
-local on_attach = function(client, bufnr)
-  -- Enable completion triggered by <c-x><c-o>
-  -- vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-
-  -- See `:help vim.lsp.*` for documentation on any of the below functions
-  local bufopts = { noremap = true, silent = true, buffer = bufnr }
-  vim.keymap.set('n', 'K', vim.lsp.buf.hover, { desc = "LSP show signature", unpack(bufopts) })
-  vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder,
-    { desc = "Workspace add folder", unpack(bufopts) })
-  vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder,
-    { desc = "Workspace remove folder", unpack(bufopts) })
-  vim.keymap.set('n', '<space>wl', function()
-    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-  end, { desc = "Workspace list folders", unpack(bufopts) })
-  vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, { desc = "LSP Rename", unpack(bufopts) })
-  vim.keymap.set("n", "<space>f", function()
-    vim.lsp.buf.format({ async = true })
-  end, { desc = "LSP Format buffer", unpack(bufopts) })
-  vim.keymap.set("v", "<space>f", LSPRangeFormatFunction, { desc = "LSP Format region" })
-
-  -- 2024-09-09 - some ccflow commands for diagnostics, symbols and code actions
-  local fzf = require('fzf-lua')
-  vim.keymap.set('n', '<space>d', fzf.diagnostics_document, { desc = "Document diagnostics" })
-  vim.keymap.set('n', '<space>D', fzf.diagnostics_workspace, { desc = "Workspace diagnostics" })
-  -- vim.keymap.set('n', '<space>E', vim.diagnostic.open_float, { desc = "Popup diagnostics" })
-  vim.keymap.set('n', '<space>e', function()
-    local new_config = not vim.diagnostic.config().virtual_lines
-    vim.diagnostic.config({ virtual_lines = new_config })
-  end, { desc = "Virtual line diagnostics" })
-  vim.keymap.set('n', '<space>s', fzf.lsp_document_symbols, { desc = "Doc symbols" })
-  vim.keymap.set('n', '<space>c', fzf.lsp_code_actions, { desc = "Code Actions" })
-  vim.keymap.set('n', '<space>[', vim.diagnostic.goto_prev, { desc = "Previous diagnostics" })
-  vim.keymap.set('n', '<space>]', vim.diagnostic.goto_next, { desc = "Previous diagnostics" })
-
-  local gitsigns = require('gitsigns')
-  vim.keymap.set('n', '<space>==', gitsigns.preview_hunk_inline, { desc = "Git hunk preview" })
-  vim.keymap.set('n', '<space>=B', gitsigns.blame, { desc = "Git blame file" })
-  vim.keymap.set('n', '<space>=D', function() gitsigns.diffthis('~') end, { desc = "Git diff this (~)" })
-  vim.keymap.set('n', '<space>=R', gitsigns.reset_buffer, { desc = "Git reset file" })
-  vim.keymap.set('n', '<space>=S', gitsigns.stage_buffer, { desc = "Git stage file" })
-  vim.keymap.set('n', '<space>=[', gitsigns.prev_hunk, { desc = "Git previous hunk" })
-  vim.keymap.set('n', '<space>=]', gitsigns.next_hunk, { desc = "Git next hunk" })
-  vim.keymap.set('n', '<space>=b', gitsigns.blame_line, { desc = "Git blame line" })
-  vim.keymap.set('n', '<space>=d', gitsigns.diffthis, { desc = "Git diff this" })
-  vim.keymap.set('n', '<space>=r', gitsigns.reset_hunk, { desc = "Git reset hunk" })
-  vim.keymap.set('n', '<space>=s', gitsigns.stage_hunk, { desc = "Git stage hunk" })
-
-  -- vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
-  vim.keymap.set('n', '<C-,>', fzf.lsp_references, { desc = "Find References" })
-  vim.keymap.set('n', '<C-.>', fzf.lsp_definitions, { desc = "Find References" })
-end
 
 -- Set different settings for different languages' LSP
 -- LSP list: https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md
@@ -98,19 +97,6 @@ require('mason-lspconfig').setup_handlers({
   -- and will be called for each installed server that doesn't have
   -- a dedicated handler.
   function(server_name) -- default handler (optional)
-    -- 2024-10-29 Solargraph shall handle ruby AND sonicpi files, add on_init according to documentation
-    if server_name == "solargraph" then
-      lspconfig[server_name].setup {
-        on_attach = on_attach,
-        config = {
-          on_init = function(client)
-            require('sonicpi').lsp_on_init(client, {})
-          end
-        },
-        filetypes = { 'ruby', 'sonicpi' },
-      }
-    end
-
     if server_name == 'ts_ls' then
       -- taken from https://github.com/vuejs/language-tools
       -- If you are using mason.nvim, you can get the ts_plugin_path like this
@@ -119,7 +105,6 @@ require('mason-lspconfig').setup_handlers({
           '/node_modules/@vue/language-server'
 
       lspconfig[server_name].setup {
-        on_attach = on_attach,
         init_options = {
           plugins = {
             {
@@ -133,7 +118,6 @@ require('mason-lspconfig').setup_handlers({
       }
     else
       lspconfig[server_name].setup {
-        on_attach = on_attach
       }
     end
   end
@@ -142,9 +126,6 @@ require('mason-lspconfig').setup_handlers({
 
 -- setup sqls support
 lspconfig.sqls.setup {
-  on_attach = function(client, bufnr)
-    require('sqls').on_attach(client, bufnr)
-  end,
   settings = {
     sqls = {
       connections = {
@@ -160,11 +141,3 @@ lspconfig.sqls.setup {
     },
   },
 }
-
--- use on_attach to get lsp related shortcuts
-vim.g.rustaceanvim = {
-  -- LSP configuration
-  server = {
-    on_attach = on_attach
-  }
-}