From 65669fbc656ba12a7bb4916b9838986b9e994158 Mon Sep 17 00:00:00 2001 From: TiagoRG Date: Fri, 28 Jun 2024 20:45:46 +0100 Subject: [PATCH] Changes Signed-off-by: TiagoRG --- .config/nvim/after/plugin/gitsigns.lua | 6 +++--- .config/nvim/after/plugin/telescope.lua | 4 ++-- .config/nvim/after/plugin/trouble.lua | 17 +++++++++------- .config/nvim/lua/tiagorg/packer.lua | 4 ++++ .zsh/.zshrc | 27 ------------------------- setup.sh | 5 +---- 6 files changed, 20 insertions(+), 43 deletions(-) diff --git a/.config/nvim/after/plugin/gitsigns.lua b/.config/nvim/after/plugin/gitsigns.lua index 87246d4..b60e46b 100644 --- a/.config/nvim/after/plugin/gitsigns.lua +++ b/.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) diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index bf9d456..9c12335 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.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', 'pf', "Telescope find_files hidden=true", {}) @@ -13,7 +13,7 @@ vim.keymap.set('n', 'gc', builtin.git_commits, {}) vim.keymap.set('n', 'gs', builtin.git_stash, {}) -- LSP pickers -vim.keymap.set('n', 'pe', trouble.open_with_trouble, {}) +vim.keymap.set('n', 'pe', trouble.open, {}) -- Help pickers vim.keymap.set('n', 'sh', builtin.help_tags, {}) diff --git a/.config/nvim/after/plugin/trouble.lua b/.config/nvim/after/plugin/trouble.lua index ab36824..1efda68 100644 --- a/.config/nvim/after/plugin/trouble.lua +++ b/.config/nvim/after/plugin/trouble.lua @@ -1,16 +1,19 @@ require("trouble").setup { position = "bottom", - auto_open = true, - auto_close = false, - auto_preview = false, - icons = true, + modes = { + diagnostics = { + auto_open = true, + auto_close = false, + auto_preview = false + }, + }, } -- Keybindings -vim.keymap.set("n", "x", "TroubleToggle workspace_diagnostics", { noremap = true, silent = true }) -vim.keymap.set("n", ")", function () +vim.keymap.set("n", "x", "Trouble diagnostics", { 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 }) diff --git a/.config/nvim/lua/tiagorg/packer.lua b/.config/nvim/lua/tiagorg/packer.lua index 2195318..d17eccf 100644 --- a/.config/nvim/lua/tiagorg/packer.lua +++ b/.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 { diff --git a/.zsh/.zshrc b/.zsh/.zshrc index 7bf23d9..3b6a0aa 100644 --- a/.zsh/.zshrc +++ b/.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 diff --git a/setup.sh b/setup.sh index b24abc7..ddca0ae 100644 --- a/setup.sh +++ b/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"