diff --git a/nvim/lua/custom_commands.lua b/nvim/lua/custom_commands.lua index 28d8752..6af6f4d 100644 --- a/nvim/lua/custom_commands.lua +++ b/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', - 'ir', - ':FindAndReplace ', - { noremap = true } -) diff --git a/nvim/lua/plugins/gitsigns.lua b/nvim/lua/plugins/gitsigns.lua index 1ec42f6..7492065 100644 --- a/nvim/lua/plugins/gitsigns.lua +++ b/nvim/lua/plugins/gitsigns.lua @@ -29,19 +29,20 @@ return { end) -- Actions - map('n', 'hs', gitsigns.stage_hunk) - map('n', 'hr', gitsigns.reset_hunk) - map('v', 'hs', function() gitsigns.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end) - map('v', 'hr', function() gitsigns.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end) - map('n', 'hS', gitsigns.stage_buffer) - map('n', 'hu', gitsigns.undo_stage_hunk) - map('n', 'hR', gitsigns.reset_buffer) - map('n', 'hp', gitsigns.preview_hunk) - map('n', 'hb', function() gitsigns.blame_line{full=true} end) - map('n', 'tb', gitsigns.toggle_current_line_blame) - map('n', 'hd', gitsigns.diffthis) - map('n', 'hD', function() gitsigns.diffthis('~') end) - map('n', 'td', gitsigns.toggle_deleted) + map('n', 'gs', gitsigns.stage_hunk) + map('n', 'gu', gitsigns.undo_stage_hunk) + map('n', 'gr', gitsigns.reset_hunk) + map('v', 'gs', function() gitsigns.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end) + map('v', 'gu', function() gitsigns.undo_stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end) + map('v', 'gr', function() gitsigns.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end) + map('n', 'gS', gitsigns.stage_buffer) + map('n', 'gR', gitsigns.reset_buffer) + map('n', 'gp', gitsigns.preview_hunk) + map('n', 'gb', function() gitsigns.blame_line{full=true} end) + map('n', 'gtb', gitsigns.toggle_current_line_blame) + map('n', 'gd', gitsigns.diffthis) + map('n', 'gD', function() gitsigns.diffthis('~') end) + map('n', 'gtd', gitsigns.toggle_deleted) -- Text object map({'o', 'x'}, 'ih', ':Gitsigns select_hunk') diff --git a/nvim/lua/plugins/gruvbox.lua b/nvim/lua/plugins/gruvbox.lua index c05c959..a25e987 100644 --- a/nvim/lua/plugins/gruvbox.lua +++ b/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') diff --git a/nvim/lua/plugins/mason.lua b/nvim/lua/plugins/mason.lua index 0ef080e..5485f82 100644 --- a/nvim/lua/plugins/mason.lua +++ b/nvim/lua/plugins/mason.lua @@ -44,18 +44,17 @@ return { 'ansiblels', 'arduino_language_server', 'bashls', - 'clangd', + 'clangd', -- C/C++ -- 'hadolint', -- Dockerfile linting - 'intelephense', - -- 'jdtls', -- java + 'intelephense', -- PHP + '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 = { diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 0b7746a..0aeabb7 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/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', diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua index 0e124b9..b9ae81b 100644 --- a/nvim/lua/plugins/treesitter.lua +++ b/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, } diff --git a/test.json b/test.json new file mode 100644 index 0000000..2f0166a --- /dev/null +++ b/test.json @@ -0,0 +1,3 @@ +{ + "test_key": "AOjVpTKShHk/GNvUltiWHtCyEJplup2nMmdl8/L2Aao=" +} diff --git a/tmux.conf b/tmux.conf index 2b1448b..8ee6ef8 100644 --- a/tmux.conf +++ b/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 %