From 0f1a4d33d1a03e769e37131d3a3617abbec0aca4 Mon Sep 17 00:00:00 2001 From: aleidk Date: Thu, 30 Nov 2023 20:16:16 -0300 Subject: [PATCH] update dots --- config/nvim/lua/aleidk/keymaps.lua | 2 ++ config/nvim/lua/aleidk/plugins/bufferline.lua | 1 + config/nvim/lua/aleidk/plugins/formatter.lua | 2 ++ config/nvim/lua/aleidk/plugins/git.lua | 3 +++ config/nvim/lua/aleidk/plugins/lualine.lua | 13 +++++++++++-- config/nvim/lua/aleidk/plugins/telescope.lua | 2 +- config/tmux/tmux.conf | 1 + config/zsh/zshrc | 3 ++- exports/dnf.txt | 1 + 9 files changed, 24 insertions(+), 4 deletions(-) diff --git a/config/nvim/lua/aleidk/keymaps.lua b/config/nvim/lua/aleidk/keymaps.lua index b9fa2b1..0e1b109 100644 --- a/config/nvim/lua/aleidk/keymaps.lua +++ b/config/nvim/lua/aleidk/keymaps.lua @@ -62,3 +62,5 @@ vim.keymap.set({ "n", "v" }, "p", [["+p]], default("Paste from system cl vim.keymap.set("v", "J", ":m '>+1gv=gv", default("Move selection down")) vim.keymap.set("v", "K", ":m '<-2gv=gv", default("Move selection up")) vim.keymap.set("n", "uI", fixIdentation, default("Fix identation")) + +vim.keymap.set("n", "uh", ":nohl", default("Remove search highlight")) diff --git a/config/nvim/lua/aleidk/plugins/bufferline.lua b/config/nvim/lua/aleidk/plugins/bufferline.lua index 83159bc..e863744 100644 --- a/config/nvim/lua/aleidk/plugins/bufferline.lua +++ b/config/nvim/lua/aleidk/plugins/bufferline.lua @@ -5,6 +5,7 @@ return { { "bp", "BufferLineTogglePin", desc = "Toggle pin" }, { "bP", "BufferLineGroupClose ungrouped", desc = "Close non-pinned buffers" }, { "bO", "BufferLineCloseOthers", desc = "Close non focused buffers" }, + { "bA", "bufdo bd", desc = "Close all buffers" }, { "bh", "BufferLineMovePrev", desc = "Move buffer to right" }, { "bl", "BufferLineMoveNext", desc = "Move buffer to left" }, { "", "BufferLineCyclePrev", desc = "Prev buffer" }, diff --git a/config/nvim/lua/aleidk/plugins/formatter.lua b/config/nvim/lua/aleidk/plugins/formatter.lua index b48f49b..76a2591 100644 --- a/config/nvim/lua/aleidk/plugins/formatter.lua +++ b/config/nvim/lua/aleidk/plugins/formatter.lua @@ -15,6 +15,8 @@ return { javascriptreact = { { "prettierd", "prettier" } }, typescriptreact = { { "prettierd", "prettier" } }, css = { { "prettierd", "prettier" } }, + scss = { { "prettierd", "prettier" } }, + html = { "prettierd" }, sh = { "shfmt" }, -- Use the "_" filetype to run formatters on filetypes that don't -- have other formatters configured. diff --git a/config/nvim/lua/aleidk/plugins/git.lua b/config/nvim/lua/aleidk/plugins/git.lua index d157009..fc75c77 100644 --- a/config/nvim/lua/aleidk/plugins/git.lua +++ b/config/nvim/lua/aleidk/plugins/git.lua @@ -38,6 +38,9 @@ return { { "tpope/vim-fugitive", event = "VeryLazy", + keys = { + { "gL", ":Git log -p -- %", desc = "Log of open file" }, + }, }, { diff --git a/config/nvim/lua/aleidk/plugins/lualine.lua b/config/nvim/lua/aleidk/plugins/lualine.lua index de82f6b..81c8889 100644 --- a/config/nvim/lua/aleidk/plugins/lualine.lua +++ b/config/nvim/lua/aleidk/plugins/lualine.lua @@ -66,12 +66,21 @@ return { hint = icons.diagnostics.Hint, }, }, + { + -- Macro recording status + function() + return require("noice").api.status.mode.get() + end, + cond = function() + return package.loaded["noice"] and require("noice").api.status.mode.has() + end, + }, }, lualine_x = { - {}, + { "searchcount" }, }, lualine_y = { - { "location", padding = 0 }, + { "location" }, { "progress", fmt = position_scrollbar, diff --git a/config/nvim/lua/aleidk/plugins/telescope.lua b/config/nvim/lua/aleidk/plugins/telescope.lua index 8279782..cb980a2 100644 --- a/config/nvim/lua/aleidk/plugins/telescope.lua +++ b/config/nvim/lua/aleidk/plugins/telescope.lua @@ -80,7 +80,7 @@ return { -- Git vim.keymap.set("n", "gb", builtin.git_branches, { desc = "Change branch" }) - vim.keymap.set("n", "gL", builtin.git_bcommits, { desc = "Commits of buffer" }) + vim.keymap.set("n", "gc", builtin.git_bcommits, { desc = "Commits of buffer" }) -- Diagnosticos -- Disabled, handle by trouble diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index d204edf..1cf2c02 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -83,6 +83,7 @@ set -g @plugin 'christoomey/vim-tmux-navigator' set -g @plugin 'sainnhe/tmux-fzf' set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-continuum' +set -g @plugin '27medkamal/tmux-session-wizard' ## Plugin Config diff --git a/config/zsh/zshrc b/config/zsh/zshrc index 9d12afc..da54f14 100755 --- a/config/zsh/zshrc +++ b/config/zsh/zshrc @@ -60,7 +60,7 @@ plugins=( # git # disabled because I only ocasionally use git from the terminal safe-paste # don't run code when pasting systemd - z # TODO: replace plugin with zoxide + # z # TODO: replace plugin with zoxide zsh-autocomplete zsh-autopair zsh-autosuggestions @@ -110,3 +110,4 @@ fi eval "$(starship init zsh)" eval "$(rtx activate zsh)" # eval "$(zellij setup --generate-auto-start zsh)" +eval "$(zoxide init zsh)" diff --git a/exports/dnf.txt b/exports/dnf.txt index 00f7b88..d30cb2e 100644 --- a/exports/dnf.txt +++ b/exports/dnf.txt @@ -22,4 +22,5 @@ starship tealdeer tmux tree-sitter-cli +zoxide zsh