From 7405e6d5e83628d0bcbfdc54ac95d884074875c4 Mon Sep 17 00:00:00 2001 From: deadguy Date: Wed, 3 Nov 2021 22:57:30 -0300 Subject: [PATCH] retoques y eso --- fzf-marks | 6 +- mpv/mpv.conf | 4 +- nvim/init.lua | 26 +++--- nvim/lua/plugins/lspconfig.lua | 1 - nvim/plugin/autocmds.vim | 2 + nvim/plugin/settings.vim | 4 +- zsh/.zshrc | 2 +- zsh/conf/03_aliases.zsh | 141 +++++++++++++++++---------------- 8 files changed, 93 insertions(+), 93 deletions(-) diff --git a/fzf-marks b/fzf-marks index 5b4ed4f..1708ea7 100644 --- a/fzf-marks +++ b/fzf-marks @@ -9,13 +9,13 @@ xresources : /home/corpse/.config/X11/xresources polybar : /home/corpse/.config/polybar/config correo : /home/corpse/.config/neomutt keys : /home/corpse/.config/sxhkd/sxhkdrc -mpv : /home/corpse/.config/mpv/mpv.conf xinit : /home/corpse/.config/X11/xinitrc bspwm : /home/corpse/.config/bspwm/bspwmrc terminal : /home/corpse/.config/alacritty.yml -zsh : /home/corpse/.config/zsh zshenv : /home/corpse/.zshenv lf : /home/corpse/.config/lf/lfrc tmux : /home/corpse/.config/tmux/tmux.conf -nvim : /home/corpse/.config/nvim alias : /home/corpse/.config/zsh/conf/03_aliases.zsh +mpv : /home/corpse/.config/mpv/mpv.conf +zsh : /home/corpse/.config/zsh +nvim : /home/corpse/.config/nvim diff --git a/mpv/mpv.conf b/mpv/mpv.conf index ea52cab..b1e07a6 100644 --- a/mpv/mpv.conf +++ b/mpv/mpv.conf @@ -13,8 +13,8 @@ stop-playback-on-init-failure=yes idle=once osc=yes cache=yes -cache-pause=no -ytdl-format=bestvideo[height<=?1080]+bestaudio/best +cache-pause-wait=180 +demuxer-max-bytes=10240k ytdl-raw-options=youtube-skip-dash-manifest=,no-call-home=,no-cache-dir=,geo-bypass= screenshot-format=png screenshot-directory="~/img/scrot" diff --git a/nvim/init.lua b/nvim/init.lua index 1c55922..3205a41 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -2,12 +2,9 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ',' vim.o.termguicolors = true -local execute = vim.api.nvim_command -local fn = vim.fn -local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim' -if fn.empty(fn.glob(install_path)) > 0 then - fn.system({'git', 'clone', 'https://github.com/wbthomason/packer.nvim', install_path}) - execute 'packadd packer.nvim' +local install_path = vim.fn.stdpath 'data' .. '/site/pack/packer/start/packer.nvim' +if vim.fn.empty(vim.fn.glob(install_path)) > 0 then + vim.fn.execute('!git clone https://github.com/wbthomason/packer.nvim ' .. install_path) end require('packer').startup({function(use) @@ -17,18 +14,19 @@ require('packer').startup({function(use) require('impatient') end }) +use { 'nathom/filetype.nvim' } use { 'neovim/nvim-lspconfig', requires = {'ray-x/lsp_signature.nvim'}, config = [[ require('plugins/lspconfig') ]] } use { 'hrsh7th/nvim-cmp', requires = { - "hrsh7th/cmp-nvim-lsp", + 'hrsh7th/cmp-nvim-lsp', "hrsh7th/cmp-nvim-lua", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - "saadparwaiz1/cmp_luasnip", + 'hrsh7th/cmp-buffer', + 'hrsh7th/cmp-path', + 'saadparwaiz1/cmp_luasnip', }, config = [[ require('plugins/cmp') ]], } - use { 'L3MON4D3/LuaSnip', requires = { "rafamadriz/friendly-snippets", }} + use { 'L3MON4D3/LuaSnip', requires = { 'rafamadriz/friendly-snippets', }} use { 'windwp/nvim-autopairs', config = [[ require('plugins/autopairs') ]] } use { 'nvim-telescope/telescope.nvim', requires = { @@ -39,18 +37,17 @@ config = [[ require('plugins/cmp') ]], } use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate', config = [[ require('plugins/treesitter') ]] } use { 'ellisonleao/gruvbox.nvim', requires = {'rktjmp/lush.nvim', opt = true}, } -use { 'kyazdani42/nvim-web-devicons', after = 'gruvbox.nvim', config = [[ require('plugins/webdevicons_nvim') ]] } +use { 'kyazdani42/nvim-web-devicons', after = 'gruvbox.nvim', opt =true, config = [[ require('plugins/webdevicons_nvim') ]] } use { 'numToStr/Comment.nvim', require('Comment').setup() } use { 'norcalli/nvim-colorizer.lua', config = [[ require('plugins/colorizer') ]] } use { 'tpope/vim-fugitive', opt = true, cmd = { "Git", "Gdiff", "Gblame", "Glog", "Git mergetool" }, } use { 'lewis6991/gitsigns.nvim', event = { "BufRead", "BufNewFile" }, requires = { 'nvim-lua/plenary.nvim', opt = true, }, config = [[ require('plugins/gitsigns_nvim') ]] } use { - "folke/lsp-trouble.nvim", + 'folke/lsp-trouble.nvim', requires = { 'kyazdani42/nvim-web-devicons', opt = true }, config = function() require("trouble").setup() end, cmd = { "LspTrouble" }, - requires = "kyazdani42/nvim-web-devicons", } end, config = { @@ -62,3 +59,4 @@ config = { } }}) require('packer_compiled') +vim.g.did_load_filetypes = 1 diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua index 28386f1..fa63934 100644 --- a/nvim/lua/plugins/lspconfig.lua +++ b/nvim/lua/plugins/lspconfig.lua @@ -36,7 +36,6 @@ local on_attach = function(client, bufnr) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '}d', 'lua vim.lsp.diagnostic.goto_next()', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'qq', 'lua vim.lsp.diagnostic.set_loclist()', opts) - vim.cmd [[ command! Format execute 'lua vim.lsp.buf.formatting()' ]] vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = "single", }) diff --git a/nvim/plugin/autocmds.vim b/nvim/plugin/autocmds.vim index de138bf..d30b6b4 100644 --- a/nvim/plugin/autocmds.vim +++ b/nvim/plugin/autocmds.vim @@ -19,6 +19,8 @@ if !exists('autocommands_loaded') && has('autocmd') aug OnSave au BufWritePre * if index(ftToIgnore, &ft) < 0 | :%s/\s\+$//e + au BufWritePre * silent! lua vim.lsp.buf.formatting_sync() + au BufWritePost init.lua PackerCompile au BufWritePost *xresources !xrdb % au BufWritePost *sxhkdrc !pkill -USR1 sxhkd au QuitPre * if empty(&buftype) | lclose | endif diff --git a/nvim/plugin/settings.vim b/nvim/plugin/settings.vim index c79dec8..c0a98ad 100644 --- a/nvim/plugin/settings.vim +++ b/nvim/plugin/settings.vim @@ -1,12 +1,12 @@ set inccommand=nosplit set clipboard^=unnamedplus set number -set signcolumn="auto:4" +set signcolumn="yes" set noswapfile set hidden set lazyredraw set matchpairs+=<:> -set updatetime=100 +set updatetime=250 set splitbelow set splitright set notimeout diff --git a/zsh/.zshrc b/zsh/.zshrc index 8323c5f..317dc72 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -25,7 +25,7 @@ setopt MULTIOS # Write to multiple descriptors. setopt AUTO_PARAM_SLASH # Tab completing directory appends a slash setopt PROMPT_SUBST -hash tmux 2>/dev/null && source ${ZDOTDIR}/tmux.zsh +source ${ZDOTDIR}/tmux.zsh foreach programa ( doc/fzf/completion.zsh diff --git a/zsh/conf/03_aliases.zsh b/zsh/conf/03_aliases.zsh index b8f977c..0e0c542 100644 --- a/zsh/conf/03_aliases.zsh +++ b/zsh/conf/03_aliases.zsh @@ -1,30 +1,31 @@ # Programas alias \ - v='$EDITOR' \ - x='xui' \ - m='neomutt' \ - z='zathura' \ - g='git' \ - vv='nvi' \ - se='doas nvim' \ - am='alsamixer' \ - pm='pulsemixer' \ - nb='newsboat -q' \ - py='python ' \ - irc='catgirl' \ - ytv='pipe-viewer' \ - vdf='nvim -d' \ - vkl='vkpurge list' \ - sxiv='sxiv-rifle' \ - news='neomutt -G' \ - pyserv='python -m http.server' + v='$EDITOR' \ + x='xui' \ + m='neomutt' \ + z='zathura' \ + g='git' \ + vv='nvi' \ + se='doas nvim' \ + am='alsamixer' \ + pm='pulsemixer' \ + nb='newsboat -q' \ + py='python ' \ + irc='catgirl' \ + ytv='pipe-viewer' \ + vdf='nvim -d' \ + vkl='vkpurge list' \ + sxiv='sxiv-rifle' \ + news='neomutt -G' \ + pyserv='python -m http.server' \ + manga='mangadesk_x64' # XBPS alias \ - xk='xbps-query' \ - deps='xbps-query -vRx' \ - revdeps='xbps-query -vRX' \ - xp='xbps-query -m > ~/doc/xbpaketes' + xk='xbps-query' \ + deps='xbps-query -vRx' \ + revdeps='xbps-query -vRX' \ + xp='xbps-query -m > ~/.config/xbpaketes' # Tmux alias tmux='tmux -2' @@ -34,69 +35,69 @@ else alias txa='tmux attach-session -t' fi alias \ - txn='tmux new-session -s' \ - txk='tmux kill-session -t' \ - txz='tmux kill-server' + txn='tmux new-session -s' \ + txk='tmux kill-session -t' \ + txz='tmux kill-server' # Transmission alias \ - tsk='pkill transmission-da' \ - ts='transmission-remote' \ - tsl='transmission-remote --list' + tsk='pkill transmission-da' \ + ts='transmission-remote' \ + tsl='transmission-remote --list' # Dotfiles alias \ - hxa='git add -v' \ - hxu='git add -vu' \ - hxc='git commit' \ - hxs='git status' \ - hxl='git log --stat' \ - hxd='git rm -r --cached' \ - hxr='git rm --cached' + hxa='git add -v' \ + hxu='git add -vu' \ + hxc='git commit' \ + hxs='git status' \ + hxl='git log --stat' \ + hxd='git rm -r --cached' \ + hxr='git rm --cached' # MAXIMUM VERBOSITY YIELDS MAXIMUM RESULTS alias \ - chmod='chmod -v' \ - chown='chown -v' \ - mv='mv -iv' \ - rmdir='rmdir -v' \ - mkdir='mkdir -pv' \ - cp='cp -raiv' \ - rm='rm -Iv' \ - ln='ln -iv' \ - mount='mount -v' \ - umount='umount -v' + chmod='chmod -v' \ + chown='chown -v' \ + mv='mv -iv' \ + rmdir='rmdir -v' \ + mkdir='mkdir -pv' \ + cp='cp -raiv' \ + rm='rm -Iv' \ + ln='ln -iv' \ + mount='mount -v' \ + umount='umount -v' # Colores para pintar este twist alias \ - diff='diff --color=auto' \ - ls='ls -AFt --color=always --group-directories-first' \ - grep='grep --color=tty -d skip' \ - dmesg='dmesg --color=always' \ - ip='ip -c' \ + diff='diff --color=auto' \ + ls='ls -AFt --color=always --group-directories-first' \ + grep='grep --color=tty -d skip' \ + dmesg='dmesg --color=always' \ + ip='ip -c' \ # Con opciones por defecto alias \ - ll='ls -coghptFAB --group-directories-first --time-style=+"%d-%m-%Y %H:%M"' \ - sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS}' \ - lsblk='lsblk -o "KNAME,HOTPLUG,SIZE,FSTYPE,TYPE,LABEL,MOUNTPOINT,UUID,MODEL,SERIAL"' \ - df='df -hT --total' \ - free='free -ht' \ - du='du -sh' \ - ping='ping -c 5' \ - dd='dd status=progress' \ - dfc='dfc -dmT' \ - wget='wget --no-hsts' \ - sol='ttysolitaire --no-background-color -p 10' + ll='ls -coghptFAB --group-directories-first --time-style=+"%d-%m-%Y %H:%M"' \ + sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS}' \ + lsblk='lsblk -o "KNAME,HOTPLUG,SIZE,FSTYPE,TYPE,LABEL,MOUNTPOINT,UUID,MODEL,SERIAL"' \ + df='df -hT --total' \ + free='free -ht' \ + du='du -sh' \ + ping='ping -c 5' \ + dd='dd status=progress' \ + dfc='dfc -dmT' \ + wget='wget --no-hsts' \ + sol='ttysolitaire --no-background-color -p 10' # Comandos alias \ - sudo='doas ' \ - reboot='doas shutdown -r now' \ - shutdown='doas shutdown -h now' \ - path='echo -e ${PATH//:/\\n}' \ - wp='sxiv-rifle ~/img/wallpaper >/dev/null 2>&1' \ - pwn='chmod +x' \ - rat='tar -xf' \ - um='udevil mount' \ - uu='udevil umount' + sudo='doas ' \ + reboot='doas shutdown -r now' \ + shutdown='doas shutdown -h now' \ + path='echo -e ${PATH//:/\\n}' \ + wp='sxiv-rifle ~/img/wallpaper >/dev/null 2>&1' \ + pwn='chmod +x' \ + rat='tar -xf' \ + um='udevil mount' \ + uu='udevil umount'