From d611b01f0c029a808570ce532eb9fbaf673eb019 Mon Sep 17 00:00:00 2001 From: deadguy Date: Sun, 27 Feb 2022 15:18:48 -0300 Subject: [PATCH] Limpie unas cosas que no usaba --- alacritty.yml | 6 +- nvim/lua/plugins/lsp/lsp-utils.lua | 15 +--- nvim/lua/plugins/lsp/null-ls.lua | 2 +- nvim/lua/plugins/lsp/nvim-cmp.lua | 47 ++++++------ nvim/lua/plugins/telescope.lua | 6 +- nvim/lua/plugins/treesitter.lua | 25 +------ nvim/plugin/autocmds.vim | 13 ++-- xbpaketes | 110 ++++++++++++++--------------- 8 files changed, 91 insertions(+), 133 deletions(-) diff --git a/alacritty.yml b/alacritty.yml index 6e678de..da40e77 100644 --- a/alacritty.yml +++ b/alacritty.yml @@ -8,6 +8,7 @@ window: y: 0 dynamic_title: true + opacity: 0.85 scrolling: history: 10000 @@ -39,8 +40,6 @@ font: x: 0 y: 0 -# draw_bold_text_with_bright_colors: false - colors: # Default colors primary: @@ -69,9 +68,6 @@ colors: cyan: '#6fc3df' white: '#fcfcfc' -background_opacity: 0.85 -# background_opacity: 1 - selection: semantic_escape_chars: "" save_to_clipboard: true diff --git a/nvim/lua/plugins/lsp/lsp-utils.lua b/nvim/lua/plugins/lsp/lsp-utils.lua index b5a2286..70cc840 100644 --- a/nvim/lua/plugins/lsp/lsp-utils.lua +++ b/nvim/lua/plugins/lsp/lsp-utils.lua @@ -24,19 +24,12 @@ vim.diagnostic.config({ local U = {} -function U.fmt_on_save(client) - if client.resolved_capabilities.document_formatting then - vim.api.nvim_command("autocmd BufWritePre lua vim.lsp.buf.formatting_sync()") - end -end - function U.capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities() return require("cmp_nvim_lsp").update_capabilities(capabilities) end ---Disable formatting for servers. Handled by null-ls ----@source https://github.com/jose-elias-alvarez/null-ls.nvim/wiki/Avoiding-LSP-formatting-conflicts function U.disable_formatting(client) client.resolved_capabilities.document_formatting = false client.resolved_capabilities.document_range_formatting = false @@ -44,13 +37,12 @@ end function U.mappings(bufnr) local opts = { noremap = true, silent = true } - vim.api.nvim_buf_set_keymap(bufnr, "n", "gD", "lua vim.lsp.buf.declaration()", opts) + vim.api.nvim_buf_set_keymap(bufnr, "n", "gt", "lua vim.lsp.buf.type_definition()", opts) vim.api.nvim_buf_set_keymap(bufnr, "n", "gd", "lua vim.lsp.buf.definition()", opts) - vim.api.nvim_buf_set_keymap(bufnr, "n", "gh", "lua vim.lsp.buf.hover()", opts) + vim.api.nvim_buf_set_keymap(bufnr, "n", "K", "lua vim.lsp.buf.hover()", opts) vim.api.nvim_buf_set_keymap(bufnr, "n", "gi", "lua vim.lsp.buf.implementation()", opts) - vim.api.nvim_buf_set_keymap(bufnr, "n", "gr", "lua vim.lsp.buf.references()", opts) vim.api.nvim_buf_set_keymap(bufnr, "i", "", "lua vim.lsp.buf.signature_help()", opts) - vim.api.nvim_buf_set_keymap(bufnr, "n", "rn", "lua vim.lsp.buf.rename()", opts) + vim.api.nvim_buf_set_keymap(bufnr, "n", "r", "lua vim.lsp.buf.rename()", opts) vim.api.nvim_buf_set_keymap(bufnr, "n", "ca", "lua vim.lsp.buf.code_action()", opts) vim.api.nvim_buf_set_keymap(bufnr, "n", "{g", "lua vim.diagnostic.goto_prev()", opts) vim.api.nvim_buf_set_keymap(bufnr, "n", "}g", "lua vim.diagnostic.goto_next()", opts) @@ -79,7 +71,6 @@ function U.goto_split(split_cmd) vim.lsp.util.jump_to_location(result) end end - return handler end diff --git a/nvim/lua/plugins/lsp/null-ls.lua b/nvim/lua/plugins/lsp/null-ls.lua index d8b5e21..ea85082 100644 --- a/nvim/lua/plugins/lsp/null-ls.lua +++ b/nvim/lua/plugins/lsp/null-ls.lua @@ -31,7 +31,7 @@ require("null-ls").setup({ cda.shellcheck, }, on_attach = function(client, bufnr) - require("plugins.lsp.lsp-utils").fmt_on_save(client) + -- require("plugins.lsp.lsp-utils").fmt_on_save(client) require("plugins.lsp.lsp-utils").mappings(bufnr) end, }) diff --git a/nvim/lua/plugins/lsp/nvim-cmp.lua b/nvim/lua/plugins/lsp/nvim-cmp.lua index 55132b0..e12d9c7 100644 --- a/nvim/lua/plugins/lsp/nvim-cmp.lua +++ b/nvim/lua/plugins/lsp/nvim-cmp.lua @@ -1,6 +1,3 @@ -local cmp = require("cmp") -local luasnip = require("luasnip") - local cmp_kinds = { Text = " ", Method = " ", @@ -29,6 +26,7 @@ local cmp_kinds = { TypeParameter = " ", } +local cmp = require("cmp") cmp.setup({ snippet = { expand = function(args) @@ -42,36 +40,37 @@ cmp.setup({ end, }, mapping = { - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(-4), [""] = cmp.mapping.scroll_docs(4), [""] = cmp.mapping(function(_) return vim.fn.pumvisible() == 1 and cmp.close() or cmp.complete() end), - [""] = cmp.mapping.close(), + [""] = cmp.mapping({ + i = cmp.mapping.abort(), + c = cmp.mapping.close(), + }), [""] = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true, }), [""] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - vim.fn.feedkeys(vim.api.nvim_replace_termcodes("luasnip-expand-or-jump", true, true, true), "") - else - fallback() - end - end, - [""] = function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - vim.fn.feedkeys(vim.api.nvim_replace_termcodes("luasnip-jump-prev", true, true, true), "") - else - fallback() - end - end, + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + vim.fn.feedkeys(vim.api.nvim_replace_termcodes("luasnip-expand-or-jump", true, true, true), "") + else + fallback() + end + end, + [""] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + vim.fn.feedkeys(vim.api.nvim_replace_termcodes("luasnip-jump-prev", true, true, true), "") + else + fallback() + end + end, }, sources = cmp.config.sources({ { name = "luasnip", max_item_count = 5 }, diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 3672c22..0107391 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -80,15 +80,11 @@ require("telescope").setup({ buffer_previewer_maker = new_maker, mappings = { i = { - [""] = actions.smart_send_to_qflist + actions.open_qflist, [""] = false, [""] = actions.select_horizontal, [""] = actions.select_default + actions.center, [""] = actions.close, - [""] = actions.move_selection_next, - [""] = actions.move_selection_previous, [""] = actions.toggle_selection + actions.move_selection_next, - [""] = actions.send_selected_to_qflist, [""] = require("telescope.actions.layout").toggle_preview, }, n = { @@ -100,7 +96,7 @@ require("telescope").setup({ file_browser = { hidden = true, theme = "ivy", - dir_icon = " ", + dir_icon = " ", }, }, }), diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua index b40dd1f..bc292f4 100644 --- a/nvim/lua/plugins/treesitter.lua +++ b/nvim/lua/plugins/treesitter.lua @@ -22,27 +22,6 @@ require("nvim-treesitter.configs").setup({ }, indent = { enable = true }, incremental_selection = { enable = true }, - query_linter = { - enable = true, - use_virtual_text = true, - lint_events = { "BufWrite", "CursorHold" }, - }, - textobjects = { - select = { - enable = true, - lookahead = true, - keymaps = { - ["af"] = "@function.outer", - ["if"] = "@function.inner", - ["ac"] = "@class.outer", - ["ic"] = "@class.inner", - }, - }, - rainbow = { - enable = true, - extended_mode = true, -- Also highlight non-bracket delimiters like html tags, boolean or table: lang -> boolean - max_file_lines = nil, -- Do not enable for files with more than n lines, int - }, autopairs = { enable = true }, context_commentstring = { enable = true, @@ -51,5 +30,5 @@ require("nvim-treesitter.configs").setup({ lua = "-- %s", }, }, - }, -}) + } +) diff --git a/nvim/plugin/autocmds.vim b/nvim/plugin/autocmds.vim index 18a7832..1f2f800 100644 --- a/nvim/plugin/autocmds.vim +++ b/nvim/plugin/autocmds.vim @@ -3,7 +3,7 @@ scriptencoding utf-8 if !exists('autocommands_loaded') && has('autocmd') let autocommands_loaded = 1 let ftToIgnore = ['markdown', 'html', 'text'] - let statusline_blacklist = ['terminal', 'fugitive', 'vista', 'diagnostics', 'qf'] + let statusline_blacklist = ['terminal', 'fugitive', 'diagnostics', 'qf'] aug OnInsert au InsertLeave * if &paste | setlocal nopaste | endif @@ -14,8 +14,7 @@ if !exists('autocommands_loaded') && has('autocmd') aug Miscs au TextYankPost * silent! lua vim.highlight.on_yank{timeout = 80, on_visual=true} - au BufEnter * set fo-=c fo-=r fo-=o - au CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focusable=false, header=""}) + au CursorHold,CursorHoldI * silent! lua vim.diagnostic.open_float(nil, {focusable=false, header=""}) aug END aug OnSave @@ -30,10 +29,10 @@ if !exists('autocommands_loaded') && has('autocmd') aug END aug OpenTerm - au TermOpen * set laststatus=0 + au TermOpen * set laststatus=0 au TermOpen * setlocal nonumber wrap signcolumn=no - au BufEnter term://* startinsert! - au TermClose * set laststatus=2 - au BufLeave term://* stopinsert + au BufEnter term://* startinsert! + au TermClose * set laststatus=2 + au BufLeave term://* stopinsert aug END endif diff --git a/xbpaketes b/xbpaketes index e841637..64d905b 100644 --- a/xbpaketes +++ b/xbpaketes @@ -1,9 +1,9 @@ MangoHud-0.6.5_1 SDL-1.2.15_12 SDL_mixer-1.2.12_14 -StyLua-0.11.3_1 +StyLua-0.12.3_1 Vulkan-Headers-1.2.182_1 -alacritty-0.9.0_2 +alacritty-0.10.0_1 alsa-lib-32bit-1.2.6.1_1 alsa-plugins-1.2.6_1 alsa-plugins-32bit-1.2.6_1 @@ -14,53 +14,53 @@ alsa-plugins-pulseaudio-32bit-1.2.6_1 alsa-utils-1.2.6_1 alsaequal-0.7.1_2 alsaequal-32bit-0.7.1_2 -amdvlk-2021.Q3.7_1 -amdvlk-32bit-2021.Q3.7_1 -amfora-1.9.2_1 -android-tools-31.0.3p1_1 +amdvlk-2022.Q1.2_1 +amdvlk-32bit-2022.Q1.2_1 +android-tools-31.0.3p1_2 android-udev-rules-20210501_1 audacious-4.1_1 audacious-plugins-4.1_4 base-devel-20181003_2 base-system-0.114_1 -bat-0.18.3_1 -blender-3.0.0_1 +bat-0.20.0_1 +blender-3.0.0_4 bspwm-0.9.10_1 catgirl-2.0a_1 cgo-0.6.1_1 chrony-4.2_1 cmake-3.22.1_1 -curl-7.81.0_1 +curl-7.81.0_2 delta-0.11.3_1 delve-1.8.0_1 dfc-3.1.1_2 dkms-2.8.4_2 droidcam-1.8.1_1 -dunst-1.7.3_1 +dunst-1.8.0_1 elinks-0.15.0_1 elogind-246.9.2_3 evtest-qt-0.2.0_1 fcitx-4.2.9.8_5 fcitx-configtool-0.4.10_2 -fcitx-mozc-2.26.4472.102_2 -fd-8.3.1_1 +fcitx-mozc-2.26.4632.102_2 +fd-8.3.2_1 feh-3.8_1 ffmpeg-4.4.1_1 figlet-2.2.5_6 figlet-fonts-20150508_4 file-roller-3.40.0_1 -firefox-96.0.2_1 +firefox-97.0_1 font-misc-misc-1.1.2_7 fzf-0.29.0_1 gallery-dl-1.20.1_1 -git-2.35.0_1 -git-libsecret-2.35.0_1 +ghostscript-9.54.0_2 +git-2.35.1_1 +git-libsecret-2.35.1_1 glu-9.0.2_2 glu-32bit-9.0.2_2 glxinfo-8.4.0_3 gmic-2.9.9_1 gnome-ssh-askpass-8.8p1_1 -gnupg2-2.2.32_1 +gnupg2-2.2.34_1 go-1.17.6_1 golangci-lint-1.43.0_1 gopls-0.7.4_1 @@ -77,16 +77,16 @@ hwinfo-21.80_1 isync-1.4.4_1 jack-1.9.20_1 keychain-2.8.5_2 -krita-5.0.0_3 +krita-5.0.2_1 lf-r26_1 -libOSMesa-32bit-21.3.3_2 -libdrm-32bit-2.4.109_1 +libOSMesa-32bit-21.3.5_1 +libdrm-32bit-2.4.110_1 libfcitx-gtk-4.2.9.8_5 libfcitx-gtk3-4.2.9.8_5 libgcc-32bit-10.2.1pre1_3 libglvnd-32bit-1.4.0_1 -libspa-alsa-0.3.43_1 -libspa-alsa-32bit-0.3.43_1 +libspa-alsa-0.3.47_1 +libspa-alsa-32bit-0.3.47_1 libstdc++-32bit-10.2.1pre1_3 linux-headers-5.15_1 lm_sensors-3.6.0_1 @@ -94,33 +94,32 @@ lolcat-c-1.2_1 lua53-devel-5.3.5_7 lua54-devel-5.4.3_2 luarocks-lua54-3.7.0_1 -lutris-0.5.9.1_1 maim-5.7.4_3 -mesa-dri-21.3.3_2 -mesa-dri-32bit-21.3.3_2 -mesa-vaapi-21.3.3_2 -mesa-vaapi-32bit-21.3.3_2 -mesa-vdpau-21.3.3_2 -mesa-vdpau-32bit-21.3.3_2 -mesa-vulkan-intel-21.3.3_2 -mesa-vulkan-intel-32bit-21.3.3_2 -mesa-vulkan-overlay-layer-21.3.3_2 -mesa-vulkan-overlay-layer-32bit-21.3.3_2 -mesa-vulkan-radeon-21.3.3_2 -mesa-vulkan-radeon-32bit-21.3.3_2 +mesa-dri-21.3.5_1 +mesa-dri-32bit-21.3.5_1 +mesa-vaapi-21.3.5_1 +mesa-vaapi-32bit-21.3.5_1 +mesa-vdpau-21.3.5_1 +mesa-vdpau-32bit-21.3.5_1 +mesa-vulkan-intel-21.3.5_1 +mesa-vulkan-intel-32bit-21.3.5_1 +mesa-vulkan-overlay-layer-21.3.5_1 +mesa-vulkan-overlay-layer-32bit-21.3.5_1 +mesa-vulkan-radeon-21.3.5_1 +mesa-vulkan-radeon-32bit-21.3.5_1 mlocate-0.26_7 -mosh-1.3.2_23 +mosh-1.3.2_24 mpv-0.34.1_1 msmtp-1.8.18_1 -mumble-1.4.230_2 +mumble-1.4.230_3 ncdu-1.16_1 ncurses-devel-6.2_4 neomutt-20211029_1 neovim-0.6.1_1 newsboat-2.26_1 nfs-utils-2.5.4_1 -nftables-1.0.1_1 -nicotine+-3.2.0_1 +nftables-1.0.2_1 +nicotine+-3.2.1_1 nodejs-16.13.2_2 noto-fonts-cjk-20190416_2 noto-fonts-emoji-2.034_1 @@ -134,17 +133,16 @@ pcsx2-32bit-1.6.0_2 perl-File-MimeInfo-0.30_1 perl-Text-CharWidth-0.04_7 pinentry-gtk-1.2.0_1 -pipe-viewer-0.1.7_1 +pipe-viewer-0.1.8_1 polybar-3.5.7_1 -protontricks-1.6.1_1 pulsemixer-1.5.1_2 python3-evdev-1.2.0_5 python3-neovim-0.4.3_2 python3-requests-2.27.1_1 qjackctl-0.9.6_1 ripgrep-13.0.0_1 -rofi-1.7.2_1 -rofi-emoji-2.2.0_1 +rofi-1.7.3_1 +rofi-emoji-2.3.0_1 rsync-3.2.3_3 setxkbmap-1.3.2_1 shellcheck-0.8.0_1 @@ -152,7 +150,7 @@ shfmt-3.4.2_1 simple-mtpfs-0.4.0_1 snooze-0.5_1 socklog-void-20200115_2 -steam-1.0.0.74_1 +steam-1.0.0.74_2 strace-5.15_1 sv-netmount-0.1_3 sxhkd-0.6.2_1 @@ -163,7 +161,7 @@ tremc-0.9.2_2 tty-solitaire-1.3.1_1 udevil-0.4.4_5 unclutter-xfixes-1.6_1 -unrar-6.1.3_2 +unrar-6.1.5_1 vkBasalt-0.3.2.4_1 vkBasalt-32bit-0.3.2.4_1 vkd3d-1.2_1 @@ -171,22 +169,22 @@ vkd3d-32bit-1.2_1 void-repo-multilib-6_3 void-repo-multilib-nonfree-6_3 void-repo-nonfree-9_5 -wine-7.0_1 -wine-32bit-7.0_1 -wine-devel-7.0_1 -wine-devel-32bit-7.0_1 +wine-7.3_1 +wine-32bit-7.3_1 +wine-devel-7.3_1 +wine-devel-32bit-7.3_1 wine-gecko-2.47.2_1 -wine-mono-7.0.0_1 -wine-tools-7.0_1 +wine-mono-7.1.1_1 +wine-tools-7.3_1 winetricks-20210825_1 words-web2-326913_2 xclip-0.13_2 xcompmgr-1.1.8_2 xdg-utils-1.1.3_4 xdo-0.5.7_3 -xf86-video-fbdev-0.5.0_1 -xf86-video-nouveau-1.0.17_1 -xf86-video-vesa-2.5.0_1 +xf86-video-fbdev-0.5.0_2 +xf86-video-nouveau-1.0.17_2 +xf86-video-vesa-2.5.0_2 xinput-1.6.3_1 xkcdpass-1.19.3_2 xkill-1.0.5_1 @@ -197,12 +195,12 @@ xrdb-1.2.1_1 xset-1.2.4_1 xsetroot-1.1.2_1 xtools-0.63_1 -zathura-0.4.8_1 +zathura-0.4.9_1 zathura-cb-0.1.9_1 -zathura-pdf-mupdf-0.3.7_3 +zathura-pdf-mupdf-0.3.7_5 zip-3.0_6 zita-alsa-pcmi-0.4.0_1 zita-alsa-pcmi-32bit-0.4.0_1 -zsh-5.8_2 +zsh-5.8.1_1 zsh-history-substring-search-1.0.2_2 zsh-syntax-highlighting-0.7.1_3