Changes

Signed-off-by: TiagoRG <tiago.rgarcia@ua.pt>

.config/nvim/after/plugin/autoclose.lua

@@ -9,9 +9,9 @@ require("autoclose").setup({
         ["]"] = { escape = true, close = false, pair = "[]", disabled_filetypes = {} },
         ["}"] = { escape = true, close = false, pair = "{}", disabled_filetypes = {} },
 
-        ['"'] = { escape = true, close = true, pair = '""', disabled_filetypes = {"gitcommit", "tex"} },
-        ["'"] = { escape = true, close = true, pair = "''", disabled_filetypes = {"gitcommit", "tex"} },
-        ["`"] = { escape = true, close = true, pair = "``", disabled_filetypes = {"gitcommit", "tex"} },
+        ['"'] = { escape = true, close = true, pair = '""', disabled_filetypes = {"gitcommit", "tex", "asciidoc"} },
+        ["'"] = { escape = true, close = true, pair = "''", disabled_filetypes = {"gitcommit", "tex", "asciidoc"} },
+        ["`"] = { escape = true, close = true, pair = "``", disabled_filetypes = {"gitcommit", "tex", "asciidoc"} },
 
         ["$"] = { escape = true, close = true, pair = "$$", enabled_filetypes = {"tex"} },
     },

.config/nvim/after/plugin/gitsigns.lua

@@ -38,9 +38,9 @@ require('gitsigns').setup {
         row = 0,
         col = 1
     },
-    yadm                         = {
-        enable = false
-    },
+    --yadm                         = {
+    --    enable = false
+    --},
 
     -- keymaping
     on_attach                    = function(bufnr)

.config/nvim/after/plugin/lualine.lua

@@ -10,7 +10,7 @@ require('lualine').setup {
         },
         ignore_focus = {},
         always_divide_middle = true,
-        globalstatus = false,
+        globalstatus = true,
         refresh = {
             statusline = 10,
             tabline = 1000,

.config/nvim/after/plugin/telescope.lua

@@ -1,5 +1,5 @@
 local builtin = require('telescope.builtin')
-local trouble = require('trouble.providers.telescope')
+local trouble = require("trouble.sources.telescope")
 
 -- File pickers
 vim.keymap.set('n', '<leader>pf', "<cmd>Telescope find_files hidden=true<CR>", {})
@@ -13,7 +13,7 @@ vim.keymap.set('n', '<leader>gc', builtin.git_commits, {})
 vim.keymap.set('n', '<leader>gs', builtin.git_stash, {})
 
 -- LSP pickers
-vim.keymap.set('n', '<leader>pe', trouble.open_with_trouble, {})
+vim.keymap.set('n', '<leader>pe', trouble.open, {})
 
 -- Help pickers
 vim.keymap.set('n', '<leader>sh', builtin.help_tags, {})

.config/nvim/after/plugin/trouble.lua

@@ -1,16 +1,19 @@
 require("trouble").setup {
     position = "bottom",
-    auto_open = true,
-    auto_close = true,
-    auto_preview = false,
-    icons = true,
+    modes = {
+        diagnostics = {
+            auto_open = true,
+            auto_close = false,
+            auto_preview = false
+        },
+    },
 }
 
 -- Keybindings
-vim.keymap.set("n", "<leader>x", "<cmd>TroubleToggle workspace_diagnostics<cr>", { noremap = true, silent = true })
-vim.keymap.set("n", ")", function ()
+vim.keymap.set("n", "<leader>x", "<cmd>Trouble diagnostics<cr>", { noremap = true, silent = true })
+vim.keymap.set("n", ")", function()
     require("trouble").next({ skip_groups = true, jump = true })
 end, { noremap = true, silent = true })
-vim.keymap.set("n", "(", function ()
+vim.keymap.set("n", "(", function()
     require("trouble").previous({ skip_groups = true, jump = true })
 end, { noremap = true, silent = true })

.config/nvim/after/plugin/wrapping.lua

@@ -1,6 +1,4 @@
-require("wrapping").setup()
-
-opts = {
+local opts = {
     auto_set_mode_filetype_allowlist = {
         "asciidoc",
         "gitcommit",
@@ -14,3 +12,5 @@ opts = {
     },
     soft_wrap = true,
 }
+
+require("wrapping").setup(opts)

.config/nvim/lua/tiagorg/autocmd.lua

@@ -7,13 +7,13 @@ vim.api.nvim_create_autocmd({ "BufWritePre" }, {
     end,
 })
 
-vim.api.nvim_exec([[
-    augroup SearchHighlight
-        autocmd!
-        autocmd CmdlineLeave /,\? :nnoremap <buffer> <Esc> :noh<CR>
-        autocmd CmdlineChanged /,\? :nnoremap <buffer> <Esc> :noh<CR>
-    augroup END
-]], false)
+vim.api.nvim_create_autocmd({"CmdlineLeave", "CmdlineChanged"}, {
+    group = vim.api.nvim_create_augroup("SearchHighlight", { clear = true }),
+    pattern = { "/", "\\?" },
+    callback = function()
+        vim.cmd([[nnoremap <buffer> <Esc> :noh<CR>]])
+    end
+})
 
 vim.api.nvim_create_autocmd("TextYankPost", {
     desc = "Highlight yanked text",

.config/nvim/lua/tiagorg/packer.lua

@@ -9,6 +9,10 @@ return require('packer').startup(function(use)
     use "loctvl842/monokai-pro.nvim"
     use "TiagoRG/onedarkpro.nvim"
     use 'Mofiqul/vscode.nvim'
+    use {
+        'rose-pine/neovim',
+        as = 'rose-pine'
+    }
 
     -- Essentials
     use {
@@ -69,22 +73,4 @@ return require('packer').startup(function(use)
 
     -- Little friend
     use("github/copilot.vim")
-
-    -- trying out
-    use {
-        'windwp/nvim-ts-autotag',
-        config = function()
-            require('nvim-ts-autotag').setup()
-            -- require 'nvim-treesitter.configs'.setup {
-            -- 	autotag = {
-            -- 		enable = true,
-            -- 		enable_rename = true,
-            -- 		enable_close = true,
-            -- 		enable_close_on_slash = true,
-            -- 		filetypes = { "html", "xml", "javascript", "typescript", "svelte", "vue", "javascriptreact", "typescriptreact"},
-            -- 	}
-            -- }
-        end
-    }
-    use 'mg979/vim-visual-multi'
 end)

.config/nvim/lua/tiagorg/set.lua

@@ -30,7 +30,6 @@ vim.opt.undofile = true
 
 vim.opt.termguicolors = true
 vim.opt.isfname:append("@-@")
-vim.opt.guitablabel = "\\[%N\\]\\ %t\\ %M"
 
-vim.g.copilot_node_command = "/usr/bin/nodenv"
+vim.g.copilot_node_command = "node"
 vim.g.copilot_assume_mapped = true

.gitignore

@@ -5,3 +5,4 @@
 .vim/autoload/plug.vim
 .zsh/zsh-autosuggestions
 .zsh/zsh-syntax-highlighting
+.zsh/.zcompcache

.zsh/.zshrc

@@ -287,41 +287,14 @@ alias autoremove='yay -Qqd | yay -Runs - && flatpak remove --delete-data --unuse
 alias clear='echo "y" > /home/tiagorg/.dotfiles/.zsh/.zsh_clear && source /home/tiagorg/.dotfiles/.zsh/.zshrc'
 alias c='clear'
 alias ref='echo -e -n "\x1b[\x35 q"'
-alias repos='cd /home/tiagorg/repos/'
-alias sus='su'
-alias s='sudo'
 alias grepf='grep -sirnIE'
-alias tl='telnet localhost'
-alias py='python'
 alias mkjava='javac -d bin/ src/**/*.java'
 alias core='echo "core.%e.%p" | sudo tee /proc/sys/kernel/core_pattern'
 
-# uaveiro-leci repository
-alias ua='cd /home/tiagorg/repos/uaveiro-leci'
-alias ua-gi='nvim /home/tiagorg/repos/uaveiro-leci/.git/info/exclude'
-alias aed='/home/tiagorg/repos/uaveiro-leci/2ano/1semestre/aed/setup.sh'
-alias pclean='ls | grep -P "^.+\.(o|elf|map|sym)$" | xargs -d"\n" rm'
-
-# ua vpn/ssh server
-alias vpn='sudo snx -s go.ua.pt -u tiago.rgarcia@ua.pt'
-alias vpnd='sudo snx -d'
-
 source /home/tiagorg/.dotfiles/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
 source /home/tiagorg/.dotfiles/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#999999'
 
-
-if [ -d /opt/pic32mx/bin ] ; then
-    export PATH=$PATH:/opt/pic32mx/bin
-fi
-if [ -d /opt/pic32mx/include ] ; then
-    export CPATH=$CPATH:/opt/pic32mx/include
-fi
-
-if which ruby >/dev/null && which gem >/dev/null; then
-  export PATH="$(ruby -r rubygems -e 'puts Gem.user_dir')/bin:$PATH"
-fi
-
 eval "$(zoxide init --cmd cd zsh)"
 
 # Set up path to check personal bin, include and lib directory
@@ -333,3 +306,8 @@ export CPATH=/home/tiagorg/.dotfiles/.local/include:$CPATH
 export LD_LIBRARY_PATH=/home/tiagorg/.dotfiles/.local/lib:$LD_LIBRARY_PATH
 
 export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gcr/ssh
+
+export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+
+eval "$(fzf --zsh)"

setup.sh

@@ -16,7 +16,7 @@ cd "$OLDPWD" || exit
 
 # Install the required packages
 echo -e "\e[32m$1\e[0mInstalling the required packages"
-yay -S stow vim neovim zsh clang nodejs npm zoxide pfetch --noconfirm
+yay -S stow gvim neovim zsh fzf bat clang nodejs npm zoxide pfetch ripgrep tree --noconfirm
 
 # Clone the dotfiles if it's not the current directory
 if [ "$(pwd)" != "$HOME/.dotfiles" ]; then
@@ -39,9 +39,6 @@ stow -d .dotfiles .
 echo -e "\e[32m$1\e[0mSetting up Neovim"
 echo -e "\e[32m$1\e[0mInstalling Packer"
 git clone --depth 1 "https://github.com/wbthomason/packer.nvim" "$HOME/.local/share/nvim/site/pack/packer/start/packer.nvim"
-stow -d .dotfiles .
-echo -e "\e[32m$1\e[0mInstalling Plugins"
-/bin/nvim --headless -c 'source /home/tiagorg/.dotfiles/.config/nvim/lua/tiagorg/packer.lua' -c 'PackerSync' -c 'qa!'
 
 # Setup zsh
 echo -e "\e[32m$1\e[0mSetting up zsh"