dgy
/
hexagons
Archived
1
0
Fork 0

regresiones porque soy un tarado. arregle 2 cositas de userChrome. un par de giladas mas.

This commit is contained in:
deadguy 2020-04-28 15:34:58 -03:00
parent 2fd0585931
commit c2ab43806d
Signed by: dgy
GPG Key ID: 37CA55B52CF63730
22 changed files with 267 additions and 269 deletions

View File

@ -43,7 +43,7 @@ st.borderpx: 10
st.cwscale: 1.05
st.chscale: 1.0
dmenu.font: JetBrainsMono Nerd Font:pixelsize=14:antialias=true:autohint=true;
dmenu.font: Iosevka Nerd Font:pixelsize=16:antialias=true:autohint=true;
dmenu.background: #222222
dmenu.foreground: #bbbbbb
dmenu.selbackground: #008bbd

View File

@ -36,42 +36,72 @@ font:
# as modifying the line spacing, and `offset.x` as modifying the letter spacing.
offset:
x: 1
y: 2
draw_bold_text_with_bright_colors: false
# Colors (Srcery)
colors:
# Default colors
primary:
background: '#080808'
foreground: '#B3B1AD'
# Cursor colors
cursor:
text: '#FFcc66'
cursor: '#FFcc66'
background: '0x080808'
foreground: '0xB3B1AD'
# Normal colors
normal:
black: '#0A0E14'
red: '#FF3333'
green: '#AEC82A'
yellow: '#FFB454'
blue: '#008bbd'
magenta: '#ab6ba6'
cyan: '#6fa69f'
white: '#A89984'
black: '0x1c1c1c'
red: '0xef2f27'
green: '0x519f50'
yellow: '0xfbb829'
blue: '0x2c78bf'
magenta: '0xe02c6d'
cyan: '0x0aaeb3'
white: '0xd0bfa1'
# Bright colors
bright:
black: '#222222'
red: '#FF3333'
green: '#Bae67e'
yellow: '#FFd580'
blue: '#73d0ff'
magenta: '#F28779'
cyan: '#95E6CB'
white: '#FFFFFF'
black: '0x555555'
red: '0xf75341'
green: '0x98bc37'
yellow: '0xfed06e'
blue: '0x68a8e4'
magenta: '0xff5c8f'
cyan: '0x53fde9'
white: '0xfce8c3'
# colors:
# # Default colors
# primary:
# background: '#080808'
# foreground: '#B3B1AD'
# # Cursor colors
# cursor:
# text: '#FFcc66'
# cursor: '#FFcc66'
# # Normal colors
# normal:
# black: '#0A0E14'
# red: '#FF3333'
# green: '#AEC82A'
# yellow: '#FFB454'
# blue: '#008bbd'
# magenta: '#ab6ba6'
# cyan: '#6fa69f'
# white: '#A89984'
# # Bright colors
# bright:
# black: '#222222'
# red: '#FF3333'
# green: '#Bae67e'
# yellow: '#FFd580'
# blue: '#73d0ff'
# magenta: '#F28779'
# cyan: '#95E6CB'
# white: '#FFFFFF'
visual_bell:
duration: 0

View File

@ -2,6 +2,7 @@
set -euf -o pipefail
bspc rule -r "*"
pkill alacritty
moni &
@ -42,6 +43,7 @@ bspc config active_border_color "$(get_xrdb color8)"
bspc config presel_feedback_color "$(get_xrdb color5)"
# Flotantes
bspc rule -a Pavucontrol state=floating
bspc rule -a Catia state=floating
bspc rule -a Cadence state=floating
bspc rule -a mpv state=floating
@ -49,8 +51,8 @@ bspc rule -a obs state=floating
bspc rule -a PdWindow state=floating
bspc rule -a PatchWindow state=floating
bspc rule -a Alacritty:flota state=floating
bspc rule -a Toplevel state=floating
bspc rule -a Sxiv:fontpreview state=floating
bspc rule -a Toplevel state=floating
bspc rule -a Firefox state=floating
bspc rule -a Display state=floating
@ -59,4 +61,4 @@ bspc rule -a Zathura state=tiled
bspc rule -a Firefox:Navigator state=tiled, desktop='^2'
bspc rule -a Alacritty:multi desktop='^1'
stx &
alacritty --class=multi -e termux &

View File

@ -13,10 +13,10 @@
excludesfile = /home/deadguy/.config/git/gitignore
autocrlf = input
whitespace = warn
pager = delta --plus-color="#012800" --minus-color="#340001"
[pager]
diff = diff-so-fancy | less --tabs=1,5 -SRX
show = diff-so-fancy | less --tabs=1,5 -SRX
[interactive]
diffFilter = delta --color-only
[web]
browser = firefox
@ -84,7 +84,9 @@
old = red bold
new = green bold
whitespace = red reverse
[diff-so-fancy]
stripLeadingSymbols = false
[gpg]
program = gpg2
program = gpg2
[log]
decorate = short

View File

@ -10,17 +10,17 @@ set reverse
set incsearch
set period 1
set color256
set nopreview
# set previewer print
# All other settings need to go above this comment because reasons
set icons
$lf -remote "send $id set previewer ${XDG_CONFIG_HOME}/lf/preview"
%{{
w=$(tput cols)
if [ $w -le 80 ]; then
lf -remote "send $id set ratios 1:1"
elif [ $w -le 160 ]; then
lf -remote "send $id set ratios 1:2:2"
lf -remote "send $id set ratios 1:2"
else
lf -remote "send $id set ratios 1:2:3"
fi
@ -28,16 +28,7 @@ $lf -remote "send $id set previewer ${XDG_CONFIG_HOME}/lf/preview"
# Custom Functions
cmd open ${{
case $(file --mime-type $f -bL) in
text/troff) man ./ $f;;
text/*) $EDITOR $fx;;
image/x-xcf|image/svg+xml) setsid gimp $f >/dev/null 2>&1 & ;;
image/gif) setsid sxiv-gif $f 2>/dev/null & ;;
image/*) setsid sxiv-rifle $f 2>/dev/null & ;;
audio/*) mpv $f ;;
video/*) setsid mpv $f -quiet >/dev/null 2>&1 & ;;
application/pdf|application/cbz|application/cbr) setsid zathura $fx >/dev/null 2>&1 & ;;
font/ttf|font/otf) setsid fontpreview $f ;;
case $(file --mime-type $f -b) in
*) for f in $fx; do setsid $OPENER $f > /dev/null 2>&1 & done;;
esac
}}
@ -208,9 +199,18 @@ cmd Link %{{
fi
}}
cmd nopreview &{{
lf -remote "send $id set preview!"
lf -remote "send $id set ratios 1:2" # or whatever
# toggle single column view
cmd no_preview :{{
set nopreview
set ratios 1:2
set info size:time
map ~ yes_preview
}}
cmd yes_preview :{{
set ratios 1:2:2
set preview
set info
map ~ no_preview
}}
cmd zip ${{
@ -251,6 +251,7 @@ map <enter> open
map <delete> delete
map . set hidden!
map "'" set preview!
map ~ no_preview
map | top
map ¿ bottom
map R reload
@ -266,15 +267,14 @@ map po paste-overwrite
map pi paste-interactive
map pr paste-rsync
map o open $f
map ee $$EDITOR "$f"
map ev $view "$f"
map cx $chmod +x "$fx"
map cx $chmod +x "$fs"
map bg $setbg $f
map U %du -sh $f
map Y %cp -ri $fs .
map D %mv -i $fs .
map za %zip -r "$f" "$f"
map zu $atool --each --extract "$f"
mal zl $atool --list "$f"
map mp $mpv "$f"
map i push A<c-a> # at the very beginning
@ -283,7 +283,7 @@ map I push A<a-b><c-b>. # before extension
map a push A<a-b> # after extension
map B bulkrename
map P :Link
map L :Link
map f broot_jump
map <tab> $lf -remote "send $id select '$(fzf)'"
map / $lf -remote "send $id select \"$(FZF_DEFAULT_COMMAND='fd --max-depth=1' fzf-tmux)\""

View File

@ -20,7 +20,7 @@ hwdec=vaapi
osd-level=1
osd-duration="3500"
osd-font="IBM Plex Sans"
osd-font-size="20"
osd-font-size="25"
osd-border-size="2"
osd-margin-x="10"
osd-margin-y="10"

View File

@ -15,11 +15,13 @@
"html.handlebars": "html",
"javascript": "javascriptreact"
},
"explorer.width": 30,
"explorer.width": 25,
"explorer.icon.expanded": "🞃",
"explorer.icon.collapsed": "🞂",
"explorer.icon.enableNerdfont": true,
"explorer.previewAction.onHover": false,
"explorer.keyMappings": {
"<cr>": ["expandable?", "expand", "open"],
"v": "open:vsplit",
"s": "open:split",
"f": "addFile",

View File

@ -7,8 +7,9 @@ let g:python3_host_prog = '/bin/python3'
let g:node_host_prog = '~/.local/share/npm/bin/neovim-node-host'
if empty(glob('~/.local/share/nvim/site/autoload/plug.vim'))
silent !curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
silent !curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
endif
" }}}
" Plugins {{{
@ -17,12 +18,11 @@ Plug 'dense-analysis/ale'
Plug 'othree/yajs.vim', {'for': 'javascript'}
Plug 'othree/es.next.syntax.vim', {'for': 'javascript'}
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'sheerun/vim-polyglot'
Plug 'liuchengxu/vista.vim', {'for': ['python', 'javascript', 'typescript']}
Plug 'jpalardy/vim-slime', {'for': ['python', 'foxdot']}
Plug 'sheerun/vim-polyglot'
Plug 'tmsvg/pear-tree'
Plug 'tpope/vim-commentary'
Plug 'mhartington/oceanic-next'
Plug 'srcery-colors/srcery-vim'
call plug#end()
" }}}
" Options {{{
@ -81,10 +81,12 @@ set undolevels=1000
set undoreload=10000
set undodir=$HOME/.config/nvim/undo
set formatoptions+=nl
set formatoptions-=crot
set pastetoggle=<F12>
set fillchars+=vert:\
set grepprg=rg\ --vimgrep\ --hidden\ --no-heading
set grepformat=%f:%l:%c:%m,%f:%l:%m
match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
set wildignore+=*.jpg,*.jpeg,*.bmp,*.gif,*.png,*.svg " image
set wildignore+=*.manifest " gb
@ -97,13 +99,11 @@ if &diff
highlight! link DiffText MatchParen
endif
match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
let mapleader="\<SPACE>"
let maplocalleader=','
let formatlistpat='^\s*\(\d\+[\]:.)}\t ]\|[*-][\t ]\)\s*'
let g:polyglot_disabled = ['javascript', 'python']
let g:vim_markdown_toc_autofit = 1
let g:markdown_fenced_languages = ['vim', 'help']
let g:vim_jsx_pretty_colorful_config = 1
let g:jsx_ext_required = 1
@ -137,27 +137,28 @@ let g:ale_linter_aliases = {
\}
let g:ale_linters = {
\ 'javascript': ['prettier_standard'],
\ 'jsx': ['prettier_standard'],
\ 'jsx': ['prettier_standard'],
\ 'typescript': ['tsserver', 'eslint'],
\ 'json': ['prettier_standard'],
\ 'html': ['prettier_standard'],
\ 'css': ['stylelint'],
\ 'scss': ['stylelint'],
\ 'bash': ['shellcheck'],
\ 'sh': ['shellcheck'],
\ 'vim': ['vint'],
\ 'python': ['pyls', 'flake8', 'pylint']
\ 'json': ['prettier_standard'],
\ 'html': ['prettier_standard'],
\ 'css': ['stylelint'],
\ 'scss': ['stylelint'],
\ 'bash': ['shellcheck'],
\ 'sh': ['shellcheck'],
\ 'vim': ['vint'],
\ 'python': ['pyls', 'flake8', 'pylint']
\}
let g:ale_fixers = {
\ '*': ['remove_trailing_lines', 'trim_whitespace'],
\ 'javascript': ['prettier_standard'],
\ 'jsx': ['prettier_standard'],
\ 'jsx': ['prettier_standard'],
\ 'typescript': ['prettier_standard'],
\ 'json': ['prettier_standard'],
\ 'scss': ['stylelint'],
\ 'css': ['stylelint'],
\ 'html': ['prettier_standard'],
\ 'markdown': ['prettier_standard'],
\ 'python': ['autopep8', 'remove_trailing_lines', 'isort', 'yapf']
\ 'json': ['prettier_standard'],
\ 'scss': ['stylelint'],
\ 'css': ['stylelint'],
\ 'html': ['prettier_standard'],
\ 'markdown': ['prettier_standard'],
\ 'python': ['autopep8', 'isort', 'yapf']
\}
let g:ale_pattern_options = {
\ '\.min\.js$': {'ale_linters': [], 'ale_fixers': []},
@ -168,13 +169,14 @@ nmap <silent> <F7> <Plug>(ale_previous_wrap)
nmap <silent> <F8> <Plug>(ale_next_wrap)
" }}}
" CoC {{{
let g:coc_global_extensions = ['coc-lists', 'coc-highlight', 'coc-explorer', 'coc-tsserver', 'coc-emmet', 'coc-css', 'coc-html', 'coc-json']
let g:coc_global_extensions = ['coc-lists', 'coc-highlight', 'coc-explorer', 'coc-snippets', 'coc-python', 'coc-tsserver', 'coc-emmet', 'coc-css', 'coc-html', 'coc-json']
" 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><F3> :<C-u>CocList --normal buffers<CR>
nnoremap <silent><F4> :<C-u>CocList windows<CR>
nnoremap <silent><F9> :<C-u>CocList snippets<CR>
" Explorer
nnoremap <silent><F5> :CocCommand explorer<CR>
@ -186,22 +188,24 @@ nnoremap <silent><F6> :CocConfig<CR>
inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<CR>"
inoremap <silent><expr> <TAB>
\ pumvisible() ? coc#_select_confirm() :
\ coc#expandableOrJumpable() ? "\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<CR>" :
\ <SID>check_back_space() ? "\<TAB>" :
\ coc#refresh()
\ pumvisible() ? coc#_select_confirm() :
\ coc#expandableOrJumpable() ? "\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<CR>" :
\ <SID>check_back_space() ? "\<TAB>" :
\ coc#refresh()
function! s:check_back_space() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
endfunction
let g:coc_snippet_next = '<tab>'
" Use <c-space> to trigger completion.
inoremap <silent><expr> <c-space> coc#refresh()
" GoTo code navigation.
nmap <silent> gd <Plug>(coc-definition)
nmap <silent> gr <Plug>(coc-references)
nnoremap <silent> gd <Plug>(coc-definition)
nnoremap <silent> gr <Plug>(coc-references)
" Use K to show documentation in preview window.
nnoremap <silent> K :call <SID>show_documentation()<CR>
@ -215,25 +219,16 @@ function! s:show_documentation()
endfunction
" Symbol renaming.
nmap <leader>rn <Plug>(coc-rename)
nnoremap <leader>rn <Plug>(coc-rename)
"}}}
" Vista {{{
let g:vista#renderer#enable_icon = 1
let g:vista_default_executive = 'ctags'
let g:vista_disable_statusline = 1
let g:vista_sidebar_width = 35
let g:vista_executive_for = {
\ 'javascript': 'coc',
\ 'javascript.jsx': 'coc',
\ 'python': 'ctags',
\ }
nnoremap <silent> <F11> :Vista!!<cr>
" }}}
" Colors {{{
set termguicolors
let g:oceanic_next_terminal_italic = 1
colorscheme OceanicNext
let g:srcery_transparent_background = 1
let g:srcery_italic = 1
let g:srcery_underline = 1
let g:srcery_undercurl = 1
let g:srcery_inverse_matches = 1
colorscheme srcery
function! MyHighlights() abort
highlight Trail ctermbg=red guibg=red
@ -243,17 +238,9 @@ function! MyHighlights() abort
endfunction
hi! VertSplit ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=#080808 gui=NONE
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! 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! TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE guibg=NONE guifg=#080808 gui=NONE
hi! TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE guibg=NONE guifg=#ef2f27 gui=NONE
hi! TablineSel ctermfg=234 ctermbg=NONE guibg=NONE guifg=#008bbd
hi! EndOfBuffer ctermbg=NONE ctermfg=NONE guibg=NONE guifg=#080808
hi! RedrawDebugClear guibg=#080808
hi! NvimInternalError guifg=#080808
hi! DiffAdded guifg=#333333
@ -397,13 +384,7 @@ if !exists('autocommands_loaded') && has('autocmd')
au BufWinLeave,FocusLost,InsertEnter,WinLeave * call Relativize(0)
aug END
aug status_line
au FileType help setlocal statusline=%!LocalStatusLine()
au FileType man setlocal statusline=%!LocalStatusLine()
aug END
aug on_save
" Delete whitespace on :w
au BufWritePre * :%s/\s\+$//e
au BufWritePost *xresources !xrdb %
au BufWritePost *sxhkdrc !pkill -USR1 sxhkd
@ -411,16 +392,11 @@ if !exists('autocommands_loaded') && has('autocmd')
aug END
aug term_stuff
au TermOpen * setlocal nonumber norelativenumber
au TermOpen * setlocal laststatus=0
au TermOpen * setlocal nocursorline
au TermOpen * setlocal signcolumn=no
au TermOpen * setlocal noshowmode
au TermOpen * setlocal noruler
aug END
au TermOpen * setlocal nonumber norelativenumber laststatus=0
au TermOpen * setlocal signcolumn=no noruler nocursorline
aug END
aug miscs
" Highlight symbol under cursor on CursorHold
au CursorHold * silent call CocActionAsync('highlight')
au CursorHold * call CocActionAsync('doHover')
au User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
@ -428,10 +404,9 @@ if !exists('autocommands_loaded') && has('autocmd')
aug END
aug inserts
au InsertEnter * setlocal nocursorline
au InsertLeave * setlocal cursorline
au InsertEnter * norm zz
au InsertLeave * setlocal nopaste
au InsertEnter * setlocal nocursorline
au InsertLeave * setlocal cursorline nopaste
au InsertLeave,CompleteDone * if pumvisible() == 0 | pclose | endif
au FocusLost,TabLeave * call PopOutOfInsertMode()
aug END
@ -442,10 +417,12 @@ if !exists('autocommands_loaded') && has('autocmd')
aug END
aug file_types
au FileType * setl formatoptions-=cro
au FileType typescript,json setl formatexpr=CocAction('formatSelected')
au FileType json syntax match Comment +\/\/.\+$+
aug END
au FileType typescript,json setlocal formatexpr=CocAction('formatSelected')
au FileType help setlocal statusline=%!LocalStatusLine()
au FileType json syntax match Comment +\/\/.\+$+
au BufNewFile,BufRead requirements*.txt set syntax=python
au FileType make setlocal noexpandtab
aug END
endif
" }}}
" REPL {{{
@ -505,9 +482,6 @@ map <silent> <Leader>xf :set filetype=foxdot<CR>
"}}}
"Mappings {{{
"Normal {{{
" Plug
nnoremap <leader>pu :PlugUpdate<CR>
" Ñ master race
nnoremap ñ ;
nnoremap Ñ ,
@ -534,21 +508,13 @@ nnoremap <M-h> <C-W><C-H>
nnoremap <silent> <leader>ev :vsplit $MYVIMRC<CR>
nnoremap <silent> <leader>sv :source $MYVIMRC<CR>
" Fast saves
" Gotta Go Fast (save, buffer close, quit, SOF, EOF, messages)
nnoremap <silent> <leader>w :w!<CR>
" Fast closes
nnoremap <silent> <leader>b :bdelete<CR>
" Fast exits
nnoremap <silent> <leader>q :q!<CR>
nnoremap <silent> <leader>Q :qa!<CR>
" Fast beginning and end of document
nnoremap <Bar> gg
nnoremap ¿ G
" Fast message checking
nnoremap <silent> <leader>m :messsages<CR>
" Splits
@ -596,6 +562,13 @@ nnoremap # #zz
nnoremap g* g*zz
nnoremap g# g#zz
" Prevent x from overriding what's in the clipboard.
nnoremap x "_x
nnoremap X "_x
" Prevent selecting and pasting from overwriting what you originally copied.
xnoremap p pgvy
" What about the Q
nnoremap Q <nop>
map q <nop>
@ -642,6 +615,9 @@ vnoremap $ $h
vnoremap > >gv
vnoremap < <gv
" Keep cursor at the bottom of the visual selection after you yank it.
vmap y ygv<Esc>
" Delete current visual selection and dump in black hole buffer before pasting
" Used when you want to paste over something without it getting copied to
" Vim's default buffer

View File

@ -51,11 +51,11 @@ super + {_,shift} + ntilde
whid {hide,dmenu}
# Run Applications
super + {z,b,q,m,s,g}
{stx,$BROWSER,powermenu,monisel,dswitcher,grabar}
super + {b,q,m,s,g,v}
{$BROWSER,powermenu,monisel,dswitcher,grabar,pavucontrol}
super + {n,v,x}
alacritty --class=flota {-e connman-ncurses,-e alsamixer,_}
super + {a,x,n,z}
alacritty {_,--class=flota,--class=flota -e connman-ncurses,--class=multi -e termux}
super + shift + x
tmenux
@ -82,8 +82,8 @@ XF86Audio{Prev,Next,Play}
XF86MonBrightness{Down,Up}
brillo {down,up}
XF86AudioMute
amixer sset Master toggle
XF86Audio{Lower,Raise}Volume
volu {down,up}
XF86AudioMute
amixer sset Master toggle

View File

@ -5,17 +5,18 @@ alias \
gdl='gallery-dl' \
m='neomutt' \
am='alsamixer' \
pm='pulsemixer' \
v='$EDITOR' \
irc='weechat -d "$XDG_CONFIG_HOME"/weechat' \
play='ncmpcpp' \
torr='tremc' \
py='python ' \
x='xui' \
bm='bashmount' \
kat='cat' \
yt='mpsyt' \
pudb='python -m pudb.run' \
xq='xbps-query'
xq='xbps-query' \
z='zathura' \
irc='weechat -d "$XDG_CONFIG_HOME"/weechat'
# Git
alias \
git='lab' \
@ -32,6 +33,7 @@ alias \
hxp='hx push' \
hxc='hx commit -m' \
hxs='hx status' \
hxl='hx log --stat' \
hxd='hx rm -r --cached' \
hxr='hx rm --cached'
@ -71,7 +73,6 @@ alias \
dd='dd status=progress' \
dirs='dirs -v -p' \
dfc='dfc -dmT' \
dif='diff-so-fancy | less --tabs=1,5 -SRX' \
atl='atool --each --extract'
# Comandos

View File

@ -3,5 +3,5 @@
# Showing off during live shows
echo " "
toilet -t -f 3d " $* " | lolcat
figlet -c -t -f 3d " $* " | lolcat
echo " "

View File

@ -27,7 +27,7 @@ screencast() { \
-framerate 60 \
-s "$(xdpyinfo | grep dimensions | awk '{print $2;}')" \
-i "$DISPLAY" \
-f alsa -ac 2 -i default \
-f alsa -ac 2 -i pulse \
-r 30 \
-c:v libx264rgb -crf 0 -preset ultrafast -c:a flac \
"$HOME/vid/Screen/$(date '+%y%m%d-%H%M-%S').mkv" &
@ -39,7 +39,7 @@ jacka() { \
-thread_queue_size 4096 \
-f jack -i jack_out.monitor \
-ac 2 -channel_layout stereo -async 1 \
-c:a flac "$HOME/vid/Tape/$(date '+%y%m%d-%H%M-%S').flac"
-c:a flac "$HOME/snd/Tape/$(date '+%y%m%d-%H%M-%S').flac"
echo $! > /tmp/recordingpid
}
@ -71,7 +71,7 @@ mute() {
audio() { \
ffmpeg -y \
-thread_queue_size 4096 \
-f alsa -i default \
-f pulse -i default \
-ac 2 -channel_layout stereo -async 1 \
-c:a flac \
"$HOME/snd/Tape/$(date '+%y%m%d-%H%M-%S').mp3" &
@ -79,7 +79,7 @@ audio() { \
}
askrecording() { \
choice=$(printf "screencast\\nvideo\\naudio\\njack video\\njack audio" | dmenu -i -w 245 -p "Capture ")
choice=$(printf "screencast\\nvideo\\naudio\\njack video\\njack audio" | dmenu -i -p "Select recording style ")
case "$choice" in
screencast) screencast;;
video) mute;;
@ -90,7 +90,7 @@ askrecording() { \
}
asktoend() { \
response=$(printf "No\\nYes" | dmenu -i -w 350 -p "Recording still active. End recording? ") &&
response=$(printf "No\\nYes" | dmenu -i -p "Recording still active. End recording? ") &&
[ "$response" = "Yes" ] && killrecording
}

View File

@ -5,7 +5,7 @@ size=${2:-'20'}
dir=$1
transplanter() {
bspc node ${dir} -p south && bspc node -n ${dir}
bspc node "${dir}" -p south && bspc node -n "${dir}"
}
northplanter() {
@ -13,7 +13,7 @@ northplanter() {
}
rootplanter() {
bspc node @/ -p ${dir} && bspc node -n @/ || bspc node -s next.local && bspc node -n @/
bspc node @/ -p "${dir}" && bspc node -n @/ || bspc node -s next.local && bspc node -n @/
bspc node @/ -p cancel
}
@ -39,11 +39,11 @@ if is_floating; then
sign="+"
;;
esac
xdo move ${switch} ${sign}${size}
xdo move "${switch}" "${sign}${size}"
# Otherwise, window is tiled: switch with window in given direction
else
if [[ $(bspc query -N -n .local.\!floating | wc -l) != 2 ]]; then
if [[ $(bspc query -N -n .local.\!floating | wc -l) != 2 ]]; then
case "$dir" in
north) northplanter || rootplanter
;;
@ -71,7 +71,7 @@ else
bspc node @/ -R 90
else
bspc node @/ -R 270
fi
fi
;;
*) bspc node -s north || bspc query -N -n south.local || \
if bspc query -N -n west.local ; then

View File

@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -euf -o pipefail
shutdown="shutdown"
reboot="reboot"
suspend="suspend"
lock="lock"
log_out="log out"
shutdown="Shutdown"
reboot="Reboot"
suspend="Suspend"
lock="Lock"
log_out="Log Out"
options="$shutdown\n$reboot\n$suspend\n$lock\n$log_out"

View File

@ -1,42 +0,0 @@
#!/usr/bin/env dash
# Shamelessly stolen from https://github.com/neeasade/dotfiles/tree/master/wm/.wm/scripts/interact
bspc node -p \~$*
# single is buggy rn
exit
# if we only have one, use our border thing
if bspc query -N -n focused.leaf && which chbpresel 2>/dev/null 1>&2; then
(
cond=true
while $cond; do
presel_win=$(xdotool search --classname "presel_feedback")
if [ ! -z "$presel_win" ]; then
cond=false
compton-trans -w $presel_win 0
fi
done
) &
bspc node -p $*
back="$(colort -t $(bspc config focused_border_color))"
colort -c $back && \
forward="$(colort -t 100 $(bspc config focused_border_color))" || \
forward="$(colort -t -100 $(bspc config focused_border_color))"
dir="$*"
case $dir in
north) dir=1 ;;
south) dir=3 ;;
east) dir=4 ;;
west) dir=2 ;;
esac
chbpresel -C $forward -c $back -d $dir $(bspc query -N -n)
else
bspc node -p $*
fi

View File

@ -1,4 +0,0 @@
#!/usr/bin/env bash
set -euf -o pipefail
alacritty --class=multi -e termux

View File

@ -8,6 +8,4 @@ echo "Actualizando manpages..."
sudo makewhatis /usr/share/man
echo "Actualizando la lista de paquetes..."
xbps-query -v -m > ~/doc/xbpaketes
echo "Hay que reiniciar estos servicios:"
xcheckrestart
echo "Listo."

View File

@ -1,3 +1,4 @@
#!/bin/sh
exec xss-lock -l -- exeflock4
exec xcompmgr

View File

@ -21,9 +21,42 @@ tab:only-of-type {
display: none;
}
/* hide reader mode button */
#reader-mode-button { display: none !important;}
/* Titlebar */
/* This moves the tabs under the URL bar */
#titlebar {
#nav-bar {
-moz-box-ordinal-group: 1 !important;
}
#PersonalToolbar {
-moz-box-ordinal-group: 2 !important;
}
#titlebar {
-moz-box-ordinal-group: 3 !important;
background-color: var(--color-bg) !important;
border: none !important;
}
#toolbar-menubar{
position: fixed;
top: 0px;
}
.titlebar-placeholder {
border: none !important;
}
/* Remove border under navbar */
#navigator-toolbox::after {
border-bottom: 0px !important;
display: none !important;
}
#navigator-toolbox {
border: none !important;
margin-top: 0px;
padding-top:0px !important;
}
#nav-bar-customization-target,
@ -39,19 +72,6 @@ overflow-button {
padding-left: 0px !important;
}
/* Titlebar */
.titlebar-placeholder {
border: none !important;
}
#titlebar {
background-color: var(--color-bg) !important;
}
#navigator-toolbox {
border-bottom: none !important;
}
/* Urlbar */
#urlbar[breakout][breakout-extend] {
top: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2) !important;
@ -78,6 +98,7 @@ overflow-button {
/* OTHER VISUAL CHANGES */
/* Hide some bloat */
.tab-close-button,
.tab-line,
.tabbrowser-tab::before,
.tabbrowser-tab::after {
display: none !important;
@ -147,14 +168,8 @@ tab {
height: 25px;
}
.tab-stack {
display: flex !important;
justify-content: center !important;
}
/* Hacky way to make the url input bar centered */
input#urlbar-input {
caret-color: transparent !important;
font-family: var(--urlbar-text-font) !important;
font-size: var(--urlbar-text-size) !important;
font-weight: var(--urlbar-text-weight) !important;
@ -204,8 +219,8 @@ html#main-window {
/* Firefox variables */
--urlbar-separator-color: #000000 !important;
--lwt-toolbar-field-focus-color: #fefefa !important;
--lwt-toolbar-field-color: #fefefa !important;
--lwt-toolbar-field-focus-color: #fefefe !important;
--lwt-toolbar-field-color: #fefefe !important;
--lwt-toolbar-field-background-color: var(--color-bg) !important;
--lwt-toolbar-field-border-color: var(--color-bg) !important;
--lwt-toolbar-field-focus-background-color: #1d1d1d !important;

View File

@ -10,8 +10,8 @@
xrdb -merge "$XDG_CONFIG_HOME"/X11/xresources
setxkbmap -option caps:escape
xsetroot -cursor_name left_ptr &
randbg &
(sleep 1 && xcompmgr) &
xset s 0 550
randbg &
xss-lock -l -- exeflock4 &
exec runsvdir -P ~/.local/service.x 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'

10
.zshenv
View File

@ -37,15 +37,15 @@ export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
eval $(keychain --dir ~/.local/share/keychain --quiet --eval --noask --agents ssh,gpg id_rsa)
export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch-config"
export MAILCAPS="$XDG_CONFIG_HOME/mutt/mailcap"
export INPUTRC="$XDG_CONFIG_HOME/inputrc"
export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc"
export IPYTHONDIR="$XDG_CONFIG_HOME/ipython"
export JUPYTER_CONFIG_DIR="$XDG_CONFIG_HOME/jupyter"
export PYLINTHOME="$XDG_CACHE_HOME/pylint"
export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history"
export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
export PYLINTHOME="$XDG_CACHE_HOME/pylint"
export MAILCAPS="$XDG_DATA_HOME/mailcap"
export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history"
export RANDFILE="$XDG_DATA_HOME/rnd"
export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME/java"
eval "$(sed 's/^[^#].*/export &/g;t;d' ${DIR:-$XDG_CONFIG_HOME}/user-dirs.dirs)"
@ -70,7 +70,7 @@ export FZF_VIM_LOG=$(git config --get alias.l | awk '{$1=""; print $0;}' | tr -d
# }}}
# Less {{{
export LESSCHARSET=UTF-8
export LESS=X-+I
export LESS=-R
export LESS_TERMCAP_mb="$(printf '%b' '')"
export LESS_TERMCAP_md="$(printf '%b' '')"
export LESS_TERMCAP_me="$(printf '%b' '')"

View File

@ -1,7 +1,12 @@
alacritty-0.4.2_2
ImageMagick-7.0.10.6_1
alacritty-0.4.2_3
alsa-firmware-1.2.1_1
alsa-plugins-1.2.2_1
alsa-plugins-ffmpeg-1.2.2_1
alsa-plugins-jack-1.2.2_1
alsa-plugins-pulseaudio-1.2.2_1
alsa-plugins-samplerate-1.2.2_1
alsa-plugins-speex-1.2.2_1
alsa-utils-1.2.2_1
atool-0.39.0_5
audacity-2.3.3_1
@ -20,31 +25,36 @@ ctags-5.8_7
dfc-3.1.1_1
dunst-1.4.1_1
elogind-243.4_2
fd-7.5.0_1
fd-8.0.0_1
ffmpeg-4.2.2_3
figlet-2.2.5_6
firefox-75.0_1
fzf-0.21.1_1
gallery-dl-1.13.2_1
gallery-dl-1.13.4_1
gcc-9.3.0_3
git-2.26.0_1
gimp-2.10.18_1
git-2.26.2_1
git-extras-5.1.0_1
git-libsecret-2.26.0_1
git-libsecret-2.26.2_1
gnome-ssh-askpass-8.2p1_1
gnupg2-2.2.20_1
google-fonts-ttf-20190605_1
grub-i386-efi-2.04_3
grub-x86_64-efi-2.04_3
haveged-1.9.8_1
highlight-3.55_1
highlight-3.56_1
hsetroot-1.0.5_1
htop-2.2.0_1
hub-2.14.2_1
i3lock-color-2.12_2
intel-ucode-20191115_2
jq-1.6_1
keychain-2.8.5_1
lf-r13_2
lf-r14_1
libX11-devel-1.6.9_1
libXft-devel-2.3.3_1
libXinerama-devel-1.1.4_1
librsvg-2.47.1_1
lvm2-2.02.186_1
lynx-2.8.9.1_3
maim-5.5.3_2
mdadm-4.1_2
@ -54,35 +64,39 @@ mmutils-1.3_1
mpc-0.33_1
mpd-0.21.22_1
mps-youtube-0.2.8_3
mpv-0.32.0_1
mpv-0.32.0_2
ncmpcpp-0.8.2_9
ncurses-term-6.2_1
neovim-0.4.3_1
nfs-utils-2.4.3_2
nmap-7.80_2
nodejs-13.2.0_1
noto-fonts-cjk-20190416_1
noto-fonts-ttf-20190926_1
obs-25.0.7_1
p7zip-16.02_5
patch-2.7.6_4
pavucontrol-4.0_1
pd-0.50.2_1
picom-7.5_1
pinentry-gtk-1.1.0_5
pinentry-tty-1.1.0_5
pinentry-gtk-1.1.0_6
pinentry-tty-1.1.0_6
pkg-config-0.29.2_2
powertop-2.11_1
pulseaudio-13.0_1
python3-3.8.2_1
python3-BeautifulSoup4-4.8.2_1
python3-ipython-7.13.0_1
python3-isort-4.3.21_2
python3-language-server-0.31.8_1
python3-lxml-4.4.1_2
python3-lxml-4.4.3_1
python3-mccabe-0.6.1_3
python3-pip-20.0.2_1
python3-pycodestyle-2.5.0_2
python3-pyflakes-2.1.1_2
python3-vint-0.3.19_3
sc3-plugins-3.10.0_1
sc3-plugins-3.10.0_2
setxkbmap-1.3.2_1
shellcheck-0.7.1_1
shellcheck-0.7.1_2
simple-mtpfs-0.3.0_3
snooze-0.4_1
socklog-void-20200115_1
@ -90,12 +104,14 @@ supercollider-3.10.4_1
sxhkd-0.6.1_1
sxiv-26_1
tmux-3.0a_2
transmission-2.94_4
toilet-0.3_2
transmission-2.94_5
tremc-0.9.1_1
udisks2-2.8.4_1
unclutter-xfixes-1.5_1
unzip-6.0_13
vpm-1.2a_1
void-repo-nonfree-9_4
vpm-1.3_1
vsv-1.3.4_1
weechat-2.8_2
wmctrl-1.07_5
@ -124,6 +140,7 @@ zathura-0.4.5_2
zathura-cb-0.1.8_2
zathura-pdf-mupdf-0.3.5_2
zip-3.0_6
zita-ajbridge-0.8.4_1
zsh-5.8_1
zsh-completions-0.31.0_1
zsh-syntax-highlighting-0.7.1_1