feat(nonels): lua formatting

lua/plugins/completions.lua

@@ -2,12 +2,9 @@ return {
     {
         "L3MON4D3/LuaSnip",
         dependencies = {
-      "saadparwaiz1/cmp_luasnip",
+            "saadparwaiz1/cmp_luasnip", "rafamadriz/friendly-snippets"
-      "rafamadriz/friendly-snippets",
+        }
-    },
+    }, {"hrsh7th/cmp-nvim-lsp"}, {
-  },
-  { "hrsh7th/cmp-nvim-lsp" },
-  {
         "hrsh7th/nvim-cmp",
         config = function()
             local cmp = require "cmp"
@@ -27,7 +24,7 @@ return {
                         -- insert({ body = args.body }) -- Insert at cursor
                         -- cmp.resubscribe({ "TextChangedI", "TextChangedP" })
                         -- require("cmp.config").set_onetime({ sources = {} })
-          end,
+                    end
                 },
                 window = {
                     -- completion = cmp.config.window.bordered(),
@@ -38,17 +35,15 @@ return {
                     ["<C-f>"] = cmp.mapping.scroll_docs(4),
                     ["<C-Space>"] = cmp.mapping.complete(),
                     ["<C-e>"] = cmp.mapping.abort(),
-          ["<CR>"] = cmp.mapping.confirm { select = true }, -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+                    ["<CR>"] = cmp.mapping.confirm {select = true} -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
                 },
                 sources = cmp.config.sources({
                     -- { name = "nvim_lsp" },
                     -- { name = "vsnip" }, -- For vsnip users.
-          { name = "luasnip" }, -- For luasnip users.
+                    {name = "luasnip"} -- For luasnip users.
                     -- { name = 'ultisnips' }, -- For ultisnips users.
                     -- { name = 'snippy' }, -- For snippy users.
-        }, {
+                }, {{name = "buffer"}})
-          { name = "buffer" },
-        }),
             }
 
             -- To use git you need to install the plugin petertriho/cmp-git and uncomment lines below
@@ -66,25 +61,19 @@ return {
             -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
             cmp.setup.cmdline({"/", "?"}, {
                 mapping = cmp.mapping.preset.cmdline(),
-        sources = {
+                sources = {{name = "buffer"}}
-          { name = "buffer" },
-        },
             })
 
             -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
             cmp.setup.cmdline(":", {
                 mapping = cmp.mapping.preset.cmdline(),
-        sources = cmp.config.sources({
+                sources = cmp.config.sources({{name = "path"}},
-          { name = "path" },
+                                             {{name = "cmdline"}}),
-        }, {
+                matching = {disallow_symbol_nonprefix_matching = false}
-          { name = "cmdline" },
-        }),
-        matching = { disallow_symbol_nonprefix_matching = false },
             })
 
-
             require("luasnip.loaders.from_vscode").lazy_load()
 
-    end,
+        end
-  },
+    }
 }

lua/plugins/iceberg.lua

@@ -1,6 +1,4 @@
 return {
     'cocopon/iceberg.vim',
-  config = function()
+    config = function() vim.cmd('colorscheme iceberg') end
-    vim.cmd('colorscheme iceberg')
-  end
 }

lua/plugins/lsp.lua

@@ -1,37 +1,27 @@
 return {
     {
         "williamboman/mason.nvim",
-  	config = function()
+        config = function() require('mason').setup() end
-  		require('mason').setup()
+    }, {
-	end
-  },
-  {
         "williamboman/mason-lspconfig.nvim",
         config = function()
             require('mason-lspconfig').setup {
-			ensure_installed = { "nil_ls", "pyright" },
+                ensure_installed = {"nil_ls", "pyright", "gopls"}
             }
         end
-  },
+    }, {
-  {
         "neovim/nvim-lspconfig",
         config = function()
             local lspconfig = require('lspconfig')
 
             local capabilities = require('cmp_nvim_lsp').default_capabilities()
-		lspconfig.pyright.setup({
+            lspconfig.pyright.setup({capabilities = capabilities})
-			capabilities = capabilities
+            lspconfig.nil_ls.setup({capabilities = capabilities})
-			})
-		lspconfig.nil_ls.setup({
-			capabilities = capabilities
-			})
             vim.keymap.set('n', 'K', vim.lsp.buf.hover, {})
-		vim.keymap.set('n', 'gd', vim.lsp.buf.definition, {
+            vim.keymap.set('n', 'gd', vim.lsp.buf.definition,
-				desc = 'Go to definition'
+                           {desc = 'Go to definition'})
-			})
+            vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action,
-		vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, {
+                           {desc = 'Show Code Actions'})
-				desc = 'Show Code Actions'
-			})
         end
     }
 }

lua/plugins/lualine.lua

@@ -9,19 +9,21 @@ return {
             options = {
                 theme = iceberg,
                 component_separators = '',
-    			section_separators = { left = '', right = '' },
+                section_separators = {left = '', right = ''}
             },
             sections = {
-    			lualine_a = { { 'mode', separator = { left = '' }, right_padding = 2 } },
+                lualine_a = {
+                    {'mode', separator = {left = ''}, right_padding = 2}
+                },
                 lualine_b = {'filename', 'branch'},
                 lualine_c = {
-      				'%=', --[[ add your center compoentnts here in place of this comment ]]
+                    '%=' --[[ add your center compoentnts here in place of this comment ]]
                 },
                 lualine_x = {},
                 lualine_y = {'filetype', 'progress'},
                 lualine_z = {
-      				{ 'location', separator = { right = '' }, left_padding = 2 },
+                    {'location', separator = {right = ''}, left_padding = 2}
-    			},
+                }
             },
             inactive_sections = {
                 lualine_a = {'filename'},
@@ -29,10 +31,10 @@ return {
                 lualine_c = {},
                 lualine_x = {},
                 lualine_y = {},
-    			lualine_z = { 'location' },
+                lualine_z = {'location'}
             },
             tabline = {},
-  		extensions = {},
+            extensions = {}
         }
     end
 }

lua/plugins/neotree.lua

@@ -2,9 +2,8 @@ return {
     "nvim-neo-tree/neo-tree.nvim",
     -- branch = "v3.x",
     dependencies = {
-    		"nvim-lua/plenary.nvim",
+        "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
-    		"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
+        "MunifTanjim/nui.nvim"
-    		"MunifTanjim/nui.nvim",
         -- {"3rd/image.nvim", opts = {}}, -- Optional image support in preview window: See `# Preview Mode` for more information
     },
     config = function()

lua/plugins/nonels.lua

@@ -2,14 +2,34 @@ return {
     "nvimtools/none-ls.nvim",
     dependencies = {"nvim-lua/plenary.nvim", "nvimtools/none-ls-extras.nvim"},
     config = function()
-    local null_ls = require "null-ls"
+        local null_ls = require("null-ls")
+        local helpers = require("null-ls.helpers")
+        local lua_format = {
+            meta = {
+                url = "https://github.com/Koihik/LuaFormatter",
+                description = "Reformats your Lua source code."
+            },
+            method = null_ls.methods.FORMATTING,
+            filetypes = {"lua"},
+            generator = null_ls.generator({
+                command = "lua-format",
+                to_stdin = true,
+                format = nil,
+                on_output = function(params, done)
+                    done({{text = params.output}})
+                end
+            })
+
+        }
         null_ls.setup {
             sources = {
-        null_ls.builtins.formatting.stylua,
                 null_ls.builtins.formatting.alejandra,
-        null_ls.builtins.diagnostics.pylint,
+                null_ls.builtins.formatting.black,
+                null_ls.builtins.formatting.gofmt,
+                null_ls.builtins.diagnostics.pylint, lua_format
             },
+            debug = true
         }
         vim.keymap.set("n", "<C-s-i>", vim.lsp.buf.format, {})
-  end,
+    end
 }

lua/plugins/transparent.lua

@@ -1,9 +1,8 @@
 return {
     'xiyaowong/transparent.nvim',
     config = function()
-	vim.keymap.set('n', '<leader>t', ':TransparentToggle<CR>', {
+        vim.keymap.set('n', '<leader>t', ':TransparentToggle<CR>',
-		desc = "Toggle Transparency",
+                       {desc = "Toggle Transparency"})
-	})
         vim.opt.termguicolors = true
     end
 }

lua/plugins/whichkey.lua

@@ -9,10 +9,8 @@ return {
     keys = {
         {
             "<leader>?",
-      		  function()
+            function() require("which-key").show({global = false}) end,
-        	  require("which-key").show({ global = false })
+            desc = "Buffer Local Keymaps (which-key)"
-      		  end,
+        }
-      		  desc = "Buffer Local Keymaps (which-key)",
+    }
-    		},
-  	},
 }