parent
07d2d1b3cd
commit
65669fbc65
|
@ -38,9 +38,9 @@ require('gitsigns').setup {
|
||||||
row = 0,
|
row = 0,
|
||||||
col = 1
|
col = 1
|
||||||
},
|
},
|
||||||
yadm = {
|
--yadm = {
|
||||||
enable = false
|
-- enable = false
|
||||||
},
|
--},
|
||||||
|
|
||||||
-- keymaping
|
-- keymaping
|
||||||
on_attach = function(bufnr)
|
on_attach = function(bufnr)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
local builtin = require('telescope.builtin')
|
local builtin = require('telescope.builtin')
|
||||||
local trouble = require('trouble.providers.telescope')
|
local trouble = require("trouble.sources.telescope")
|
||||||
|
|
||||||
-- File pickers
|
-- File pickers
|
||||||
vim.keymap.set('n', '<leader>pf', "<cmd>Telescope find_files hidden=true<CR>", {})
|
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, {})
|
vim.keymap.set('n', '<leader>gs', builtin.git_stash, {})
|
||||||
|
|
||||||
-- LSP pickers
|
-- LSP pickers
|
||||||
vim.keymap.set('n', '<leader>pe', trouble.open_with_trouble, {})
|
vim.keymap.set('n', '<leader>pe', trouble.open, {})
|
||||||
|
|
||||||
-- Help pickers
|
-- Help pickers
|
||||||
vim.keymap.set('n', '<leader>sh', builtin.help_tags, {})
|
vim.keymap.set('n', '<leader>sh', builtin.help_tags, {})
|
||||||
|
|
|
@ -1,16 +1,19 @@
|
||||||
require("trouble").setup {
|
require("trouble").setup {
|
||||||
position = "bottom",
|
position = "bottom",
|
||||||
auto_open = true,
|
modes = {
|
||||||
auto_close = false,
|
diagnostics = {
|
||||||
auto_preview = false,
|
auto_open = true,
|
||||||
icons = true,
|
auto_close = false,
|
||||||
|
auto_preview = false
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Keybindings
|
-- Keybindings
|
||||||
vim.keymap.set("n", "<leader>x", "<cmd>TroubleToggle workspace_diagnostics<cr>", { noremap = true, silent = true })
|
vim.keymap.set("n", "<leader>x", "<cmd>Trouble diagnostics<cr>", { noremap = true, silent = true })
|
||||||
vim.keymap.set("n", ")", function ()
|
vim.keymap.set("n", ")", function()
|
||||||
require("trouble").next({ skip_groups = true, jump = true })
|
require("trouble").next({ skip_groups = true, jump = true })
|
||||||
end, { noremap = true, silent = true })
|
end, { noremap = true, silent = true })
|
||||||
vim.keymap.set("n", "(", function ()
|
vim.keymap.set("n", "(", function()
|
||||||
require("trouble").previous({ skip_groups = true, jump = true })
|
require("trouble").previous({ skip_groups = true, jump = true })
|
||||||
end, { noremap = true, silent = true })
|
end, { noremap = true, silent = true })
|
||||||
|
|
|
@ -9,6 +9,10 @@ return require('packer').startup(function(use)
|
||||||
use "loctvl842/monokai-pro.nvim"
|
use "loctvl842/monokai-pro.nvim"
|
||||||
use "TiagoRG/onedarkpro.nvim"
|
use "TiagoRG/onedarkpro.nvim"
|
||||||
use 'Mofiqul/vscode.nvim'
|
use 'Mofiqul/vscode.nvim'
|
||||||
|
use {
|
||||||
|
'rose-pine/neovim',
|
||||||
|
as = 'rose-pine'
|
||||||
|
}
|
||||||
|
|
||||||
-- Essentials
|
-- Essentials
|
||||||
use {
|
use {
|
||||||
|
|
27
.zsh/.zshrc
27
.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 clear='echo "y" > /home/tiagorg/.dotfiles/.zsh/.zsh_clear && source /home/tiagorg/.dotfiles/.zsh/.zshrc'
|
||||||
alias c='clear'
|
alias c='clear'
|
||||||
alias ref='echo -e -n "\x1b[\x35 q"'
|
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 grepf='grep -sirnIE'
|
||||||
alias tl='telnet localhost'
|
|
||||||
alias py='python'
|
|
||||||
alias mkjava='javac -d bin/ src/**/*.java'
|
alias mkjava='javac -d bin/ src/**/*.java'
|
||||||
alias core='echo "core.%e.%p" | sudo tee /proc/sys/kernel/core_pattern'
|
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-autosuggestions/zsh-autosuggestions.zsh
|
||||||
source /home/tiagorg/.dotfiles/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
source /home/tiagorg/.dotfiles/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#999999'
|
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)"
|
eval "$(zoxide init --cmd cd zsh)"
|
||||||
|
|
||||||
# Set up path to check personal bin, include and lib directory
|
# Set up path to check personal bin, include and lib directory
|
||||||
|
|
5
setup.sh
5
setup.sh
|
@ -16,7 +16,7 @@ cd "$OLDPWD" || exit
|
||||||
|
|
||||||
# Install the required packages
|
# Install the required packages
|
||||||
echo -e "\e[32m$1\e[0mInstalling 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
|
# Clone the dotfiles if it's not the current directory
|
||||||
if [ "$(pwd)" != "$HOME/.dotfiles" ]; then
|
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[0mSetting up Neovim"
|
||||||
echo -e "\e[32m$1\e[0mInstalling Packer"
|
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"
|
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
|
# Setup zsh
|
||||||
echo -e "\e[32m$1\e[0mSetting up zsh"
|
echo -e "\e[32m$1\e[0mSetting up zsh"
|
||||||
|
|
Loading…
Reference in New Issue