From c6fe1b4df23bbc8016b396d7a288b8ea2af324ce Mon Sep 17 00:00:00 2001 From: Jaroslaw Konik Date: Sat, 22 Jun 2024 11:37:03 +0200 Subject: [PATCH 1/3] rn --- kitty/{theme.conf => catppuccin-mocha.conf} | 0 kitty/kitty.conf | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename kitty/{theme.conf => catppuccin-mocha.conf} (100%) diff --git a/kitty/theme.conf b/kitty/catppuccin-mocha.conf similarity index 100% rename from kitty/theme.conf rename to kitty/catppuccin-mocha.conf diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 2dac6ce..aeed464 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -5,7 +5,7 @@ tab_bar_min_tabs 1 tab_powerline_style slanted map ctrl+g kitten hints --type=linenum --linenum-action=background sh -c "nvim_remote +{line} {path}" tab_bar_edge top -include ./theme.conf +include ./catppuccin-mocha.conf map shift+f1 new_tab map shift+f2 new_tab_with_cwd map ctrl+shift+w no_op From 5d45cd9158ab4e5ed49fbc3dcb8b14159d5a3ff6 Mon Sep 17 00:00:00 2001 From: Jaroslaw Konik Date: Thu, 4 Jul 2024 13:16:03 +0200 Subject: [PATCH 2/3] Revert "update" This reverts commit ee8453505ca04d2f34ccb15a06620ec5b6c98aa3. --- init.lua | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/init.lua b/init.lua index 23cdb74..8dc4f82 100644 --- a/init.lua +++ b/init.lua @@ -81,7 +81,21 @@ require("lazy").setup({ end }, - { 'akinsho/bufferline.nvim', version = "*", dependencies = 'nvim-tree/nvim-web-devicons', opts = {} }, + { + 'romgrk/barbar.nvim', + dependencies = { + 'lewis6991/gitsigns.nvim', + 'nvim-tree/nvim-web-devicons', + }, + init = function() vim.g.barbar_auto_setup = false end, + opts = { + no_name_title = "unnamed", + icons = { + pinned = { button = '', filename = true }, + } + }, + version = '^1.0.0', + }, { "kylechui/nvim-surround", version = "*", @@ -178,7 +192,7 @@ require("lazy").setup({ vim.cmd.colorscheme "catppuccin-mocha" end }, - { "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" } }, + { "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" } }, { 'mrcjkb/rustaceanvim', version = '^4', @@ -212,7 +226,7 @@ require("lazy").setup({ 'linrongbin16/lsp-progress.nvim', opts = {} }, - { "cappyzawa/trim.nvim", opts = {} }, + { "cappyzawa/trim.nvim", opts = {} }, { "kdheepak/lazygit.nvim", cmd = { @@ -409,6 +423,17 @@ vim.keymap.set("n", "rr", ":MoltenReevaluateCell", vim.keymap.set("v", "r", ":MoltenEvaluateVisualgv", { silent = true, desc = "evaluate visual selection" }) +local opts = { noremap = true, silent = true } +local map = vim.api.nvim_set_keymap +map('n', 'bdo', "BufferCloseAllButCurrentOrPinned", opts); +map('n', 'bp', 'BufferPin', opts) +map('n', '', 'BufferPrevious', opts) +map('n', '', 'BufferNext', opts) +map('n', '', 'BufferMovePrevious', opts) +map('n', '', 'BufferMoveNext', opts) +map('n', '', 'BufferClose', opts) +map('n', '', 'BufferPick', opts) + vim.keymap.set('n', 'fg', 'lua require("spectre").toggle()', { desc = "Toggle Spectre" }) From 472bc66386472a4a9aa445438bcd270cc4ae77e1 Mon Sep 17 00:00:00 2001 From: Jaroslaw Konik Date: Thu, 4 Jul 2024 14:25:44 +0200 Subject: [PATCH 3/3] update --- init.lua | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/init.lua b/init.lua index 8dc4f82..7a11833 100644 --- a/init.lua +++ b/init.lua @@ -36,6 +36,33 @@ if vim.g.vscode then end }, }) + local vscode = require('vscode') + + local opts = { noremap = true, silent = true } + vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts) + vim.keymap.set('n', 'gd', function() + vscode.call("editor.action.revealDefinition") + end, opts) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts) + vim.keymap.set('n', '', vim.lsp.buf.signature_help, opts) + vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, opts) + vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, opts) + vim.keymap.set('n', 'wl', function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, opts) + vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, opts) + vim.keymap.set('n', 'rn', vim.lsp.buf.rename, opts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts) + vim.keymap.set('n', 'k', vim.diagnostic.open_float, opts) + vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) + vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) + vim.keymap.set('n', 'q', vim.diagnostic.setloclist, opts) + vim.keymap.set('n', 'ca', function() + vscode.call("editor.action.quickFix") + end + , opts) + return end