From ff7e83f38bb56d3c3d569d8ea035fca96dda4cdb Mon Sep 17 00:00:00 2001
From: TiagoRG <tiago.rgarcia@ua.pt>
Date: Mon, 11 Dec 2023 23:33:21 +0000
Subject: [PATCH] anotha update waw

Signed-off-by: TiagoRG <tiago.rgarcia@ua.pt>
---
 .config/nvim/after/plugin/aerial.lua    |  3 +
 .config/nvim/after/plugin/gitsigns.lua  | 87 +++++++++++++++++++++++++
 .config/nvim/after/plugin/harpoon.lua   | 10 ---
 .config/nvim/after/plugin/lualine.lua   |  2 +-
 .config/nvim/after/plugin/presence.lua  |  2 +-
 .config/nvim/after/plugin/tabset.lua    |  7 ++
 .config/nvim/lua/tiagorg/packer.lua     | 13 +++-
 .config/nvim/lua/tiagorg/remap.lua      |  2 +-
 .config/nvim/plugin/packer_compiled.lua | 49 +++++++++-----
 .gitconfig                              |  2 +
 .zsh/.zsh_clear                         |  1 +
 .zsh/.zshrc                             |  3 +-
 12 files changed, 149 insertions(+), 32 deletions(-)
 create mode 100644 .config/nvim/after/plugin/aerial.lua
 create mode 100644 .config/nvim/after/plugin/gitsigns.lua
 delete mode 100644 .config/nvim/after/plugin/harpoon.lua
 create mode 100644 .zsh/.zsh_clear

diff --git a/.config/nvim/after/plugin/aerial.lua b/.config/nvim/after/plugin/aerial.lua
new file mode 100644
index 0000000..18c4086
--- /dev/null
+++ b/.config/nvim/after/plugin/aerial.lua
@@ -0,0 +1,3 @@
+vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>")
+vim.keymap.set("n", "}", "<cmd>AerialNext<CR>")
+vim.keymap.set("n", "<leader><leader>", "<cmd>AerialToggle float<CR>")
diff --git a/.config/nvim/after/plugin/gitsigns.lua b/.config/nvim/after/plugin/gitsigns.lua
new file mode 100644
index 0000000..0cf983b
--- /dev/null
+++ b/.config/nvim/after/plugin/gitsigns.lua
@@ -0,0 +1,87 @@
+require('gitsigns').setup {
+    -- config
+    signs                        = {
+        add          = { text = '│' },
+        change       = { text = '│' },
+        delete       = { text = '_' },
+        topdelete    = { text = '‾' },
+        changedelete = { text = '~' },
+        untracked    = { text = '│' },
+        --untracked    = { text = '┆' },
+    },
+    signcolumn                   = true,  -- Toggle with `:Gitsigns toggle_signs`
+    numhl                        = true,  -- Toggle with `:Gitsigns toggle_numhl`
+    linehl                       = false, -- Toggle with `:Gitsigns toggle_linehl`
+    word_diff                    = false, -- Toggle with `:Gitsigns toggle_word_diff`
+    watch_gitdir                 = {
+        follow_files = true
+    },
+    attach_to_untracked          = true,
+    current_line_blame           = true, -- Toggle with `:Gitsigns toggle_current_line_blame`
+    current_line_blame_opts      = {
+        virt_text = true,
+        virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
+        delay = 100,
+        ignore_whitespace = false,
+        virt_text_priority = 100,
+    },
+    current_line_blame_formatter = '  <author> • <author_time:%Y-%m-%d %H:%M> • <summary>',
+    sign_priority                = 6,
+    update_debounce              = 100,
+    status_formatter             = nil,   -- Use default
+    max_file_length              = 10000, -- Disable if file is longer than this (in lines)
+    preview_config               = {
+        -- Options passed to nvim_open_win
+        border = 'single',
+        style = 'minimal',
+        relative = 'cursor',
+        row = 0,
+        col = 1
+    },
+    yadm                         = {
+        enable = false
+    },
+
+    -- keymaping
+    on_attach                    = function(bufnr)
+        local gs = package.loaded.gitsigns
+
+        local function map(mode, l, r, opts)
+            opts = opts or {}
+            opts.buffer = bufnr
+            vim.keymap.set(mode, l, r, opts)
+        end
+
+        -- Navigation
+        map('n', ')', function()
+            if vim.wo.diff then return ')' end
+            vim.schedule(function() gs.next_hunk() end)
+            return '<Ignore>'
+        end, { expr = true })
+
+        map('n', '(', function()
+            if vim.wo.diff then return '(' end
+            vim.schedule(function() gs.prev_hunk() end)
+            return '<Ignore>'
+        end, { expr = true })
+
+        -- Actions
+        map('n', '<leader>hs', gs.stage_hunk)
+        map('n', '<leader>hr', gs.reset_hunk)
+        map('v', '<leader>hs', function() gs.stage_hunk { vim.fn.line('.'), vim.fn.line('v') } end)
+        map('v', '<leader>hr', function() gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') } end)
+        map('n', '<leader>hS', gs.stage_buffer)
+        map('n', '<leader>hu', gs.undo_stage_hunk)
+        map('n', '<leader>hR', gs.reset_buffer)
+        map('n', '<leader>hp', gs.preview_hunk)
+        map('n', '<leader>hb', function() gs.blame_line { full = true } end)
+        map('n', '<leader>tb', gs.toggle_current_line_blame)
+        map('n', '<leader>hd', gs.diffthis)
+        map('n', '<leader>hD', function() gs.diffthis('~') end)
+        map('n', '<leader>td', gs.toggle_deleted)
+        map('n', '<leader>hc', gs.select_hunk)
+
+        -- Text object
+        map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+    end
+}
diff --git a/.config/nvim/after/plugin/harpoon.lua b/.config/nvim/after/plugin/harpoon.lua
deleted file mode 100644
index b8406a0..0000000
--- a/.config/nvim/after/plugin/harpoon.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-local mark = require("harpoon.mark")
-local ui = require("harpoon.ui")
-
-vim.keymap.set("n", "<leader>a", mark.add_file)
-vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
-
---vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
---vim.keymap.set("n", "<C-t>", function() ui.nav_file(2) end)
---vim.keymap.set("n", "<C-n>", function() ui.nav_file(3) end)
---vim.keymap.set("n", "<C-s>", function() ui.nav_file(4) end)
diff --git a/.config/nvim/after/plugin/lualine.lua b/.config/nvim/after/plugin/lualine.lua
index 906b8de..5a0ef76 100644
--- a/.config/nvim/after/plugin/lualine.lua
+++ b/.config/nvim/after/plugin/lualine.lua
@@ -20,7 +20,7 @@ require('lualine').setup {
     sections = {
         lualine_a = { 'fileformat', 'mode' },
         lualine_b = { 'branch', 'diff', 'diagnostics' },
-        lualine_c = { 'filename' },
+        lualine_c = { 'filename', 'aerial' },
         lualine_x = { 'filesize', 'filetype' },
         lualine_y = { 'progress' },
         lualine_z = { 'selectioncount', 'location' }
diff --git a/.config/nvim/after/plugin/presence.lua b/.config/nvim/after/plugin/presence.lua
index 226c563..f9f50b0 100644
--- a/.config/nvim/after/plugin/presence.lua
+++ b/.config/nvim/after/plugin/presence.lua
@@ -9,7 +9,7 @@ require("presence").setup({
     log_level           = nil,                        -- Log messages at or above this level (one of the following: "debug", "info", "warn", "error")
     debounce_timeout    = 1,                          -- Number of seconds to debounce events (or calls to `:lua package.loaded.presence:update(<filename>, true)`)
     enable_line_number  = false,                      -- Displays the current line number instead of the current project
-    blacklist           = {"glua-atas"},              -- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches
+    blacklist           = {"glua-atas", "toggleterm"},-- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches
     buttons             = true,                       -- Configure Rich Presence button(s), either a boolean to enable/disable, a static table (`{{ label = "<label>", url = "<url>" }, ...}`, or a function(buffer: string, repo_url: string|nil): table)
     file_assets         = {},                         -- Custom file asset definitions keyed by file names and extensions (see default config at `lua/presence/file_assets.lua` for reference)
     show_time           = true,                       -- Show the timer
diff --git a/.config/nvim/after/plugin/tabset.lua b/.config/nvim/after/plugin/tabset.lua
index b072086..2da7736 100644
--- a/.config/nvim/after/plugin/tabset.lua
+++ b/.config/nvim/after/plugin/tabset.lua
@@ -17,5 +17,12 @@ require("tabset").setup({
                 expandtab = false
             }
         },
+        {
+            filetypes = { "Makefile", "make" },
+            config = {
+                tabwidth = 4,
+                expandtab = false
+            }
+        }
     }
 })
diff --git a/.config/nvim/lua/tiagorg/packer.lua b/.config/nvim/lua/tiagorg/packer.lua
index 170704b..45cc7c2 100644
--- a/.config/nvim/lua/tiagorg/packer.lua
+++ b/.config/nvim/lua/tiagorg/packer.lua
@@ -33,11 +33,16 @@ return require('packer').startup(function(use)
     }
 
     use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
-    use('theprimeagen/harpoon')
     use('mbbill/undotree')
     use('wakatime/vim-wakatime')
     use('andweeb/presence.nvim')
     use('m4xshen/autoclose.nvim')
+    use({
+        'windwp/nvim-ts-autotag',
+        config = function ()
+            require('nvim-ts-autotag').setup()
+        end
+    })
     use({
         "andrewferrier/wrapping.nvim",
         config = function()
@@ -104,4 +109,10 @@ return require('packer').startup(function(use)
         'nvim-lualine/lualine.nvim',
         requires = { 'nvim-tree/nvim-web-devicons', opt = true },
     }
+    use({
+        "stevearc/aerial.nvim",
+        config = function()
+            require("aerial").setup()
+        end,
+    })
 end)
diff --git a/.config/nvim/lua/tiagorg/remap.lua b/.config/nvim/lua/tiagorg/remap.lua
index 2707787..be2cd9d 100644
--- a/.config/nvim/lua/tiagorg/remap.lua
+++ b/.config/nvim/lua/tiagorg/remap.lua
@@ -36,7 +36,7 @@ vim.keymap.set("n", "<leader>m", "<cmd>!make<CR>", { silent = true })
 
 vim.keymap.set("n", "<leader>vpp", "<cmd>e ~/.config/nvim/lua/tiagorg/packer.lua<CR>");
 
-vim.keymap.set("n", "<leader><leader>", function()
+vim.keymap.set("n", "<leader>so", function()
     vim.cmd("so")
 end)
 
diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua
index 24bfa6b..32f1e06 100644
--- a/.config/nvim/plugin/packer_compiled.lua
+++ b/.config/nvim/plugin/packer_compiled.lua
@@ -84,6 +84,12 @@ _G.packer_plugins = {
     path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/LuaSnip",
     url = "https://github.com/L3MON4D3/LuaSnip"
   },
+  ["aerial.nvim"] = {
+    config = { "\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vaerial\frequire\0" },
+    loaded = true,
+    path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/aerial.nvim",
+    url = "https://github.com/stevearc/aerial.nvim"
+  },
   ["aura-theme"] = {
     loaded = true,
     path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/aura-theme/packages/neovim",
@@ -139,11 +145,6 @@ _G.packer_plugins = {
     path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
     url = "https://github.com/lewis6991/gitsigns.nvim"
   },
-  harpoon = {
-    loaded = true,
-    path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/harpoon",
-    url = "https://github.com/theprimeagen/harpoon"
-  },
   ["indent-blankline.nvim"] = {
     loaded = true,
     path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim",
@@ -201,6 +202,12 @@ _G.packer_plugins = {
     path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
     url = "https://github.com/nvim-treesitter/nvim-treesitter"
   },
+  ["nvim-ts-autotag"] = {
+    config = { "\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0" },
+    loaded = true,
+    path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/nvim-ts-autotag",
+    url = "https://github.com/windwp/nvim-ts-autotag"
+  },
   ["nvim-ts-rainbow2"] = {
     loaded = true,
     path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/nvim-ts-rainbow2",
@@ -275,22 +282,30 @@ time([[Defining packer_plugins]], false)
 time([[Runtimepath customization]], true)
 vim.o.runtimepath = vim.o.runtimepath .. ",/home/tiagorg/.local/share/nvim/site/pack/packer/start/aura-theme/packages/neovim"
 time([[Runtimepath customization]], false)
--- Config for: wrapping.nvim
-time([[Config for wrapping.nvim]], true)
-try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rwrapping\frequire\0", "config", "wrapping.nvim")
-time([[Config for wrapping.nvim]], false)
--- Config for: tabset.nvim
-time([[Config for tabset.nvim]], true)
-try_loadstring("\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vtabset\frequire\0", "config", "tabset.nvim")
-time([[Config for tabset.nvim]], false)
--- Config for: nvim-surround
-time([[Config for nvim-surround]], true)
-try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18nvim-surround\frequire\0", "config", "nvim-surround")
-time([[Config for nvim-surround]], false)
 -- Config for: monokai-pro.nvim
 time([[Config for monokai-pro.nvim]], true)
 try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\16monokai-pro\frequire\0", "config", "monokai-pro.nvim")
 time([[Config for monokai-pro.nvim]], false)
+-- Config for: nvim-surround
+time([[Config for nvim-surround]], true)
+try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18nvim-surround\frequire\0", "config", "nvim-surround")
+time([[Config for nvim-surround]], false)
+-- Config for: nvim-ts-autotag
+time([[Config for nvim-ts-autotag]], true)
+try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag")
+time([[Config for nvim-ts-autotag]], false)
+-- Config for: aerial.nvim
+time([[Config for aerial.nvim]], true)
+try_loadstring("\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vaerial\frequire\0", "config", "aerial.nvim")
+time([[Config for aerial.nvim]], false)
+-- Config for: tabset.nvim
+time([[Config for tabset.nvim]], true)
+try_loadstring("\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vtabset\frequire\0", "config", "tabset.nvim")
+time([[Config for tabset.nvim]], false)
+-- Config for: wrapping.nvim
+time([[Config for wrapping.nvim]], true)
+try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rwrapping\frequire\0", "config", "wrapping.nvim")
+time([[Config for wrapping.nvim]], false)
 
 _G._packer.inside_compile = false
 if _G._packer.needs_bufread == true then
diff --git a/.gitconfig b/.gitconfig
index 53eb833..0b29856 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,3 +16,5 @@
 	gpgsign = true
 [tag]
 	gpgsign = true
+[init]
+	defaultBranch = main
diff --git a/.zsh/.zsh_clear b/.zsh/.zsh_clear
new file mode 100644
index 0000000..8ba3a16
--- /dev/null
+++ b/.zsh/.zsh_clear
@@ -0,0 +1 @@
+n
diff --git a/.zsh/.zshrc b/.zsh/.zshrc
index 3f05ebe..9ce2025 100644
--- a/.zsh/.zshrc
+++ b/.zsh/.zshrc
@@ -282,7 +282,7 @@ fi
 alias zshrc='vim /home/tiagorg/.zsh/.zshrc'
 
 # improved system commands
-alias update='yay -Syu --noconfirm && flatpak update -y'
+alias update='yay -Syyu && flatpak update -y'
 alias autoremove='yay -Qqd | yay -Runs --noconfirm - && flatpak remove --delete-data --unused -y'
 alias clear='echo "y" > ~/.zsh/.zsh_clear && source ~/.zsh/.zshrc'
 alias c='clear'
@@ -291,6 +291,7 @@ alias repos='cd /home/tiagorg/repos/'
 alias sus='su'
 alias s='sudo'
 alias grepf='grep -sirnIE'
+alias tl='telnet localhost'
 
 # uaveiro-leci repository
 alias ua='cd /home/tiagorg/repos/uaveiro-leci'