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