dgy
/
hexagons
Archived
1
0
Fork 0

revertir un par de cosas que no me gustaron y un par que no funcionaron. bleh

This commit is contained in:
deadguy 2019-12-03 11:50:43 -03:00
parent 2dee72a0c9
commit a39f21b543
Signed by: dgy
GPG Key ID: 37CA55B52CF63730
7 changed files with 176 additions and 190 deletions

View File

@ -1,6 +1,8 @@
#!/usr/bin/env bash
set -euf -o pipefail
multipantalla &
# Si se usa un numero negativo en *_padding, solamente se ven huecos entre las ventanas, pero no entre las ventanas y los bordes del escritorio
bspc config window_gap 6
bspc config top_padding 0
@ -70,6 +72,5 @@ bspc rule -a Firefox desktop='^2'
bspc rule -a Termite:archi desktop='^3'
bspc rule -a Termite:multi desktop='^1'
multipantalla &
setbg &
unclutter &

View File

@ -1,79 +1,96 @@
{
"suggest.enablePreview": true,
"suggest.snippetIndicator": "►",
"suggest.triggerCompletionWait": 100,
"suggest.echodocSupport": true,
"suggest.completionItemKindLabels": {
"keyword": "\uf1de",
"variable": "\ue79b",
"value": "\uf89f",
"operator": "\u03a8",
"function": "\u0192",
"reference": "\ufa46",
"constant": "\uf8fe",
"method": "\uf09a",
"struct": "\ufb44",
"class": "\uf0e8",
"interface": "\uf417",
"text": "\ue612",
"enum": "\uf435",
"enumMember": "\uf02b",
"module": "\uf40d",
"color": "\ue22b",
"property": "\ue624",
"field": "\uf9be",
"unit": "\uf475",
"event": "\ufacd",
"file": "\uf723",
"folder": "\uf114",
"snippet": "\ue60b",
"typeParameter": "\uf728",
"default": "\uf29c"
},
"suggest.maxCompleteItemCount": 20,
"diagnostic.displayByAle": true,
"diagnostic.refreshOnInsertMode": true,
"diagnostic.refreshAfterSave": true,
"diagnostic.infoSign": "i",
"diagnostic.errorSign": "✖",
"signature.triggerSignatureWait": 100,
"codeLens.enable": true,
"coc.preferences.currentFunctionSymbolAutoUpdate": true,
"coc.preferences.formatOnSaveFiletypes": ["css","markdown"],
"session.saveOnVimLeave": false,
"list.source.files.command": "fd",
"list.source.files.args": ["-t", "f", "-S", "-2m", "-F", "-H"],
"list.source.grep.args": ["--vimgrep", "--hiden", "--no-heading"],
"list.source.mru.ignoreGitIgnore": true,
"explorer.width": 20,
"explorer.icon.enableNerdfont": true,
"explorer.buffer.columns": [
"selection",
"bufnr",
"name",
"modified"
],
"explorer.file.columns": [
"git",
"selection",
"clip",
"indent",
"icon",
"filename"
],
"explorer.keyMappings": {
"v": "openInVsplit",
"s": "openInSplit",
"f": "addFile",
"D": "addDirectory",
"dd": "deleteForever",
"b": "search"
},
"javascript.suggest.paths": true,
"javascript.suggest.completeFunctionCalls": true,
"eslint.trace.server": "verbose",
"eslint.autoFix": true,
"eslint.autoFixOnSave": true,
"eslint.filetypes": ["javascript", "javascript.jsx", "typescript", "typescriptreact", "javascriptreact"]
"suggest.enablePreview": true,
"suggest.snippetIndicator": "►",
"suggest.triggerCompletionWait": 100,
"suggest.echodocSupport": true,
"suggest.maxPreviewWidth": 100,
"suggest.completionItemKindLabels": {
"keyword": "\uf1de",
"variable": "\ue79b",
"value": "\uf89f",
"operator": "\u03a8",
"function": "\u0192",
"reference": "\ufa46",
"constant": "\uf8fe",
"method": "\uf09a",
"struct": "\ufb44",
"class": "\uf0e8",
"interface": "\uf417",
"text": "\ue612",
"enum": "\uf435",
"enumMember": "\uf02b",
"module": "\uf40d",
"color": "\ue22b",
"property": "\ue624",
"field": "\uf9be",
"unit": "\uf475",
"event": "\ufacd",
"file": "\uf723",
"folder": "\uf114",
"snippet": "\ue60b",
"typeParameter": "\uf728",
"default": "\uf29c"
},
"diagnostic.displayByAle": true,
"diagnostic.refreshOnInsertMode": true,
"diagnostic.refreshAfterSave": true,
"diagnostic.checkCurrentLine": true,
"diagnostic.maxWindowHeight": 20,
"diagnostic.errorSign": "✖",
"diagnostic.warningSign": "⚠",
"diagnostic.infoSign": "●",
"diagnostic.hintSign": "○",
"coc.preferences.formatOnSaveFiletypes": [
"markdown",
"javascript",
"javascriptreact",
"typescript",
"typescriptreact",
"json",
"graphql",
"css",
"scss",
"html"
],
"coc.preferences.currentFunctionSymbolAutoUpdate": true,
"codeLens.enable": true,
"signature.triggerSignatureWait": 100,
"session.saveOnVimLeave": false,
"list.source.files.command": "fd",
"list.source.files.args": ["-t", "f", "-S", "-2m", "-F", "-H"],
"list.source.grep.args": ["--vimgrep", "--hiden", "--no-heading"],
"list.source.mru.ignoreGitIgnore": true,
"list.previewSplitRight": true,
"explorer.width": 30,
"explorer.icon.enableNerdfont": true,
"explorer.buffer.columns": ["selection", "bufnr", "name", "modified"],
"explorer.file.columns": [
"git",
"selection",
"clip",
"indent",
"icon",
"filename"
],
"explorer.keyMappings": {
"v": "openInVsplit",
"s": "openInSplit",
"f": "addFile",
"D": "addDirectory",
"dd": "deleteForever",
"b": "search"
},
"eslint.trace.server": "verbose",
"eslint.autoFix": true,
"eslint.autoFixOnSave": true,
"eslint.filetypes": [
"javascript",
"javascript.jsx",
"typescript",
"typescriptreact",
"javascriptreact"
],
"prettier.eslintIntegration": true,
"prettier.stylelintIntegration": true,
"prettier.disableSuccessMessage": true
}

View File

@ -20,19 +20,13 @@ set grepformat=%f:%l:%c:%m,%f:%l:%m
" Plugins {{{
call plug#begin('~/.config/nvim/plugged')
Plug 'w0rp/ale'
Plug 'sheerun/vim-polyglot'
Plug 'othree/yajs.vim', {'for': 'javascript'}
Plug 'othree/es.next.syntax.vim', {'for': 'javascript'}
" Plug 'mhartington/nvim-typescript', {'do': './install.sh', 'for': 'typescript'}
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'yuezk/vim-js', {'for': 'javascript'}
Plug 'sheerun/vim-polyglot'
Plug 'liuchengxu/vista.vim'
Plug 'tmsvg/pear-tree'
Plug 'tpope/vim-commentary'
Plug 'honza/vim-snippets'
" Plug '/usr/bin/fzf'
" Plug 'junegunn/fzf.vim'
Plug 'Shougo/defx.nvim', { 'do': ':UpdateRemotePlugins' }
Plug 'kristijanhusak/defx-icons'
Plug 'mhartington/oceanic-next'
call plug#end()
" }}}
@ -43,9 +37,9 @@ set clipboard^=unnamedplus " system clipboard (requires +clipboard)
set fileencoding=utf-8 " The encoding written to file.
set shell=/bin/zsh " Setting shell to zsh
set number " Line numbers on
set relativenumber
set noshowmode
set laststatus=2
set relativenumber " For easier line jumps
set noshowmode " It's on the statusline
set laststatus=2 " Always show statusline
set pumheight=12 " Completion window max size
set helpheight=12 " Minimum help window height
set noswapfile " New buffers will be loaded without creating a swapfile
@ -67,15 +61,14 @@ set visualbell " Use visual bell instead of beeping
set scrolloff=5 " Keep this many lines padding when scrolling
set shortmess+=aoOIWcs " Shorten messages and don't show intro
set tabstop=4 " Number of spaces a <Tab> equals
"set shiftwidth=4 " Number of spaces for each (auto)indent step
set foldnestmax=10 " Deepest fold is 10 levels
set foldmethod=marker " Markers are used to specify folds.
set foldlevelstart=10
set foldclose=all
set foldclose=all " Folds closed by default
set title
" set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:~:.:h\")})%)%(\ %a%)
set selectmode=key
set keymodel=startsel
set selectmode=key " Shift + arrow keys for selecting text
set keymodel=startsel " This one complements the one above it
set signcolumn=yes " Gutter for diagnostics and git status
set softtabstop=4
set breakindent
set redrawtime=500
@ -90,7 +83,6 @@ set undolevels=1000
set undoreload=10000
set undodir=$HOME/.config/nvim/undo
set formatoptions+=nj
set signcolumn=yes
set pastetoggle=<F12>
set fillchars+=vert:\│
@ -108,6 +100,8 @@ match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
let mapleader="\<SPACE>"
let maplocalleader=","
let formatlistpat='^\s*\(\d\+[\]:.)}\t ]\|[*-][\t ]\)\s*'
let g:vim_jsx_pretty_colorful_config = 1
" }}}
" {{{ Ale
let g:ale_use_global_executables = 1
@ -127,22 +121,22 @@ let g:ale_loclist_msg_format = '[%linter%] %s% (code)% [%severity%]'
let g:ale_set_highlights = 1
let g:ale_set_signs = 1
let g:ale_set_balloons = 1
let g:ale_linter_aliases = {
\ 'jsx': ['css', 'javascript'],
\ 'vue': ['vue', 'javascript'],
\}
let g:ale_linters = {
\ 'javascript': ['prettier_standard'],
\ 'jsx': ['stylelint', 'eslint'],
\ 'html': ['prettier_standard'],
\ 'css': ['prettier_standard'],
\ 'scss': ['prettier_standard'],
\ 'jsx': ['eslint'],
\ 'json': ['prettier'],
\ 'html': ['prettier'],
\ 'css': ['stylelint', 'eslint'],
\ 'scss': ['stylelint', 'eslint'],
\ 'bash': ['shellcheck'],
\}
let g:ale_fixers = {
\ 'javascript': ['prettier_standard'],
\ 'scss': ['prettier_standard'],
\ 'css': ['prettier_standard'],
\ 'jsx': ['prettier_standard'],
\ 'json': ['prettier'],
\ 'css': ['stylelint', 'eslint'],
\ 'scss': ['stylelint', 'eslint'],
\ 'html': ['prettier_standard'],
\ 'markdown': ['prettier'],
\}
@ -167,21 +161,12 @@ nmap <leader>or <Plug>(coc-rename)
nnoremap <silent> <leader>ol :<C-u>CocList outline<CR>
nnoremap <silent> <leader>o/ :<C-u>CocList -I symbols<CR>
" Snippets
imap <C-j> <Plug>(coc-snippets-expand-jump)
" Explorer
" nmap <F5> :CocCommand explorer<CR>
function! ExploreCurrentBufferHead()
return ":CocCommand explorer" . expand('%:h')
endfunction
nnoremap <expr> <F5> ExploreCurrentBufferHead() . "\<CR>"
nmap <silent><F5> :CocCommand explorer<CR>
" Lists
nnoremap <silent><F1> :<C-u>CocList -S --ignore-case helptags<CR>
nnoremap <silent><F2> :<C-u>CocList -S --ignore-case files<CR>
nnoremap <silent><F2> :<C-u>CocList --ignore-case files<CR>
nnoremap <silent><F3> :<C-u>CocList --normal buffers<CR>
nnoremap <silent><F4> :<C-u>CocList windows<CR>
nnoremap <silent><leader>p/ :<C-u>CocList -I grep<CR>
@ -201,6 +186,8 @@ let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
endfunction
" Snippets
imap <C-j> <Plug>(coc-snippets-expand-jump)
let g:coc_snippet_next = '<tab>'
let g:coc_snippet_prev = '<S-TAB>'
"}}}
@ -212,11 +199,6 @@ let g:vista#renderer#enable_icon = 1
nnoremap <silent> <F9> :Vista!!<cr>
" }}}
" JS {{{
let g:polyglot_disabled = ['javascript']
let g:jsx_ext_required = 1
let g:yats_host_keyword = 1
"}}}
" Colors {{{
set termguicolors
let g:oceanic_next_terminal_italic = 1
@ -234,14 +216,11 @@ hi! Comment cterm=italic ctermbg=NONE guibg=NONE
hi! Normal ctermbg=NONE guibg=NONE
hi! NonText ctermbg=NONE guibg=NONE
hi! LineNr guibg=NONE
" hi! LineNr ctermbg=232 ctermfg=237 guibg=NONE guifg=#3a3a3a
hi! CursorLineNr ctermbg=236 ctermfg=NONE guibg=#303030
hi! CursorLine ctermbg=236 ctermfg=NONE guibg=#303030
hi! SignColumn ctermbg=NONE guibg=NONE
hi! Folded ctermbg=NONE guibg=NONE
" hi! TabLine cterm=None ctermbg=NONE guibg=#080808
" hi! TabLineSel cterm=None ctermbg=NONE guibg=#080808
" hi! TabLineFill cterm=None ctermbg=NONE guibg=#080808 guifg=#080808
hi! TabLineFill cterm=None ctermbg=NONE guibg=#080808 guifg=#080808
hi! EndOfBuffer ctermbg=NONE ctermfg=NONE guibg=NONE guifg=#080808
hi! WildMenu ctermfg=226 ctermbg=0 guifg=#ffff00 guibg=#000000
hi! link CocErrorSign WarningMsg
@ -486,6 +465,9 @@ nnoremap <F8> :w! \| !compiler <c-r>%<CR>
nnoremap <leader>pu :PlugUpdate<CR>
nnoremap <leader>pU :PlugUpgrade<CR>
nnoremap ¿ G
nnoremap <Bar> gg
" Ñ master race
nnoremap ñ ;
nnoremap Ñ ,
@ -513,7 +495,7 @@ nnoremap <silent> <leader>b :bdelete<CR>
" Fast exits
nnoremap <silent> <leader>q :q!<CR>
nnoremap <leader>Q :qa!<CR>
nnoremap <silent> <leader>Q :qa!<CR>
" Splits
nnoremap <leader>T :terminal<CR>
@ -530,16 +512,12 @@ nnoremap <leader>" viW<esc>a"<esc>gvo<esc>i"<esc>gvo<esc>3l
nnoremap <leader>' viW<esc>a'<esc>gvo<esc>i'<esc>gvo<esc>3l
" Move a line of text using Shift+[jk]
nnoremap <S-j> mz:m+<cr>`z
nnoremap <S-k> mz:m-2<cr>`z
nnoremap <silent> <S-j> mz:m+<cr>`z
nnoremap <silent> <S-k> mz:m-2<cr>`z
" Unhighlight search terms
nnoremap <silent> <leader><space> :noh<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L>
" What about the Q
nnoremap Q <nop>
map q <nop>
" j = gj :: k = gk while preserving numbered jumps ie. 12j or 30k
nnoremap <buffer><silent><expr>j v:count ? 'j' : 'gj'
nnoremap <buffer><silent><expr>k v:count ? 'k' : 'gk'
@ -569,6 +547,10 @@ nnoremap # #zz
nnoremap g* g*zz
nnoremap g# g#zz
" What about the Q
nnoremap Q <nop>
map q <nop>
" Shift butterfinger
:command! WQ wq
:command! Wq wq
@ -640,22 +622,16 @@ function! CmdLine(str)
call feedkeys(":" . a:str)
endfunction
function! VisualSelection(direction, extra_filter) range
let l:saved_reg = @"
execute "normal! vgvy"
let l:pattern = escape(@", "\\/.*'$^~[]")
let l:pattern = substitute(l:pattern, "\n$", "", "")
if a:direction == 'gv'
call CmdLine("Ack '" . l:pattern . "' " )
elseif a:direction == 'replace'
call CmdLine("%s" . '/'. l:pattern . '/')
endif
let @/ = l:pattern
let @" = l:saved_reg
" vp doesn't replace paste buffer
function! RestoreRegister()
let @" = s:restore_reg
return ''
endfunction
function! s:Repl()
let s:restore_reg = @"
return "p@=RestoreRegister()\<cr>"
endfunction
vmap <silent> <expr> p <sid>Repl()
" global replace
vnoremap <Leader>sw "hy

View File

@ -44,8 +44,9 @@ alias umount='umount -v'
alias cat='bat --color=always --terminal-width=-10'
alias buscar="rg --files --color='always' --heading --line-number --no-messages --no-ignore --hidden --follow --smart-case --glob '!.git/' --glob '!node_modules/' --regexp"
alias ncdu='ncdu --color dark -rr -x --exclude .git --exclude node_modules'
alias ls='ls -Ft --color=always --group-directories-first'
alias lst='ls -FAghoBtH --group-directories-first --dereference-command-line-symlink-to-dir --time-style=+"%d-%m-%Y %H:%M"'
alias ls='ls -pvx --color=always --group-directories-first'
alias ll='ls -Ft --color=always --group-directories-first'
alias lt='ls -coghpFAB --group-directories-first --time-style=+"%d-%m-%Y %H:%M"'
alias grep='grep --color=tty -d skip'
alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} '
alias dmesg='dmesg --color=always'

View File

@ -14,8 +14,6 @@ blueman
brandr
bspwm
cadence
calf
carla
compton
compton-conf
cpupower
@ -93,6 +91,7 @@ manjaro-release
manjaro-system
mediainfo
memtest86+
mixxx
mkinitcpio-openswap
mlocate
mpc
@ -149,7 +148,6 @@ python-rope
python-setproctitle
python-virtualenv
python-wheel
python2-pygame-sdl2
qalculate-gtk
qt5ct
realtime-privileges
@ -161,6 +159,7 @@ rtirq
rtv
s-nail
sc3-plugins
sdl2_mixer
seahorse
shellcheck
smartmontools
@ -171,7 +170,6 @@ sublime-text
surfraw
sxhkd
systemd-sysvcompat
tcllib
termite
texlive-fontsextra
texlive-formatsextra

View File

@ -21,13 +21,11 @@ nerd-fonts-roboto-mono
otf-nerd-fonts-monacob-mono
otf-san-francisco
perl-extract-url
perl-uri-find
pmount
postman-bin
pureref
pymdown-extensions
python-lolcat
python-proc
python-pysdl2
ranger-git
realtimeconfigquickscan-git
@ -37,6 +35,7 @@ soulseekqt
stylelint
syncterm
task-spooler
tcllib
terminus-font-ll2-td1
toilet-fonts
transmission-remote-cli-git

View File

@ -1,40 +1,34 @@
#!/usr/bin/env bash
set -euf -o pipefail
pidof umonitor >/dev/null
if ! pidof umonitor
then
rm ~/.umonitor.lock
umonitor --listen --quiet &
I=1
M=$(bspc query -M | wc -l)
if [[ "$M" == 1 ]]; then
bspc monitor -d 1 2 3 4 5 6 7 8 9 10
elif [[ "$M" == 2 ]]; then
bspc monitor "$(bspc query -M | awk NR==1)" -d 1 2 3 4 5
bspc monitor "$(bspc query -M | awk NR==2)" -d 6 7 8 9 10
elif [[ "$M" == 3 ]]; then
bspc monitor "$(bspc query -M | awk NR==1)" -d 1 2 3 4
bspc monitor "$(bspc query -M | awk NR==2)" -d 5 6 7
bspc monitor "$(bspc query -M | awk NR==3)" -d 8 9 10
elif [[ "$M" == 4 ]]; then
bspc monitor "$(bspc query -M | awk NR==1)" -d 1 2 3
bspc monitor "$(bspc query -M | awk NR==2)" -d 4 5 6
bspc monitor "$(bspc query -M | awk NR==3)" -d 7 8
bspc monitor "$(bspc query -M | awk NR==4)" -d 9 10
elif [[ "$M" == 5 ]]; then
bspc monitor "$(bspc query -M | awk NR==1)" -d 1 2
bspc monitor "$(bspc query -M | awk NR==2)" -d 3 4
bspc monitor "$(bspc query -M | awk NR==3)" -d 5 6
bspc monitor "$(bspc query -M | awk NR==4)" -d 7 8
bspc monitor "$(bspc query -M | awk NR==5)" -d 9 10
else
for monitor in $(bspc query -M); do
bspc monitor "$monitor" \
-n "$I" \
-d $I/{a,b,c}
(( I++ ))
done
fi
I=1
M=$(bspc query -M | wc -l)
if [[ "$M" == 1 ]]; then
bspc monitor -d 1 2 3 4 5 6 7 8 9 10
elif [[ "$M" == 2 ]]; then
bspc monitor "$(bspc query -M | awk NR==1)" -d 1 2 3 4 5
bspc monitor "$(bspc query -M | awk NR==2)" -d 6 7 8 9 10
elif [[ "$M" == 3 ]]; then
bspc monitor "$(bspc query -M | awk NR==1)" -d 1 2 3 4
bspc monitor "$(bspc query -M | awk NR==2)" -d 5 6 7
bspc monitor "$(bspc query -M | awk NR==3)" -d 8 9 10
elif [[ "$M" == 4 ]]; then
bspc monitor "$(bspc query -M | awk NR==1)" -d 1 2 3
bspc monitor "$(bspc query -M | awk NR==2)" -d 4 5 6
bspc monitor "$(bspc query -M | awk NR==3)" -d 7 8
bspc monitor "$(bspc query -M | awk NR==4)" -d 9 10
elif [[ "$M" == 5 ]]; then
bspc monitor "$(bspc query -M | awk NR==1)" -d 1 2
bspc monitor "$(bspc query -M | awk NR==2)" -d 3 4
bspc monitor "$(bspc query -M | awk NR==3)" -d 5 6
bspc monitor "$(bspc query -M | awk NR==4)" -d 7 8
bspc monitor "$(bspc query -M | awk NR==5)" -d 9 10
else
for monitor in $(bspc query -M); do
bspc monitor "$monitor" \
-n "$I" \
-d $I/{a,b,c}
(( I++ ))
done
fi