From 40357fb35169faba1c8cf2873212557c825beb9b Mon Sep 17 00:00:00 2001 From: TiagoRG Date: Sat, 28 Oct 2023 19:54:01 +0100 Subject: [PATCH] 28/10 commit Signed-off-by: TiagoRG --- .config/nvim/after/plugin/lsp.lua | 5 ----- .config/nvim/after/plugin/tabset.lua | 15 +++++++++------ .config/nvim/after/plugin/treesitter.lua | 3 +-- .config/nvim/lua/tiagorg/packer.lua | 1 - .config/nvim/lua/tiagorg/remap.lua | 2 +- .config/nvim/lua/tiagorg/set.lua | 2 ++ .config/nvim/plugin/packer_compiled.lua | 21 ++++++++------------- .local/bin/Mars.jar | 1 - .zsh/.zshrc | 14 ++++++++------ 9 files changed, 29 insertions(+), 35 deletions(-) delete mode 120000 .local/bin/Mars.jar diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua index af72171..c165580 100644 --- a/.config/nvim/after/plugin/lsp.lua +++ b/.config/nvim/after/plugin/lsp.lua @@ -2,11 +2,6 @@ local lsp = require("lsp-zero") lsp.preset("recommended") -lsp.ensure_installed({ - 'tsserver', - 'rust_analyzer', -}) - -- Fix Undefined global 'vim' lsp.nvim_workspace() diff --git a/.config/nvim/after/plugin/tabset.lua b/.config/nvim/after/plugin/tabset.lua index cc669b4..b072086 100644 --- a/.config/nvim/after/plugin/tabset.lua +++ b/.config/nvim/after/plugin/tabset.lua @@ -4,15 +4,18 @@ require("tabset").setup({ expandtab = true }, languages = { - asm = { - tabwidth = 8, - expandtab = false - }, { - filetypes = { "html", "json", "yaml" }, + filetypes = { "html", "json", "yaml", "xml" }, config = { tabwidth = 2 } - } + }, + { + filetypes = { "asm" }, + config = { + tabwidth = 8, + expandtab = false + } + }, } }) diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua index 35a6faf..9e6a2f7 100644 --- a/.config/nvim/after/plugin/treesitter.lua +++ b/.config/nvim/after/plugin/treesitter.lua @@ -1,8 +1,7 @@ require'nvim-treesitter.configs'.setup { -- A list of parser names, or "all" (the five listed parsers should always be installed) ensure_installed = { "bash", "lua", "vim", "vimdoc", "query", "regex", - --"c", - "cpp", "c_sharp", "rust", "python", + "c", "cpp", "c_sharp", "rust", "python", "html", "css", "php", "javascript", "typescript", "sql" }, diff --git a/.config/nvim/lua/tiagorg/packer.lua b/.config/nvim/lua/tiagorg/packer.lua index bbee707..84f186e 100644 --- a/.config/nvim/lua/tiagorg/packer.lua +++ b/.config/nvim/lua/tiagorg/packer.lua @@ -22,7 +22,6 @@ return require('packer').startup(function(use) }) use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) - use('nvim-treesitter/playground') use('theprimeagen/harpoon') use('mbbill/undotree') use('tpope/vim-fugitive') diff --git a/.config/nvim/lua/tiagorg/remap.lua b/.config/nvim/lua/tiagorg/remap.lua index cc15d95..c9c56f0 100644 --- a/.config/nvim/lua/tiagorg/remap.lua +++ b/.config/nvim/lua/tiagorg/remap.lua @@ -1,6 +1,5 @@ vim.keymap.set("n", "e", vim.cmd.E) vim.keymap.set("n", "w", vim.cmd.w) -vim.keymap.set("n", "t", "SetTabWidth 4 true") vim.keymap.set("v", "J", ":m '>+1gv=gv") vim.keymap.set("v", "K", ":m '<-2gv=gv") @@ -26,6 +25,7 @@ vim.keymap.set("i", "", "") vim.keymap.set("n", "Q", "") vim.keymap.set("n", "", "silent !tmux neww tmux-sessionizer") vim.keymap.set("n", "f", vim.lsp.buf.format) +vim.keymap.set("n", "a", "ggVG") vim.keymap.set("n", "", "cnextzz") vim.keymap.set("n", "", "cprevzz") diff --git a/.config/nvim/lua/tiagorg/set.lua b/.config/nvim/lua/tiagorg/set.lua index 14a0ad8..635601f 100644 --- a/.config/nvim/lua/tiagorg/set.lua +++ b/.config/nvim/lua/tiagorg/set.lua @@ -1,5 +1,7 @@ -- vim.opt.guicursor = "" +vim.opt.clipboard = "unnamedplus" + vim.opt.nu = true vim.opt.relativenumber = true diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index ee56efa..0314dd0 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -159,11 +159,6 @@ _G.packer_plugins = { path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/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"] = { loaded = true, path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/plenary.nvim", @@ -215,18 +210,18 @@ _G.packer_plugins = { } 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 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") 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 if _G._packer.needs_bufread == true then diff --git a/.local/bin/Mars.jar b/.local/bin/Mars.jar deleted file mode 120000 index 5d895d5..0000000 --- a/.local/bin/Mars.jar +++ /dev/null @@ -1 +0,0 @@ -Mars.jar \ No newline at end of file diff --git a/.zsh/.zshrc b/.zsh/.zshrc index 0bce025..baf9e86 100644 --- a/.zsh/.zshrc +++ b/.zsh/.zshrc @@ -1,7 +1,10 @@ # ~/.zshrc file for zsh interactive shells. # see /usr/share/doc/zsh/examples/zshrc for examples +/bin/clear echo "" +echo -e -n "\x1b[\x35 q" +echo "y" > ~/.zsh/.zsh_clear pfetch setopt autocd # change directory just by typing its name @@ -117,7 +120,6 @@ configure_prompt() { RPROMPT= ;; esac - echo -e -n "\x1b[\x35 q" unset prompt_symbol } @@ -212,8 +214,8 @@ precmd() { # Print a new line before the prompt, but only if it is not the first line if [ "$NEWLINE_BEFORE_PROMPT" = yes ]; then - if [ -z "$_NEW_LINE_BEFORE_PROMPT" ]; then - _NEW_LINE_BEFORE_PROMPT=0 + if [ "$(cat ~/.zsh/.zsh_clear)" = "y" ]; then + echo "n" > ~/.zsh/.zsh_clear else print "" fi @@ -279,11 +281,13 @@ alias zshrc='vim /home/tiagorg/.zsh/.zshrc' # improved system commands alias update='yay -Syu --noconfirm && flatpak update -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 r='cd && reset' +alias ref='echo -e -n "\x1b[\x35 q"' alias repos='cd /home/tiagorg/repos/' alias sus='su' alias s='sudo' +alias grepf='grep -srniIE' # uaveiro-leci repository 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 vpnd='snx -d' -alias commit='commit -s' - source /home/tiagorg/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh source /home/tiagorg/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#999999'