nvim: indent fixes and keymaps

nvim/.luarc.json

@@ -1,13 +1,15 @@
 {
   "runtime.version": "LuaJIT",
   "runtime.path": ["lua/?.lua", "lua/?/init.lua"],
-  "diagnostics.globals": ["vim",
+  "diagnostics.globals": [
+    "vim",
     "ipairs",
     "require",
     "pairs",
     "type",
     "unpack",
-        "table"],
+    "table"
+  ],
   "workspace.checkThirdParty": false,
   "workspace.library": ["$VIMRUNTIME", "./lua"]
 }

nvim/lua/config/colorscheme.lua

@@ -1,18 +1,19 @@
 return {
 	flavour = "mocha",
+	transparent_background = true,
 	color_overrides = {
 		mocha = {
-			base = '#0E1019',
+			base = "#0E1019",
-			mantle = '#0D0F17',
+			mantle = "#0D0F17",
-			crust = '#0C0D14',
+			crust = "#0C0D14",
-			surface0 = '#1a1c2d',
+			surface0 = "#1a1c2d",
-			surface1 = '#343959',
+			surface1 = "#343959",
-			surface2 = '#41476F',
+			surface2 = "#41476F",
-			overlay0 = '#3F4256',
+			overlay0 = "#3F4256",
-			overlay1 = '#5B5F7C',
+			overlay1 = "#5B5F7C",
-			overlay2 = '#767BA0',
+			overlay2 = "#767BA0",
-			text = '#eceef4',
+			text = "#eceef4",
-		}
+		},
 	},
 	no_italic = true,
 	no_bold = true,
@@ -101,7 +102,7 @@ return {
 				["@namespace_name.php"] = { link = "@text" },
 				["@namespace_alias.php"] = { link = "@text" },
 			}
-		end
+		end,
 	},
 	integrations = {
 		cmp = true,
@@ -111,6 +112,6 @@ return {
 		noice = true,
 		telescope = {
 			enabled = true,
-		}
+		},
-	}
+	},
 }

nvim/lua/config/conform.lua

@@ -8,6 +8,6 @@ return {
 		bash = { "shfmt" },
 		blade = { "blade-formatter" },
 		lua = { "stylua" },
-        ["_"] = { "prettier" }
+		["_"] = { "prettier" },
-    }
+	},
 }

nvim/lua/config/keymaps.lua

@@ -1,5 +1,6 @@
 local cmd = vim.cmd
 local buffers = require('utils.buffers')
+local telescope = require('utils.telescope')
 
 return {
     leader = " ",
@@ -62,8 +63,7 @@ return {
         { 'n',          "<Tab>",      "^=$" },
         { 'x',          "<Tab>",      "=",                              { desc = "auto indent selection" } },
         { "i",          "<S-Tab>",    "<C-d>",                          { desc = "delete indent" } },
-
+        { 'n',          "<leader>fs", [[:%s/\s\+$//g<CR>`']],           { desc = "Remove trailing spaces" } },
-        { 'n', "<leader>fs", [[:%s/\s\+$//g<CR>`']], desc = "Remove trailing spaces" },
 
         -- fix paste
         -- {'n', "p", "p=$"},
@@ -104,6 +104,7 @@ return {
         ["<leader>F"]   = { name = "+Files" },
         ["<leader>d"]   = { name = "+Diagnostics" },
         ["<leader>s"]   = { name = "+Search" },
+        ["<leader>c"]   = { name = "+Code" },
         ["<leader>g"]   = { name = "+Git" },
     },
     oil = {
@@ -129,11 +130,10 @@ return {
     -- Keybinds for buffers with an LSP client attached
     lsp = {
         { 'K',          function() vim.lsp.buf.hover() end,           desc = '' },
-        { '<leader>ca', function() vim.lsp.buf.code_action() end,     desc = 'Code action' },
+        { '<leader>ca', function() vim.lsp.buf.code_action() end,     mode={'n', 'x'}, desc = 'Code action' },
         { '<leader>rs', function() vim.lsp.buf.rename() end,          desc = 'Rename symbol' },
         { '<leader>sr', '<cmd>Telescope lsp_references<cr>',          desc = 'Search Reference' },
         { '<leader>ss', '<cmd>Telescope lsp_document_symbols<cr>',    desc = 'Search document symbols' },
-        { '<leader>sr', '<cmd>Telescope lsp_references<cr>',        desc = 'Search Reference' },
         { '<leader>si', '<cmd>Telescope lsp_implementations<cr>',     desc = 'Search Inplementations' },
         { '<leader>sp', '<cmd>Telescope lsp_workspace_symbols<cr>',   desc = 'Search Workspace symbols' },
         { 'go',         '<cmd>Telescope lsp_type_definitions<cr>',    desc = "Goto type definition" },
@@ -141,11 +141,11 @@ return {
     },
     telescope = {
         { '<leader>sf', '<cmd>Telescope find_files<cr>',            desc = 'Search files' },
-        { '<leader>sF', '<cmd>lua require("telescope.builtin").find_files({no_ignore=true})<cr>',            desc = 'Search all files' },
+        { '<leader>sF', telescope.all_files,                        desc = 'Search all files' },
         { '<leader>sb', '<cmd>Telescope buffers<cr>',               desc = 'Search buffers' },
-        --{ '<leader>sb', '<cmd>lua require("utils.telescope").buffers()<cr>',               desc = 'Search buffers' },
         { '<leader>sa', '<cmd>Telescope live_grep<cr>',             desc = 'Search in files' },
         { '<leader>sg', '<cmd>Telescope git_files<cr>',             desc = 'Search Git files' },
+        { '<leader>sG', '<cmd>Telescope git_status<cr>',            desc = 'Search Git status' },
         { '<leader>so', '<cmd>Telescope oldfiles<cr>',              desc = 'Search Old files' },
         { '<leader>sw', '<cmd>Telescope grep_string<cr>',           desc = 'Search for word under cursor' },
         { '<leader>sd', '<cmd>Telescope diagnostics<cr>',           desc = 'Search Diagnostics' },

nvim/lua/utils/keys.lua

@@ -3,5 +3,11 @@ return function(v, opts)
     local lhs = table.remove(c, 1)
     local rhs = table.remove(c, 1)
     opts = vim.tbl_deep_extend("force", c, opts or {})
-    vim.keymap.set('n', lhs, rhs, opts)
+
+    local mode = 'n'
+    if opts.mode  then
+        mode = opts.mode
+        opts.mode = nil
+    end
+    vim.keymap.set(mode, lhs, rhs, opts)
 end

nvim/lua/utils/telescope.lua

@@ -0,0 +1,6 @@
+
+local M = {}
+
+function M.all_files() require("telescope.builtin").find_files({no_ignore=true}) end
+
+return M