fix: Changing nvim git shortcuts and general cleanup

nvim/lua/custom_commands.lua

@@ -3,10 +3,3 @@ vim.api.nvim_create_user_command('FindAndReplace', function(opts)
     -- TODO: Does not close the buffers opened through changes
     vim.api.nvim_command(string.format('cdo s/%s/%s/g', opts.fargs[1], opts.fargs[2]) .. '| update | cclose')
 end, { nargs = '*' })
-
-vim.api.nvim_set_keymap(
-    'n',
-    '<leader>ir',
-    ':FindAndReplace ',
-    { noremap = true }
-)

nvim/lua/plugins/gitsigns.lua

@@ -29,19 +29,20 @@ return {
                 end)
 
                 -- Actions
-                map('n', '<leader>hs', gitsigns.stage_hunk)
+                map('n', '<leader>gs', gitsigns.stage_hunk)
-                map('n', '<leader>hr', gitsigns.reset_hunk)
+                map('n', '<leader>gu', gitsigns.undo_stage_hunk)
-                map('v', '<leader>hs', function() gitsigns.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
+                map('n', '<leader>gr', gitsigns.reset_hunk)
-                map('v', '<leader>hr', function() gitsigns.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
+                map('v', '<leader>gs', function() gitsigns.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
-                map('n', '<leader>hS', gitsigns.stage_buffer)
+                map('v', '<leader>gu', function() gitsigns.undo_stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
-                map('n', '<leader>hu', gitsigns.undo_stage_hunk)
+                map('v', '<leader>gr', function() gitsigns.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
-                map('n', '<leader>hR', gitsigns.reset_buffer)
+                map('n', '<leader>gS', gitsigns.stage_buffer)
-                map('n', '<leader>hp', gitsigns.preview_hunk)
+                map('n', '<leader>gR', gitsigns.reset_buffer)
-                map('n', '<leader>hb', function() gitsigns.blame_line{full=true} end)
+                map('n', '<leader>gp', gitsigns.preview_hunk)
-                map('n', '<leader>tb', gitsigns.toggle_current_line_blame)
+                map('n', '<leader>gb', function() gitsigns.blame_line{full=true} end)
-                map('n', '<leader>hd', gitsigns.diffthis)
+                map('n', '<leader>gtb', gitsigns.toggle_current_line_blame)
-                map('n', '<leader>hD', function() gitsigns.diffthis('~') end)
+                map('n', '<leader>gd', gitsigns.diffthis)
-                map('n', '<leader>td', gitsigns.toggle_deleted)
+                map('n', '<leader>gD', function() gitsigns.diffthis('~') end)
+                map('n', '<leader>gtd', gitsigns.toggle_deleted)
 
                 -- Text object
                 map({'o', 'x'}, 'ih', ':<C-U>Gitsigns select_hunk<CR>')

nvim/lua/plugins/gruvbox.lua

@@ -1,11 +1,6 @@
 return {
-    -- 'ellisonleao/gruvbox.nvim',
     'sainnhe/gruvbox-material',
     config = function()
-        -- require('gruvbox').setup({
-            -- contrast = 'hard',
-        -- })
-        -- vim.cmd([[colorscheme gruvbox]])
         vim.g.gruvbox_material_enable_italic = true
         vim.g.gruvbox_material_background = 'hard'
         vim.cmd.colorscheme('gruvbox-material')

nvim/lua/plugins/mason.lua

@@ -44,18 +44,17 @@ return {
                 'ansiblels',
                 'arduino_language_server',
                 'bashls',
-                'clangd',
+                'clangd', -- C/C++
                 -- 'hadolint', -- Dockerfile linting
-                'intelephense',
+                'intelephense', -- PHP
-                -- 'jdtls', -- java
+                'jdtls', -- java
                 'lua_ls',
                 'marksman', -- markdown
                 -- 'prettier',
                 'pylsp',
                 'rust_analyzer',
-                -- 'snyk',
+                -- 'snyk_ls',
                 'ts_ls', -- Typscript
-                -- 'volar', -- Vue
                 'yamlls',
             }
         }
@@ -114,7 +113,8 @@ return {
                         pylsp = {
                             plugins = {
                                 pycodestyle = {
-                                    ignore = {'E501'}
+                                    ignore = {'E501'},
+                                    maxLineLength = 120
                                 }
                             }
                         }
@@ -128,14 +128,7 @@ return {
                 flags = {
                     debounce_text_changes = 100,
                 }
-            }
+            },
-
-            -- ['gdshader_lsp'] = function()
-                -- lspconfig.gdshader_lsp.setup {
-                    -- capabilities = capabilities,
-                    -- on_attach = on_attach,
-                -- }
-            -- end,
         }
     end,
     dependencies = {

nvim/lua/plugins/telescope.lua

@@ -23,6 +23,7 @@ return {
             if num_selections > 1 then
                 actions.send_selected_to_qflist(prompt_bufnr)
                 actions.open_qflist()
+                print(action_state.get_current_picker(prompt_bufnr))
             else
                 actions.file_edit(prompt_bufnr)
             end
@@ -38,6 +39,7 @@ return {
                 '.webp$',
                 '.uproject$',
                 '-workspace$',
+                'node_modules',
             },
             layout_config = { prompt_position = 'top' },
             layout_strategy = 'horizontal',

nvim/lua/plugins/treesitter.lua

@@ -11,6 +11,7 @@ return {
                 'c_sharp',
                 'comment',
                 'css',
+                'gdscript',
                 'gitignore',
                 'html',
                 'java',
@@ -43,5 +44,5 @@ return {
         -- require('nvim-treesitter.install').prefer_git = true
         -- TSUpdate
     end,
-    lazy = false,
+    -- lazy = false,
 }

test.json

@@ -0,0 +1,3 @@
+{
+    "test_key": "AOjVpTKShHk/GNvUltiWHtCyEJplup2nMmdl8/L2Aao="
+}

tmux.conf

@@ -16,7 +16,7 @@ set-option -g prefix C-Space
 bind \\ split-window -h -c "#{pane_current_path}"
 bind - split-window -v -c "#{pane_current_path}"
 bind -n C-M-\\ split-window -h -c "#{pane_current_path}"
-bind -n C-M-- split-window -v -c "#{pane_current_path}"
+bind -n C-M-_ split-window -v -c "#{pane_current_path}"
 unbind '"'
 unbind %