From 05de77e93f2d37806543b4f31ec7d5b3754d530e Mon Sep 17 00:00:00 2001 From: srdusr Date: Wed, 7 Jun 2023 22:47:15 +0200 Subject: Changed comment for to exit insert-mode to "jk" --- lua/user/keys.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/user/keys.lua b/lua/user/keys.lua index 75df193..b3db14a 100644 --- a/lua/user/keys.lua +++ b/lua/user/keys.lua @@ -19,7 +19,7 @@ vim.g.mapleader = ";" -- Repeat last command using `` instead of `.` NOTE: commented out in favour of "ggandor/flit.nvim" --map("n", "", ".") --- "jj" to exit insert-mode +-- "jk" to exit insert-mode map("i", "jk", "") -- Reload nvim config -- cgit v1.2.3 From 789098de2e2c240ca00be0127d22ae0dd6033586 Mon Sep 17 00:00:00 2001 From: srdusr Date: Wed, 7 Jun 2023 22:47:34 +0200 Subject: Trying different autocmds for tmuxstatus --- lua/user/mods.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lua/user/mods.lua b/lua/user/mods.lua index 64e90a7..a95f8cb 100644 --- a/lua/user/mods.lua +++ b/lua/user/mods.lua @@ -240,14 +240,28 @@ function M.update_tmux_status() vim.cmd("silent !tmux refresh-client -S") end +-- Add autocmd for +-- Add autocmd to check when tmux switches panes/windows vim.cmd([[ augroup TmuxStatus autocmd! "autocmd CursorHold * lua require("user.mods").update_tmux_status() autocmd VimEnter * lua require("user.mods").update_tmux_status() autocmd ModeChanged * lua require("user.mods").update_tmux_status() + augroup END ]]) + --autocmd InsertLeave,InsertEnter * lua require("user.mods").update_tmux_status() + --autocmd BufEnter * lua require("user.mods").update_tmux_status() + --autocmd VimResized * lua require("user.mods").update_tmux_status() + --autocmd FocusGained * lua require("user.mods").update_tmux_status() + --autocmd FocusLost * lua require("user.mods").update_tmux_status() + --autocmd WinEnter,WinLeave * lua require("user.mods").update_tmux_status() + --autocmd CmdwinEnter,CmdwinLeave * lua require("user.mods").update_tmux_status()"autocmd VimResized * lua require("user.mods").update_tmux_status() + --autocmd FocusGained * lua require("user.mods").update_tmux_status() + --autocmd FocusLost * lua require("user.mods").update_tmux_status() + --autocmd WinEnter,WinLeave * lua require("user.mods").update_tmux_status() + --autocmd CmdwinEnter,CmdwinLeave * lua require("user.mods").update_tmux_status() -------------------------------------------------- return M -- cgit v1.2.3 From 6aa8b858087d06fa583e16248f0a50c510786bf5 Mon Sep 17 00:00:00 2001 From: srdusr Date: Fri, 9 Jun 2023 23:11:51 +0200 Subject: Add aoutocmd Insertleave,InsertEnter for TmuxStatus --- lua/user/mods.lua | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lua/user/mods.lua b/lua/user/mods.lua index a95f8cb..150af29 100644 --- a/lua/user/mods.lua +++ b/lua/user/mods.lua @@ -245,23 +245,19 @@ end vim.cmd([[ augroup TmuxStatus autocmd! - "autocmd CursorHold * lua require("user.mods").update_tmux_status() + autocmd InsertLeave,InsertEnter * lua require("user.mods").update_tmux_status() autocmd VimEnter * lua require("user.mods").update_tmux_status() autocmd ModeChanged * lua require("user.mods").update_tmux_status() - augroup END ]]) --autocmd InsertLeave,InsertEnter * lua require("user.mods").update_tmux_status() + --autocmd BufEnter * lua require("user.mods").update_tmux_status() --autocmd VimResized * lua require("user.mods").update_tmux_status() --autocmd FocusGained * lua require("user.mods").update_tmux_status() --autocmd FocusLost * lua require("user.mods").update_tmux_status() --autocmd WinEnter,WinLeave * lua require("user.mods").update_tmux_status() - --autocmd CmdwinEnter,CmdwinLeave * lua require("user.mods").update_tmux_status()"autocmd VimResized * lua require("user.mods").update_tmux_status() - --autocmd FocusGained * lua require("user.mods").update_tmux_status() - --autocmd FocusLost * lua require("user.mods").update_tmux_status() - --autocmd WinEnter,WinLeave * lua require("user.mods").update_tmux_status() --autocmd CmdwinEnter,CmdwinLeave * lua require("user.mods").update_tmux_status() -------------------------------------------------- return M -- cgit v1.2.3 From 0cdd139cb838e854b1cb4b5f06741d1011c9e610 Mon Sep 17 00:00:00 2001 From: srdusr Date: Fri, 9 Jun 2023 23:12:28 +0200 Subject: C-c to exit input field --- lua/plugins/toggleterm.lua | 165 ++++++++++++++++++++++----------------------- 1 file changed, 82 insertions(+), 83 deletions(-) diff --git a/lua/plugins/toggleterm.lua b/lua/plugins/toggleterm.lua index bc2df4b..2146dc3 100644 --- a/lua/plugins/toggleterm.lua +++ b/lua/plugins/toggleterm.lua @@ -1,63 +1,62 @@ local status_ok, toggleterm = pcall(require, "toggleterm") if not status_ok then - return + return end toggleterm.setup({ - --size = function(term) - -- if term.direction == "horizontal" then - -- return 12 - -- elseif term.direction == "vertical" then - -- return vim.o.columns * 0.3 - -- end - --end, - --size = 20, - open_mapping = [[tt]], + --size = function(term) + -- if term.direction == "horizontal" then + -- return 12 + -- elseif term.direction == "vertical" then + -- return vim.o.columns * 0.3 + -- end + --end, + --size = 20, + open_mapping = [[tt]], --autochdir = true, - hide_numbers = true, - shade_filetypes = {}, - shade_terminals = false, - shading_factor = 1, - start_in_insert = true, - insert_mappings = true, - persist_size = true, - direction = "float", - --direction = "vertical", - --direction = "horizontal", - close_on_exit = true, - shell = vim.o.shell, - highlights = { - -- highlights which map to a highlight group name and a table of it's values - -- NOTE: this is only a subset of values, any group placed here will be set for the terminal window split - Normal = { - background = "#000000", - }, - --float_opts = { - -- border = as.style.current.border, - -- winblend = 3, - --}, - size = function(term) - if term.direction == 'horizontal' then - return 15 - elseif term.direction == 'vertical' then - return math.floor(vim.o.columns * 0.4) - end - end, + hide_numbers = true, + shade_filetypes = {}, + shade_terminals = false, + shading_factor = 1, + start_in_insert = true, + insert_mappings = true, + persist_size = true, + direction = "float", + --direction = "vertical", + --direction = "horizontal", + close_on_exit = true, + shell = vim.o.shell, + highlights = { + -- highlights which map to a highlight group name and a table of it's values + -- NOTE: this is only a subset of values, any group placed here will be set for the terminal window split + Normal = { + background = "#000000", + }, + --float_opts = { + -- border = as.style.current.border, + -- winblend = 3, + --}, + size = function(term) + if term.direction == 'horizontal' then + return 15 + elseif term.direction == 'vertical' then + return math.floor(vim.o.columns * 0.4) + end + end, + }, + float_opts = { + width = 70, + height = 15, + winblend = 3, + border = "curved", + --winblend = 0, + highlights = { + border = "Normal", + background = "Normal", + }, }, - float_opts = { - width = 70, - height = 15, - winblend = 3, - border = "curved", - --winblend = 0, - highlights = { - border = "Normal", - background = "Normal", - }, - }, }) local mods = require("user.mods") local float_handler = function(term) - if not mods.empty(vim.fn.mapcheck('jk', 't')) then vim.keymap.del('t', 'jk', { buffer = term.bufnr }) vim.keymap.del('t', '', { buffer = term.bufnr }) @@ -65,14 +64,15 @@ local float_handler = function(term) end function _G.set_terminal_keymaps() - local opts = { noremap = true } - --local opts = {buffer = 0} - vim.api.nvim_buf_set_keymap(0, "t", "", [[]], opts) - vim.api.nvim_buf_set_keymap(0, "t", "jk", [[]], opts) - vim.api.nvim_buf_set_keymap(0, "t", "", [[h]], opts) - vim.api.nvim_buf_set_keymap(0, "t", "", [[j]], opts) - vim.api.nvim_buf_set_keymap(0, "t", "", [[k]], opts) - vim.api.nvim_buf_set_keymap(0, "t", "", [[l]], opts) + local opts = { noremap = true } + --local opts = {buffer = 0} + vim.api.nvim_buf_set_keymap(0, "t", "", [[]], opts) + vim.api.nvim_buf_set_keymap(0, "t", "", [[]], opts) + vim.api.nvim_buf_set_keymap(0, "t", "jk", [[]], opts) + vim.api.nvim_buf_set_keymap(0, "t", "", [[h]], opts) + vim.api.nvim_buf_set_keymap(0, "t", "", [[j]], opts) + vim.api.nvim_buf_set_keymap(0, "t", "", [[k]], opts) + vim.api.nvim_buf_set_keymap(0, "t", "", [[l]], opts) end -- if you only want these mappings for toggle term use term://*toggleterm#* instead @@ -108,48 +108,47 @@ local lazygit = Terminal:new({ }) function Lazygit_toggle() - -- cwd is the root of project. if cwd is changed, change the git. - local cwd = vim.fn.getcwd() - if cwd ~= Cur_cwd then - Cur_cwd = cwd - lazygit:close() - lazygit = Terminal:new({ - cmd = "zsh --login -c 'lazygit'", - dir = "git_dir", - direction = "float", - hidden = true, - on_open = float_handler, - float_opts = { - border = { '╒', '═', '╕', '│', '╛', '═', '╘', '│' }, - width = 150, - height = 40 - }, - }) - end - lazygit:toggle() + -- cwd is the root of project. if cwd is changed, change the git. + local cwd = vim.fn.getcwd() + if cwd ~= Cur_cwd then + Cur_cwd = cwd + lazygit:close() + lazygit = Terminal:new({ + cmd = "zsh --login -c 'lazygit'", + dir = "git_dir", + direction = "float", + hidden = true, + on_open = float_handler, + float_opts = { + border = { '╒', '═', '╕', '│', '╛', '═', '╘', '│' }, + width = 150, + height = 40 + }, + }) + end + lazygit:toggle() end local node = Terminal:new({ cmd = "node", hidden = true }) function _NODE_TOGGLE() - node:toggle() + node:toggle() end local ncdu = Terminal:new({ cmd = "ncdu", hidden = true }) function _NCDU_TOGGLE() - ncdu:toggle() + ncdu:toggle() end local htop = Terminal:new({ cmd = "htop", hidden = true }) function _HTOP_TOGGLE() - htop:toggle() + htop:toggle() end local python = Terminal:new({ cmd = "python", hidden = true }) function _PYTHON_TOGGLE() - python:toggle() + python:toggle() end - -- cgit v1.2.3 From 38deb400176f20de39f37249864a14532ab562f8 Mon Sep 17 00:00:00 2001 From: srdusr Date: Fri, 9 Jun 2023 23:13:37 +0200 Subject: Comment out C-c because is default --- lua/plugins/telescope.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index e74f2e0..d6d7233 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -58,7 +58,7 @@ require('telescope').setup({ [""] = actions.move_selection_next, [""] = actions.move_selection_previous, - [""] = actions.close, + --[""] = actions.close, [""] = actions.close, -- close w/ one esc --[""] = "close", -- close w/ one esc [""] = actions.which_key, -- keys from pressing -- cgit v1.2.3 From 99908a5262a660f85f140f00f8d207bbd1274d45 Mon Sep 17 00:00:00 2001 From: srdusr Date: Fri, 9 Jun 2023 23:14:08 +0200 Subject: Comment out C-x mapped to C-c --- lua/user/keys.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/user/keys.lua b/lua/user/keys.lua index b3db14a..a8c462a 100644 --- a/lua/user/keys.lua +++ b/lua/user/keys.lua @@ -84,7 +84,7 @@ map("t", "", "") map("t", "", "") map("t", "", "") map("t", "", "") -map("t", "", "") +--map("t", "", "") --map("n", "", "") --map("n", "", ":call MyFunc(v:count)") -- cgit v1.2.3 From 1cbc6a73fbe952354cb7453ab5aefedeae85cbf1 Mon Sep 17 00:00:00 2001 From: srdusr Date: Mon, 12 Jun 2023 20:21:38 +0200 Subject: Add autocmd bufenter for tmuxstatus --- lua/user/mods.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lua/user/mods.lua b/lua/user/mods.lua index 150af29..0438472 100644 --- a/lua/user/mods.lua +++ b/lua/user/mods.lua @@ -247,17 +247,18 @@ vim.cmd([[ autocmd! autocmd InsertLeave,InsertEnter * lua require("user.mods").update_tmux_status() autocmd VimEnter * lua require("user.mods").update_tmux_status() + autocmd BufEnter * lua require("user.mods").update_tmux_status() autocmd ModeChanged * lua require("user.mods").update_tmux_status() augroup END ]]) --autocmd InsertLeave,InsertEnter * lua require("user.mods").update_tmux_status() - --autocmd BufEnter * lua require("user.mods").update_tmux_status() + + --autocmd WinEnter,WinLeave * lua require("user.mods").update_tmux_status() --autocmd VimResized * lua require("user.mods").update_tmux_status() --autocmd FocusGained * lua require("user.mods").update_tmux_status() --autocmd FocusLost * lua require("user.mods").update_tmux_status() - --autocmd WinEnter,WinLeave * lua require("user.mods").update_tmux_status() --autocmd CmdwinEnter,CmdwinLeave * lua require("user.mods").update_tmux_status() -------------------------------------------------- return M -- cgit v1.2.3 From d721ca2a2dad61fe7e5bde7900435d11f9b46bae Mon Sep 17 00:00:00 2001 From: srdusr Date: Mon, 12 Jun 2023 20:22:27 +0200 Subject: Add autocmd winenter,winleave for tmuxstatus --- lua/user/mods.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/user/mods.lua b/lua/user/mods.lua index 0438472..7ce18c4 100644 --- a/lua/user/mods.lua +++ b/lua/user/mods.lua @@ -249,11 +249,13 @@ vim.cmd([[ autocmd VimEnter * lua require("user.mods").update_tmux_status() autocmd BufEnter * lua require("user.mods").update_tmux_status() autocmd ModeChanged * lua require("user.mods").update_tmux_status() + autocmd WinEnter,WinLeave * lua require("user.mods").update_tmux_status() augroup END ]]) --autocmd InsertLeave,InsertEnter * lua require("user.mods").update_tmux_status() --autocmd BufEnter * lua require("user.mods").update_tmux_status() + --autocmd WinEnter,WinLeave * lua require("user.mods").update_tmux_status() --autocmd WinEnter,WinLeave * lua require("user.mods").update_tmux_status() --autocmd VimResized * lua require("user.mods").update_tmux_status() -- cgit v1.2.3 From e608851f09dfc82a48d8492200f09b4dc006d815 Mon Sep 17 00:00:00 2001 From: srdusr Date: Mon, 12 Jun 2023 22:48:41 +0200 Subject: map space to za to open fold --- lua/user/keys.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/user/keys.lua b/lua/user/keys.lua index a8c462a..e5e7099 100644 --- a/lua/user/keys.lua +++ b/lua/user/keys.lua @@ -220,7 +220,7 @@ end, { silent = true }) --utils.map("n", "", "&foldlevel ? 'zM' : 'zR'", { expr = true }) -- Use space to toggle fold ---utils.map("n", "", "za") +map("n", "", "za") -- Make a copy of current file --vim.cmd([[ -- cgit v1.2.3 From 961e785466625027a0689d6f8a658e47c7d54aae Mon Sep 17 00:00:00 2001 From: srdusr Date: Tue, 13 Jun 2023 23:59:34 +0200 Subject: Moved comment for tmuxstatus todo --- lua/user/mods.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/user/mods.lua b/lua/user/mods.lua index 7ce18c4..725ca6e 100644 --- a/lua/user/mods.lua +++ b/lua/user/mods.lua @@ -240,8 +240,6 @@ function M.update_tmux_status() vim.cmd("silent !tmux refresh-client -S") end --- Add autocmd for --- Add autocmd to check when tmux switches panes/windows vim.cmd([[ augroup TmuxStatus autocmd! @@ -253,6 +251,8 @@ vim.cmd([[ augroup END ]]) +-- Add autocmd for +-- Add autocmd to check when tmux switches panes/windows --autocmd InsertLeave,InsertEnter * lua require("user.mods").update_tmux_status() --autocmd BufEnter * lua require("user.mods").update_tmux_status() --autocmd WinEnter,WinLeave * lua require("user.mods").update_tmux_status() -- cgit v1.2.3 From 12661fde658e65d4d5fa9644b4106008915b5c8f Mon Sep 17 00:00:00 2001 From: srdusr Date: Thu, 22 Jun 2023 18:06:07 +0200 Subject: Fixed error message for fidget by adding legacy checkout tag --- lua/user/pack.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lua/user/pack.lua b/lua/user/pack.lua index 1428a18..e416baf 100644 --- a/lua/user/pack.lua +++ b/lua/user/pack.lua @@ -295,14 +295,16 @@ return packer.startup(function(use) }) end }) - use("j-hui/fidget.nvim") -- UI to show nvim-lsp progress - use { "simrat39/symbols-outline.nvim", -- + use({"j-hui/fidget.nvim", + tag = 'legacy', + }) -- UI to show nvim-lsp progress + use({ "simrat39/symbols-outline.nvim", -- config = function() require("symbols-outline").setup({ auto_close = true, }) end - } + }) use({ "kosayoda/nvim-lightbulb", -- requires = "antoinemadec/FixCursorHold.nvim", -- cgit v1.2.3 From 9af48ad7335bc3072aec5592d08c28f233f823c4 Mon Sep 17 00:00:00 2001 From: srdusr Date: Thu, 22 Jun 2023 18:06:23 +0200 Subject: Uncommented out prettierd --- lua/plugins/lsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index c9ccc55..ffa7837 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -312,7 +312,7 @@ null_ls.setup { "css", "scss", "less", "graphql", "vue", "svelte" }, extra_args = { "--single-quote", "--tab-width 4", "--print-width 200" }, }), - --null_ls.builtins.formatting.prettierd, + builtins.formatting.prettierd, builtins.formatting.rustfmt, builtins.formatting.stylua, builtins.formatting.trim_whitespace, -- cgit v1.2.3 From 45569f8ce74c797721d737f61b292a0ae2ad45af Mon Sep 17 00:00:00 2001 From: srdusr Date: Thu, 22 Jun 2023 18:06:41 +0200 Subject: Removed keymaps = {}, --- lua/plugins/gitsigns.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua index c7b0726..8fbdae1 100644 --- a/lua/plugins/gitsigns.lua +++ b/lua/plugins/gitsigns.lua @@ -1,5 +1,4 @@ require("gitsigns").setup({ - keymaps = {}, signs = { --add = { -- hl = "GitSignsAdd", -- cgit v1.2.3