From a0c6e1d8d989f13bdd6bdbe20f2269048f8bb738 Mon Sep 17 00:00:00 2001 From: Skladnayazebra Date: Sat, 1 Nov 2025 08:22:34 +0100 Subject: add user@host when in SSH --- zsh/prompt.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh index e041644..66f6010 100644 --- a/zsh/prompt.zsh +++ b/zsh/prompt.zsh @@ -22,9 +22,9 @@ PS_NODE="" PS_ERR="%0(?..%K{red}(%?%)%k)"; PS_GIT='%K{blue}$vcs_info_msg_0_%k' PS_USER='%K{blue}[%n@%M] %k' +PS_SSH='%K{green} ${SSH_TTY:+[%n@%M]}%k' PS_DIR='%K{green}  %1~ %k' - get_pkg_manager() { if [[ -f yarn.lock ]]; then echo " " @@ -41,5 +41,5 @@ precmd() { vcs_info PS_NODE="$(get_pkg_manager)" - PROMPT="%B$PS_ERR$PS_DIR$PS_GIT$PS_NODE %# %b" + PROMPT="%B$PS_ERR$PS_SSH$PS_DIR$PS_GIT$PS_NODE %# %b" } -- cgit v1.3.1 From 8a24e6630236f63086602a54bae93cb2af03d266 Mon Sep 17 00:00:00 2001 From: Skladnayazebra Date: Sun, 2 Nov 2025 20:04:41 +0100 Subject: Add shortcuts for fugitive --- nvim/init.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nvim/init.lua b/nvim/init.lua index eebfc1e..2075aee 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -10,6 +10,16 @@ vim.cmd([[colorscheme gruvbox]]) vim.keymap.set('n', 'gl', vim.diagnostic.open_float, { noremap = true, silent = true }) vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { noremap = true, silent = true }) vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, { noremap = true, silent = true }) + +-- Fugitive shortcuts +vim.keymap.set('n', 'gd', ':Gvdiffsplit', { noremap = true, silent = true }) +-- opens git fugitive status in a new tab (gs is for Git Status) +vim.keymap.set('n', 'gs', ':tab Git', { noremap = true, silent = true }) +-- opens blame mode. Navigate everywhere with +vim.keymap.set('n', 'gb', ':Git blame', { noremap = true, silent = true }) +-- from fugitive version of file, takes you back to HEAD +vim.keymap.set('n', 'ge', ':Gedit', { noremap = true, silent = true }) + vim.diagnostic.config({ virtual_text = true, }) -- cgit v1.3.1 From 9139fa5484c4af413690cd3620bf02e8f72a3fe3 Mon Sep 17 00:00:00 2001 From: Skladnayazebra Date: Sun, 2 Nov 2025 20:07:29 +0100 Subject: Add shortcut for lazy.nvim --- nvim/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nvim/init.lua b/nvim/init.lua index 2075aee..42553dd 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -11,6 +11,9 @@ vim.keymap.set('n', 'gl', vim.diagnostic.open_float, { noremap = true, silent = vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { noremap = true, silent = true }) vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, { noremap = true, silent = true }) +-- la - for LAzy +vim.keymap.set('n', 'la', ':Lazy', { noremap = true, silent = true }) + -- Fugitive shortcuts vim.keymap.set('n', 'gd', ':Gvdiffsplit', { noremap = true, silent = true }) -- opens git fugitive status in a new tab (gs is for Git Status) -- cgit v1.3.1 From 147f27d8f2b1d083a4ee3bc61f0b21157ab289fa Mon Sep 17 00:00:00 2001 From: Skladnayazebra Date: Sun, 2 Nov 2025 20:08:05 +0100 Subject: update fzf keybinds So they don't mess with new git binds --- nvim/lua/config/fzf.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nvim/lua/config/fzf.lua b/nvim/lua/config/fzf.lua index ef85a94..35e9c88 100644 --- a/nvim/lua/config/fzf.lua +++ b/nvim/lua/config/fzf.lua @@ -2,8 +2,8 @@ require('fzf-lua').setup({}) local opts = { silent = true } -vim.keymap.set('n', 'f', ':FzfLua global', opts) +vim.keymap.set('n', 'o', ':FzfLua global', opts) -- o means Open vim.keymap.set('n', 'r', ':FzfLua lsp_references', opts) -vim.keymap.set('n', 'g', ':FzfLua live_grep', opts) +vim.keymap.set('n', 'f', ':FzfLua live_grep', opts) -- f means Find vim.keymap.set('n', 'b', ':FzfLua buffers', opts) vim.keymap.set('n', '?', ':FzfLua keymaps', opts) -- cgit v1.3.1 From 3c5c2459610bddf567f6333723baf9fc03bdd889 Mon Sep 17 00:00:00 2001 From: Skladnayazebra Date: Sun, 2 Nov 2025 20:10:40 +0100 Subject: Update deps --- nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index c1ecdc1..8a481da 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -7,7 +7,7 @@ "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" }, "lazy.nvim": { "branch": "main", "commit": "f0f5bbb9e5bfae5e6468f9359ffea3d151418176" }, "lazygit.nvim": { "branch": "main", "commit": "2305deed25bc61b866d5d39189e9105a45cf1cfb" }, - "nvim-lspconfig": { "branch": "master", "commit": "87d30189b24caa496b54affd65594a309ac6d929" }, + "nvim-lspconfig": { "branch": "master", "commit": "a89bfcfd0e44f898341ac8a80ba83ccf6218bef3" }, "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" }, -- cgit v1.3.1 From ef4001a6b8b037a89c4cc5725279dcc16d828af5 Mon Sep 17 00:00:00 2001 From: Skladnayazebra Date: Sun, 2 Nov 2025 20:18:31 +0100 Subject: Add new navigation hotkeys --- nvim/init.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nvim/init.lua b/nvim/init.lua index 42553dd..89a8925 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -7,11 +7,18 @@ vim.o.number = true vim.o.signcolumn = "yes" vim.cmd([[colorscheme gruvbox]]) +-- easier window navigation +vim.keymap.set('n', '', 'h', { noremap = true, silent = true }) +vim.keymap.set('n', '', 'j', { noremap = true, silent = true }) +vim.keymap.set('n', '', 'k', { noremap = true, silent = true }) +vim.keymap.set('n', '', 'l', { noremap = true, silent = true }) + +-- LSP binds vim.keymap.set('n', 'gl', vim.diagnostic.open_float, { noremap = true, silent = true }) vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { noremap = true, silent = true }) vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, { noremap = true, silent = true }) --- la - for LAzy +-- la - for LAzy (plugin manager) vim.keymap.set('n', 'la', ':Lazy', { noremap = true, silent = true }) -- Fugitive shortcuts -- cgit v1.3.1 From 0db2ee3657a41eae69b9f35accfed82bf1d4ba7e Mon Sep 17 00:00:00 2001 From: Skladnayazebra Date: Sun, 2 Nov 2025 20:26:49 +0100 Subject: Instead of using tab, open Fugitive at this window This helps preventing tab spamming --- nvim/init.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nvim/init.lua b/nvim/init.lua index 89a8925..f12a30a 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -12,6 +12,7 @@ vim.keymap.set('n', '', 'h', { noremap = true, silent = true }) vim.keymap.set('n', '', 'j', { noremap = true, silent = true }) vim.keymap.set('n', '', 'k', { noremap = true, silent = true }) vim.keymap.set('n', '', 'l', { noremap = true, silent = true }) +vim.keymap.set('n', '', 'c', { noremap = true, silent = true }) -- LSP binds vim.keymap.set('n', 'gl', vim.diagnostic.open_float, { noremap = true, silent = true }) @@ -22,9 +23,10 @@ vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, { noremap = true, silent = tr vim.keymap.set('n', 'la', ':Lazy', { noremap = true, silent = true }) -- Fugitive shortcuts +-- opens current file diff as vertical split vim.keymap.set('n', 'gd', ':Gvdiffsplit', { noremap = true, silent = true }) --- opens git fugitive status in a new tab (gs is for Git Status) -vim.keymap.set('n', 'gs', ':tab Git', { noremap = true, silent = true }) +-- opens git fugitive status and make it the only visible window (gs is for Git Status) +vim.keymap.set('n', 'gs', ':Gito', { noremap = true, silent = true }) -- opens blame mode. Navigate everywhere with vim.keymap.set('n', 'gb', ':Git blame', { noremap = true, silent = true }) -- from fugitive version of file, takes you back to HEAD -- cgit v1.3.1 From b58b0df3dd531c52cd4c4fce081851b90c2c9797 Mon Sep 17 00:00:00 2001 From: Skladnayazebra Date: Sun, 2 Nov 2025 21:18:07 +0100 Subject: Fix missing :nohl bind, add buffer write bind --- nvim/init.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nvim/init.lua b/nvim/init.lua index f12a30a..6384e83 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -12,7 +12,12 @@ vim.keymap.set('n', '', 'h', { noremap = true, silent = true }) vim.keymap.set('n', '', 'j', { noremap = true, silent = true }) vim.keymap.set('n', '', 'k', { noremap = true, silent = true }) vim.keymap.set('n', '', 'l', { noremap = true, silent = true }) +-- by default clears search highlight, so we remap it +vim.keymap.set('n', '', ':nohl', { noremap = true, silent = true }) +-- quick window close vim.keymap.set('n', '', 'c', { noremap = true, silent = true }) +-- quick file write +vim.keymap.set('n', 'w', ':w', { noremap = true, silent = true }) -- LSP binds vim.keymap.set('n', 'gl', vim.diagnostic.open_float, { noremap = true, silent = true }) -- cgit v1.3.1 From 310444ee9a4dfac0621ddda255a9ffc05a616d13 Mon Sep 17 00:00:00 2001 From: Skladnayazebra Date: Sun, 2 Nov 2025 21:43:57 +0100 Subject: Remove lazygit.nvim --- nvim/lua/config/lazy.lua | 1 - nvim/lua/config/lazygit.lua | 23 ----------------------- 2 files changed, 24 deletions(-) delete mode 100644 nvim/lua/config/lazygit.lua diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua index 913bacb..18fb522 100644 --- a/nvim/lua/config/lazy.lua +++ b/nvim/lua/config/lazy.lua @@ -58,7 +58,6 @@ require("lazy").setup({ opts = {}, }, { "prettier/vim-prettier" }, - require("config.lazygit"), require("config.blink-cmp"), }, install = { colorscheme = { "gruvbox" } }, diff --git a/nvim/lua/config/lazygit.lua b/nvim/lua/config/lazygit.lua deleted file mode 100644 index e1c548e..0000000 --- a/nvim/lua/config/lazygit.lua +++ /dev/null @@ -1,23 +0,0 @@ -vim.g.lazygit_floating_window_scaling_factor = 1 -vim.g.lazygit_floating_window_border_chars = {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '} - -return { - "kdheepak/lazygit.nvim", - lazy = true, - cmd = { - "LazyGit", - "LazyGitConfig", - "LazyGitCurrentFile", - "LazyGitFilter", - "LazyGitFilterCurrentFile", - }, - -- optional for floating window border decoration - dependencies = { - "nvim-lua/plenary.nvim", - }, - -- setting the keybinding for LazyGit with 'keys' is recommended in - -- order to load the plugin when the command is run for the first time - keys = { - { "lg", "LazyGit", desc = "LazyGit" } - } -} -- cgit v1.3.1