28/10 commit
Signed-off-by: TiagoRG <tiago.rgarcia@ua.pt>
This commit is contained in:
parent
bc541078d8
commit
40357fb351
|
@ -2,11 +2,6 @@ local lsp = require("lsp-zero")
|
||||||
|
|
||||||
lsp.preset("recommended")
|
lsp.preset("recommended")
|
||||||
|
|
||||||
lsp.ensure_installed({
|
|
||||||
'tsserver',
|
|
||||||
'rust_analyzer',
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Fix Undefined global 'vim'
|
-- Fix Undefined global 'vim'
|
||||||
lsp.nvim_workspace()
|
lsp.nvim_workspace()
|
||||||
|
|
||||||
|
|
|
@ -4,15 +4,18 @@ require("tabset").setup({
|
||||||
expandtab = true
|
expandtab = true
|
||||||
},
|
},
|
||||||
languages = {
|
languages = {
|
||||||
asm = {
|
|
||||||
tabwidth = 8,
|
|
||||||
expandtab = false
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
filetypes = { "html", "json", "yaml" },
|
filetypes = { "html", "json", "yaml", "xml" },
|
||||||
config = {
|
config = {
|
||||||
tabwidth = 2
|
tabwidth = 2
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
filetypes = { "asm" },
|
||||||
|
config = {
|
||||||
|
tabwidth = 8,
|
||||||
|
expandtab = false
|
||||||
}
|
}
|
||||||
|
},
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
require'nvim-treesitter.configs'.setup {
|
require'nvim-treesitter.configs'.setup {
|
||||||
-- A list of parser names, or "all" (the five listed parsers should always be installed)
|
-- A list of parser names, or "all" (the five listed parsers should always be installed)
|
||||||
ensure_installed = { "bash", "lua", "vim", "vimdoc", "query", "regex",
|
ensure_installed = { "bash", "lua", "vim", "vimdoc", "query", "regex",
|
||||||
--"c",
|
"c", "cpp", "c_sharp", "rust", "python",
|
||||||
"cpp", "c_sharp", "rust", "python",
|
|
||||||
"html", "css", "php", "javascript", "typescript", "sql"
|
"html", "css", "php", "javascript", "typescript", "sql"
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,6 @@ return require('packer').startup(function(use)
|
||||||
})
|
})
|
||||||
|
|
||||||
use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
|
use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
|
||||||
use('nvim-treesitter/playground')
|
|
||||||
use('theprimeagen/harpoon')
|
use('theprimeagen/harpoon')
|
||||||
use('mbbill/undotree')
|
use('mbbill/undotree')
|
||||||
use('tpope/vim-fugitive')
|
use('tpope/vim-fugitive')
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
vim.keymap.set("n", "<leader>e", vim.cmd.E)
|
vim.keymap.set("n", "<leader>e", vim.cmd.E)
|
||||||
vim.keymap.set("n", "<leader>w", vim.cmd.w)
|
vim.keymap.set("n", "<leader>w", vim.cmd.w)
|
||||||
vim.keymap.set("n", "<leader>t", "<cmd>SetTabWidth 4 true<CR>")
|
|
||||||
|
|
||||||
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
|
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
|
||||||
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
|
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
|
||||||
|
@ -26,6 +25,7 @@ vim.keymap.set("i", "<C-c>", "<Esc>")
|
||||||
vim.keymap.set("n", "Q", "<nop>")
|
vim.keymap.set("n", "Q", "<nop>")
|
||||||
vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
|
vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
|
||||||
vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
|
vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
|
||||||
|
vim.keymap.set("n", "<leader>a", "ggVG")
|
||||||
|
|
||||||
vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
|
vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
|
||||||
vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
|
vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
-- vim.opt.guicursor = ""
|
-- vim.opt.guicursor = ""
|
||||||
|
|
||||||
|
vim.opt.clipboard = "unnamedplus"
|
||||||
|
|
||||||
vim.opt.nu = true
|
vim.opt.nu = true
|
||||||
vim.opt.relativenumber = true
|
vim.opt.relativenumber = true
|
||||||
|
|
||||||
|
|
|
@ -159,11 +159,6 @@ _G.packer_plugins = {
|
||||||
path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/packer.nvim",
|
path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/packer.nvim",
|
||||||
url = "https://github.com/wbthomason/packer.nvim"
|
url = "https://github.com/wbthomason/packer.nvim"
|
||||||
},
|
},
|
||||||
playground = {
|
|
||||||
loaded = true,
|
|
||||||
path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/playground",
|
|
||||||
url = "https://github.com/nvim-treesitter/playground"
|
|
||||||
},
|
|
||||||
["plenary.nvim"] = {
|
["plenary.nvim"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/plenary.nvim",
|
path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/plenary.nvim",
|
||||||
|
@ -215,18 +210,18 @@ _G.packer_plugins = {
|
||||||
}
|
}
|
||||||
|
|
||||||
time([[Defining packer_plugins]], false)
|
time([[Defining packer_plugins]], 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: rose-pine
|
-- Config for: rose-pine
|
||||||
time([[Config for rose-pine]], true)
|
time([[Config for rose-pine]], true)
|
||||||
try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0", "config", "rose-pine")
|
try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0", "config", "rose-pine")
|
||||||
time([[Config for rose-pine]], false)
|
time([[Config for rose-pine]], 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
|
_G._packer.inside_compile = false
|
||||||
if _G._packer.needs_bufread == true then
|
if _G._packer.needs_bufread == true then
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Mars.jar
|
|
14
.zsh/.zshrc
14
.zsh/.zshrc
|
@ -1,7 +1,10 @@
|
||||||
# ~/.zshrc file for zsh interactive shells.
|
# ~/.zshrc file for zsh interactive shells.
|
||||||
# see /usr/share/doc/zsh/examples/zshrc for examples
|
# see /usr/share/doc/zsh/examples/zshrc for examples
|
||||||
|
|
||||||
|
/bin/clear
|
||||||
echo ""
|
echo ""
|
||||||
|
echo -e -n "\x1b[\x35 q"
|
||||||
|
echo "y" > ~/.zsh/.zsh_clear
|
||||||
pfetch
|
pfetch
|
||||||
|
|
||||||
setopt autocd # change directory just by typing its name
|
setopt autocd # change directory just by typing its name
|
||||||
|
@ -117,7 +120,6 @@ configure_prompt() {
|
||||||
RPROMPT=
|
RPROMPT=
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
echo -e -n "\x1b[\x35 q"
|
|
||||||
unset prompt_symbol
|
unset prompt_symbol
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -212,8 +214,8 @@ precmd() {
|
||||||
|
|
||||||
# Print a new line before the prompt, but only if it is not the first line
|
# Print a new line before the prompt, but only if it is not the first line
|
||||||
if [ "$NEWLINE_BEFORE_PROMPT" = yes ]; then
|
if [ "$NEWLINE_BEFORE_PROMPT" = yes ]; then
|
||||||
if [ -z "$_NEW_LINE_BEFORE_PROMPT" ]; then
|
if [ "$(cat ~/.zsh/.zsh_clear)" = "y" ]; then
|
||||||
_NEW_LINE_BEFORE_PROMPT=0
|
echo "n" > ~/.zsh/.zsh_clear
|
||||||
else
|
else
|
||||||
print ""
|
print ""
|
||||||
fi
|
fi
|
||||||
|
@ -279,11 +281,13 @@ alias zshrc='vim /home/tiagorg/.zsh/.zshrc'
|
||||||
# improved system commands
|
# improved system commands
|
||||||
alias update='yay -Syu --noconfirm && flatpak update -y'
|
alias update='yay -Syu --noconfirm && flatpak update -y'
|
||||||
alias autoremove='sudo pacman -Qqd | sudo pacman -Rsu - && flatpak uninstall --unused -y'
|
alias autoremove='sudo pacman -Qqd | sudo pacman -Rsu - && flatpak uninstall --unused -y'
|
||||||
|
alias clear='echo "y" > ~/.zsh/.zsh_clear && source ~/.zsh/.zshrc'
|
||||||
alias c='clear'
|
alias c='clear'
|
||||||
alias r='cd && reset'
|
alias ref='echo -e -n "\x1b[\x35 q"'
|
||||||
alias repos='cd /home/tiagorg/repos/'
|
alias repos='cd /home/tiagorg/repos/'
|
||||||
alias sus='su'
|
alias sus='su'
|
||||||
alias s='sudo'
|
alias s='sudo'
|
||||||
|
alias grepf='grep -srniIE'
|
||||||
|
|
||||||
# uaveiro-leci repository
|
# uaveiro-leci repository
|
||||||
alias ua='cd /home/tiagorg/repos/uaveiro-leci'
|
alias ua='cd /home/tiagorg/repos/uaveiro-leci'
|
||||||
|
@ -294,8 +298,6 @@ alias aed='$HOME/repos/uaveiro-leci/2ano/1semestre/aed/setup.sh'
|
||||||
alias vpn='snx -s go.ua.pt -u tiago.rgarcia@ua.pt'
|
alias vpn='snx -s go.ua.pt -u tiago.rgarcia@ua.pt'
|
||||||
alias vpnd='snx -d'
|
alias vpnd='snx -d'
|
||||||
|
|
||||||
alias commit='commit -s'
|
|
||||||
|
|
||||||
source /home/tiagorg/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
|
source /home/tiagorg/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||||
source /home/tiagorg/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
source /home/tiagorg/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#999999'
|
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#999999'
|
||||||
|
|
Loading…
Reference in New Issue