some changes

lua/pika/plugins/formatting.lua

@@ -1,39 +1,41 @@
 return {
-  'stevearc/conform.nvim',
+	"stevearc/conform.nvim",
-  event = { 'BufReadPre', 'BufNewFile' },
+	event = { "BufReadPre", "BufNewFile" },
 	config = function()
-    local conform = require 'conform'
+		local conform = require("conform")
 
-    conform.setup {
+		conform.setup({
 			formatters_by_ft = {
-        javascript = { 'prettier' },
+				javascript = { "prettier" },
-        typescript = { 'prettier' },
+				typescript = { "prettier" },
-        javascriptreact = { 'prettier' },
+				javascriptreact = { "prettier" },
-        typescriptreact = { 'prettier' },
+				typescriptreact = { "prettier" },
-        svelte = { 'prettier' },
+				svelte = { "prettier" },
-        css = { 'prettier' },
+				css = { "prettier" },
-        html = { 'prettier' },
+				-- html = { 'prettier' },
-        json = { 'prettier' },
+				fish = { "fish_indent" },
-        yaml = { 'prettier' },
+				php = { "pretty-php" },
-        markdown = { 'prettier' },
+				json = { "yq" },
-        graphql = { 'prettier' },
+				yaml = { "yq" },
-        liquid = { 'prettier' },
+				markdown = { "prettier" },
-        lua = { 'stylua' },
+				graphql = { "prettier" },
-        -- python = { "isort", "black" },
+				liquid = { "prettier" },
+				sh = { "shfmt" },
+				lua = { "stylua" },
 			},
 			format_on_save = {
-        lsp_fallback = true,
+				lsp_fallback = false,
 				async = false,
 				timeout_ms = 1000,
 			},
-    }
+		})
 
-    vim.keymap.set({ 'n', 'v' }, '<leader>mp', function()
+		vim.keymap.set({ "n", "v" }, "<leader>mp", function()
-      conform.format {
+			conform.format({
 				lsp_fallback = true,
 				async = false,
 				timeout_ms = 1000,
-      }
+			})
-    end, { desc = 'Format file or range (in visual mode)' })
+		end, { desc = "Format file or range (in visual mode)" })
 	end,
 }

lua/pika/plugins/linting.lua

@@ -1,35 +1,35 @@
 return {
-  'mfussenegger/nvim-lint',
+	"mfussenegger/nvim-lint",
-  event = { 'BufReadPre', 'BufNewFile' },
+	event = { "BufReadPre", "BufNewFile" },
 	config = function()
-    local lint = require 'lint'
+		local lint = require("lint")
 
 		lint.linters_by_ft = {
-      javascript = { 'eslint_d' },
+			javascript = { "eslint_d" },
-      typescript = { 'eslint_d' },
+			typescript = { "eslint_d" },
-      javascriptreact = { 'eslint_d' },
+			javascriptreact = { "eslint_d" },
-      typescriptreact = { 'eslint_d' },
+			typescriptreact = { "eslint_d" },
-      python = { 'pylint' },
+			git = { "gitlint" },
-      git = { 'gitlint' },
+			json = { "jsonlint" },
-      json = { 'jsonlint' },
+			markdown = { "vale" },
-      markdown = { 'vale' },
+			fish = { "fish" },
-      fish = { 'fish' },
+			php = { "php" },
-      php = { 'php' },
+			yaml = { "yamllint" },
-      yaml = { 'yamllint' },
+			css = { "stylelint" },
-      css = { 'stylelint' },
+			sh = { "shellcheck" },
 		}
 
-    local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true })
+		local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true })
 
-    vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
+		vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
 			group = lint_augroup,
 			callback = function()
 				lint.try_lint()
 			end,
 		})
 
-    vim.keymap.set('n', '<leader>l', function()
+		vim.keymap.set("n", "<leader>l", function()
 			lint.try_lint()
-    end, { desc = 'Trigger linting for current file' })
+		end, { desc = "Trigger linting for current file" })
 	end,
 }

lua/pika/plugins/lorem_ipsum.lua

@@ -0,0 +1,13 @@
+return {
+	"derektata/lorem.nvim",
+	config = function()
+		require("lorem").setup({
+			sentenceLength = { -- custom configuration
+				words_per_sentence = 6,
+				sentences_per_paragraph = 4,
+			},
+			comma_chance = 0.3, -- 30% chance to insert a comma
+			max_commas_per_sentence = 2, -- maximum 2 commas per sentence
+		})
+	end,
+}

lua/pika/plugins/lsp/lspconfig.lua

@@ -1,69 +1,47 @@
 return {
-  'neovim/nvim-lspconfig',
+	"neovim/nvim-lspconfig",
-  event = { 'BufReadPre', 'BufNewFile' },
+	event = { "BufReadPre", "BufNewFile" },
 	dependencies = {
-    'hrsh7th/cmp-nvim-lsp',
+		"hrsh7th/cmp-nvim-lsp",
-    { 'antosha417/nvim-lsp-file-operations', config = true },
+		{ "antosha417/nvim-lsp-file-operations", config = true },
-    { 'folke/neodev.nvim', opts = {} },
+		{ "folke/neodev.nvim", opts = {} },
 	},
 	config = function()
 		-- import lspconfig plugin
-    local lspconfig = require 'lspconfig'
+		local lspconfig = require("lspconfig")
 
 		-- import mason_lspconfig plugin
-    local mason_lspconfig = require 'mason-lspconfig'
+		local mason_lspconfig = require("mason-lspconfig")
 
 		-- import cmp-nvim-lsp plugin
-    local cmp_nvim_lsp = require 'cmp_nvim_lsp'
+		local cmp_nvim_lsp = require("cmp_nvim_lsp")
 
 		local keymap = vim.keymap -- for conciseness
 
-    vim.api.nvim_create_autocmd('LspAttach', {
+		vim.api.nvim_create_autocmd("LspAttach", {
-      group = vim.api.nvim_create_augroup('UserLspConfig', {}),
+			group = vim.api.nvim_create_augroup("UserLspConfig", {}),
 			callback = function(ev)
 				-- Buffer local mappings.
 				-- See `:help vim.lsp.*` for documentation on any of the below functions
 				local opts = { buffer = ev.buf, silent = true }
 
-        -- set keybinds
+				opts.desc = "See available code actions"
-        -- opts.desc = 'Show LSP references'
+				keymap.set({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, opts) -- see available code actions, in visual mode will apply to selection
-        -- keymap.set('n', 'gR', '<cmd>Telescope lsp_references<CR>', opts) -- show definition, references
 
-        -- opts.desc = 'Go to declaration'
+				opts.desc = "Smart rename"
-        -- keymap.set('n', 'gD', vim.lsp.buf.declaration, opts) -- go to declaration
+				keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts) -- smart rename
 
-        -- opts.desc = 'Show LSP definitions'
+				opts.desc = "Show buffer diagnostics"
-        -- keymap.set('n', 'gd', '<cmd>Telescope lsp_definitions<CR>', opts) -- show lsp definitions
+				keymap.set("n", "<leader>D", "<cmd>Telescope diagnostics bufnr=0<CR>", opts) -- show diagnostics for file
 
-        -- opts.desc = 'Show LSP implementations'
+				opts.desc = "Show line diagnostics"
-        -- keymap.set('n', 'gi', '<cmd>Telescope lsp_implementations<CR>', opts) -- show lsp implementations
+				keymap.set("n", "<leader>d", vim.diagnostic.open_float, opts) -- show diagnostics for line
 
-        -- opts.desc = 'Show LSP type definitions'
+				opts.desc = "Show documentation for what is under cursor"
-        -- keymap.set('n', 'gt', '<cmd>Telescope lsp_type_definitions<CR>', opts) -- show lsp type definitions
+				keymap.set("n", "K", vim.lsp.buf.hover, opts) -- show documentation for what is under cursor
 
-        opts.desc = 'See available code actions'
+				opts.desc = "Restart LSP"
-        keymap.set({ 'n', 'v' }, '<leader>ca', vim.lsp.buf.code_action, opts) -- see available code actions, in visual mode will apply to selection
+				keymap.set("n", "<leader>rs", ":LspRestart<CR>", opts) -- mapping to restart lsp if necessary
-
-        opts.desc = 'Smart rename'
-        keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts) -- smart rename
-
-        opts.desc = 'Show buffer diagnostics'
-        keymap.set('n', '<leader>D', '<cmd>Telescope diagnostics bufnr=0<CR>', opts) -- show diagnostics for file
-
-        opts.desc = 'Show line diagnostics'
-        keymap.set('n', '<leader>d', vim.diagnostic.open_float, opts) -- show diagnostics for line
-
-        -- opts.desc = 'Go to previous diagnostic'
-        -- keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) -- jump to previous diagnostic in buffer
-
-        -- opts.desc = 'Go to next diagnostic'
-        -- keymap.set('n', ']d', vim.diagnostic.goto_next, opts) -- jump to next diagnostic in buffer
-
-        opts.desc = 'Show documentation for what is under cursor'
-        keymap.set('n', 'K', vim.lsp.buf.hover, opts) -- show documentation for what is under cursor
-
-        opts.desc = 'Restart LSP'
-        keymap.set('n', '<leader>rs', ':LspRestart<CR>', opts) -- mapping to restart lsp if necessary
 			end,
 		})
 
@@ -72,83 +50,98 @@ return {
 
 		-- Change the Diagnostic symbols in the sign column (gutter)
 		-- (not in youtube nvim video)
-    local signs = { Error = ' ', Warn = ' ', Hint = ' ', Info = ' ' }
+		local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " }
 		for type, icon in pairs(signs) do
-      local hl = 'DiagnosticSign' .. type
+			local hl = "DiagnosticSign" .. type
-      vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = '' })
+			vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
 		end
 
-    mason_lspconfig.setup_handlers {
+		mason_lspconfig.setup_handlers({
 			-- default handler for installed servers
 			function(server_name)
-        lspconfig[server_name].setup {
+				lspconfig[server_name].setup({
 					capabilities = capabilities,
-        }
+				})
 			end,
-      ['svelte'] = function()
+			["svelte"] = function()
 				-- configure svelte server
-        lspconfig['svelte'].setup {
+				lspconfig["svelte"].setup({
 					capabilities = capabilities,
 					on_attach = function(client, bufnr)
-            vim.api.nvim_create_autocmd('BufWritePost', {
+						vim.api.nvim_create_autocmd("BufWritePost", {
-              pattern = { '*.js', '*.ts' },
+							pattern = { "*.js", "*.ts" },
 							callback = function(ctx)
 								-- Here use ctx.match instead of ctx.file
-                client.notify('$/onDidChangeTsOrJsFile', { uri = ctx.match })
+								client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.match })
 							end,
 						})
 					end,
-        }
+				})
 			end,
-      ['graphql'] = function()
+			["graphql"] = function()
 				-- configure graphql language server
-        lspconfig['graphql'].setup {
+				lspconfig["graphql"].setup({
 					capabilities = capabilities,
-          filetypes = { 'graphql', 'gql', 'svelte', 'typescriptreact', 'javascriptreact' },
+					filetypes = { "graphql", "gql", "svelte", "typescriptreact", "javascriptreact" },
-        }
+				})
 			end,
-      ['emmet_ls'] = function()
+			["emmet_ls"] = function()
 				-- configure emmet language server
-        lspconfig['emmet_ls'].setup {
+				lspconfig["emmet_ls"].setup({
 					capabilities = capabilities,
-          filetypes = { 'html', 'typescriptreact', 'javascriptreact', 'css', 'sass', 'scss', 'less', 'svelte' },
+					filetypes = {
-        }
+						"html",
+						"typescriptreact",
+						"javascriptreact",
+						"css",
+						"sass",
+						"scss",
+						"less",
+						"svelte",
+					},
+				})
 			end,
-      ['lua_ls'] = function()
+			["lua_ls"] = function()
-        -- configure lua server (with special settings)
+				-- ─< configure lua server (with special settings) >────────────────────────────────────
-        lspconfig['lua_ls'].setup {
+				lspconfig["lua_ls"].setup({
 					capabilities = capabilities,
 					settings = {
 						Lua = {
-              -- make the language server recognize "vim" global
+							-- ─< make the language server recognize "vim" global >─────────────────────────────────
 							diagnostics = {
-                globals = { 'vim' },
+								globals = { "vim" },
 							},
 							completion = {
-                callSnippet = 'Replace',
+								callSnippet = "Replace",
 							},
 						},
 					},
-        }
+				})
 			end,
-      ['cssls'] = function()
+			["cssls"] = function()
-        -- configure CSS server
+				-- ─< configure CSS server >────────────────────────────────────────────────────────────
-        lspconfig['cssls'].setup {
+				lspconfig["cssls"].setup({
 					capabilities = capabilities,
-        }
+					filetypes = {
+						"html",
+						"css",
+						"scss",
+						"php",
+					},
+				})
 			end,
-      ['intelephense'] = function()
+			["intelephense"] = function()
-        -- configure PHP server
+				-- ─< configure PHP server >────────────────────────────────────────────────────────────
-        lspconfig['intelephense'].setup {
+				lspconfig["intelephense"].setup({
 					capabilities = capabilities,
-        }
+				})
 			end,
-      ['marksman'] = function()
+			["marksman"] = function()
-        -- configure Markdown server
+				-- ─< configure Markdown server >───────────────────────────────────────────────────────
-        lspconfig['marksman'].setup {
+				lspconfig["marksman"].setup({
 					capabilities = capabilities,
-        }
+				})
 			end,
-    }
+		})
 	end,
 }

lua/pika/plugins/trouble.lua

@@ -1,12 +1,12 @@
--- return {
+return {
---   "folke/trouble.nvim",
+	"folke/trouble.nvim",
---   dependencies = { "nvim-tree/nvim-web-devicons", "folke/todo-comments.nvim" },
+	dependencies = { "nvim-tree/nvim-web-devicons", "folke/todo-comments.nvim" },
---   keys = {
+	keys = {
---     { "<leader>xx", "<cmd>TroubleToggle<CR>", desc = "Open/close trouble list" },
+		{ "<leader>xx", "<cmd>TroubleToggle<CR>", desc = "Open/close trouble list" },
---     { "<leader>xw", "<cmd>TroubleToggle workspace_diagnostics<CR>", desc = "Open trouble workspace diagnostics" },
+		{ "<leader>xw", "<cmd>TroubleToggle workspace_diagnostics<CR>", desc = "Open trouble workspace diagnostics" },
---     { "<leader>xd", "<cmd>TroubleToggle document_diagnostics<CR>", desc = "Open trouble document diagnostics" },
+		{ "<leader>xd", "<cmd>TroubleToggle document_diagnostics<CR>", desc = "Open trouble document diagnostics" },
---     { "<leader>xq", "<cmd>TroubleToggle quickfix<CR>", desc = "Open trouble quickfix list" },
+		{ "<leader>xq", "<cmd>TroubleToggle quickfix<CR>", desc = "Open trouble quickfix list" },
---     { "<leader>xl", "<cmd>TroubleToggle loclist<CR>", desc = "Open trouble location list" },
+		{ "<leader>xl", "<cmd>TroubleToggle loclist<CR>", desc = "Open trouble location list" },
---     { "<leader>xt", "<cmd>TodoTrouble<CR>", desc = "Open todos in trouble" },
+		{ "<leader>xt", "<cmd>TodoTrouble<CR>", desc = "Open todos in trouble" },
---   },
+	},
--- }
+}