dgy
/
hexagons
Archived
1
0
Fork 0

cambie el userChrome porque me rompia un poco las bolas, igual le faltan un par de giladas. reemplaze fzf y defx en nvim por extensiones de COCK. reescribi unos scripts, y cambios cosmeticos y lo de siempre

This commit is contained in:
deadguy 2019-11-28 14:05:32 -03:00
parent 238b643965
commit 2dee72a0c9
Signed by: dgy
GPG Key ID: 37CA55B52CF63730
14 changed files with 162 additions and 195 deletions

View File

@ -1,10 +1,6 @@
#!/usr/bin/env bash
set -euf -o pipefail
umonitor --listen --quiet
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
@ -44,7 +40,7 @@ bspc config presel_feedback_color "$(get_xrdb color5)"
bspc config border_width 2
# Flotantes
bspc rule -a REAPER state=floating, layer=below
# bspc rule -a REAPER state=floating, layer=below
bspc rule -a Pysol state=floating
bspc rule -a Pavucontrol state=floating
bspc rule -a Catia state=floating
@ -74,5 +70,6 @@ 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

@ -24,7 +24,7 @@ glx-copy-from-front = false;
# GLX backend: Avoid rebinding pixmap on window damage.
# Probably could improve performance on rapid window content changes, but is known to break things on some drivers (LLVMpipe).
# Recommended if it works.
# glx-no-rebind-pixmap = true;
glx-no-rebind-pixmap = true;
# GLX backend: GLX buffer swap method we assume.
# Could be undefined (0), copy (1), exchange (2), 3-6, or buffer-age (-1).
@ -90,13 +90,8 @@ shadow-exclude = [
# Avoid drawing shadow on all shaped windows (see also: --detect-rounded-corners)
shadow-ignore-shaped = true;
#################################
#
# Opacity
#
#################################
inactive-opacity = 50;
inactive-opacity = 25;
active-opacity = 50;
frame-opacity = 50;
inactive-opacity-override = true;
@ -141,18 +136,11 @@ opacity-exclude = [
"class_g = 'maim'",
];
#################################
#
# Fading
#
#################################
# Fade windows during opacity changes.
fading = true;
# The time between steps in a fade in milliseconds. (default 10).
fade-delta = 4;
fade-delta = 5;
# Opacity change between steps while fading in. (default 0.028).
fade-in-step = 0.03;
# Opacity change between steps while fading out. (default 0.03).
@ -163,12 +151,7 @@ fade-out-step = 0.03;
# Specify a list of conditions of windows that should not be faded.
fade-exclude = [ ];
#################################
#
# Other
#
#################################
# Try to detect WM windows and mark them as active.
mark-wmwin-focused = true;
# Mark all non-WM but override-redirect windows active (e.g. menus).
@ -213,12 +196,7 @@ detect-transient = true;
# WM_TRANSIENT_FOR has higher priority if --detect-transient is enabled, too.
detect-client-leader = true;
#################################
#
# Window type settings
#
#################################
wintypes:
{
tooltip =
@ -234,12 +212,7 @@ wintypes:
};
};
######################
#
# XSync
# See: https://github.com/yshui/compton/commit/b18d46bcbdc35a3b5620d817dd46fbc76485c20d
#
######################
# Use X Sync fence to sync clients' draw calls. Needed on nvidia-drivers with GLX backend for some users.
xrender-sync-fence = true;

View File

@ -1,7 +1,5 @@
{
"suggest.enablePreview": true,
"suggest.timeout": 500,
"suggest.minTriggerInputLength": 2,
"suggest.snippetIndicator": "►",
"suggest.triggerCompletionWait": 100,
"suggest.echodocSupport": true,
@ -35,24 +33,47 @@
"suggest.maxCompleteItemCount": 20,
"diagnostic.displayByAle": true,
"diagnostic.refreshOnInsertMode": true,
"diagnostic.virtualText": true,
"diagnostic.refreshAfterSave": true,
"diagnostic.infoSign": "i",
"diagnostic.errorSign": "✖",
"signature.triggerSignatureWait": 100,
"codeLens.enable": true,
"coc.preferences.currentFunctionSymbolAutoUpdate": true,
"tsserver.enableJavascript": true,
"tslint.enable": true,
"tslint.autoFixOnSave": 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"],
"coc.preferences.formatOnSaveFiletypes": ["css","markdown"],
"prettier.statusItemText": "★ ",
"prettier.eslintIntegration": true,
"prettier.tslintIntegration": true,
"prettier.stylelintIntegration": true
"eslint.filetypes": ["javascript", "javascript.jsx", "typescript", "typescriptreact", "javascriptreact"]
}

View File

@ -20,16 +20,17 @@ 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 'mhartington/nvim-typescript', {'do': './install.sh', 'for': 'typescript'}
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'liuchengxu/vista.vim'
Plug 'sheerun/vim-polyglot'
Plug 'tmsvg/pear-tree'
Plug 'tpope/vim-commentary'
Plug '/usr/bin/fzf'
Plug 'junegunn/fzf.vim'
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'
@ -72,7 +73,7 @@ set foldmethod=marker " Markers are used to specify folds.
set foldlevelstart=10
set foldclose=all
set title
set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:~:.:h\")})%)%(\ %a%)
" set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:~:.:h\")})%)%(\ %a%)
set selectmode=key
set keymodel=startsel
set softtabstop=4
@ -84,7 +85,6 @@ set completeopt-=preview
set nostartofline
set nosmarttab
set modeline
set title
set undofile
set undolevels=1000
set undoreload=10000
@ -134,20 +134,17 @@ let g:ale_linter_aliases = {
let g:ale_linters = {
\ 'javascript': ['prettier_standard'],
\ 'jsx': ['stylelint', 'eslint'],
\ 'typescript': ['tsserver', 'tslint'],
\ 'vue': ['eslint', 'vls'],
\ 'html': ['prettier'],
\ 'css': ['prettier'],
\ 'html': ['prettier_standard'],
\ 'css': ['prettier_standard'],
\ 'scss': ['prettier_standard'],
\ 'bash': ['shellcheck'],
\}
let g:ale_fixers = {
\ 'javascript': ['prettier_standard'],
\ 'typescript': ['prettier'],
\ 'vue': ['eslint'],
\ 'scss': ['prettier'],
\ 'css': ['prettier'],
\ 'scss': ['prettier_standard'],
\ 'css': ['prettier_standard'],
\ 'html': ['prettier_standard'],
\ 'markdown': ['prettier'],
\ 'html': ['prettier'],
\}
let g:ale_pattern_options = {
\ '\.min\.js$': {'ale_linters': [], 'ale_fixers': []},
@ -157,16 +154,38 @@ nmap <silent> <F10> <Plug>(ale_previous_wrap)
nmap <silent> <F11> <Plug>(ale_next_wrap)
" }}}
" CoC {{{
let g:coc_global_extensions = ['coc-vimlsp', 'coc-stylelint', 'coc-vetur', 'coc-tsserver', 'coc-css', 'coc-html', 'coc-json', 'coc-eslint', 'coc-prettier', 'coc-snippets']
let g:coc_global_extensions = ['coc-lists', 'coc-highlight', 'coc-stylelint', 'coc-explorer', 'coc-vimlsp', 'coc-css', 'coc-html', 'coc-json', 'coc-eslint', 'coc-prettier', 'coc-snippets']
" Remap keys for gotos
nmap <silent> <leader>cd <Plug>(coc-definition)
nmap <silent> <leader>ct <Plug>(coc-type-definition)
nmap <silent> <leader>ci <Plug>(coc-implementation)
nmap <silent> <leader>cf <Plug>(coc-references)
nmap <silent> gd <Plug>(coc-definition)
nmap <silent> gy <Plug>(coc-type-definition)
nmap <silent> gI <Plug>(coc-implementation)
nmap <silent> gr <Plug>(coc-references)
" Remap for rename current word
nmap <leader>cr <Plug>(coc-rename)
" Object/Symbol maps
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>"
" 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><leader>p/ :<C-u>CocList -I grep<CR>
nnoremap <silent><leader>* :exe 'CocList -I --normal --input='.expand('<cword>').' words'<CR>
" <CR> to confirm completion
inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<CR>"
@ -185,42 +204,6 @@ endfunction
let g:coc_snippet_next = '<tab>'
let g:coc_snippet_prev = '<S-TAB>'
"}}}
" FZF {{{
let g:fzf_layout = { 'down': '~35%' }
let g:fzf_action = {
\ 'ctrl-e': 'enew',
\ 'ctrl-t': 'tab split',
\ 'ctrl-s': 'split',
\ 'ctrl-v': 'vsplit' }
let g:fzf_colors = {
\ 'fg': ['fg', 'Normal'],
\ 'bg': ['bg', 'Clear'],
\ 'hl': ['fg', 'String'],
\ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
\ 'bg+': ['bg', 'CursorLine', 'CursorColumn'],
\ 'hl+': ['fg', 'Statement'],
\ 'info': ['fg', 'PreProc'],
\ 'prompt': ['fg', 'Conditional'],
\ 'pointer': ['fg', 'Exception'],
\ 'marker': ['fg', 'Keyword'],
\ 'spinner': ['fg', 'Label'],
\ 'header': ['fg', 'Comment'] }
let $FZF_DEFAULT_COMMAND='fd -t f -S -2m -F -H'
let g:fzf_buffers_jump = 1
let g:fzf_tags_command = 'ctags -R'
let g:fzf_history_dir = '~/.local/share/fzf-history'
let g:fzf_files_options = "--preview 'bat --color \"always\" {}'"
" only use FZF shortcuts in non diff-mode
if !&diff
nnoremap <silent> <F1> :Helptags<CR>
nnoremap <silent> <F2> :Files<CR>
nnoremap <silent> <F3> :Buffers<CR>
nnoremap <silent> <F4> :Windows<CR>
endif
" }}}
" Vista {{{
let g:vista_default_executive = 'coc'
let g:vista_disable_statusline = 1
@ -427,56 +410,6 @@ if !exists("autocommands_loaded") && has("autocmd")
aug END
endif
" }}}
" File browser {{{
let g:defx_icons_enable_syntax_highlight = 0
call defx#custom#option('_', {
\ 'columns': 'icons:indent:filename:type',
\ 'winwidth': 20,
\ 'split': 'vertical',
\ 'direction': 'topleft',
\ 'show_ignored_files': 0,
\ 'toggle': 1,
\ })
function! s:defx_my_settings() abort
nnoremap <silent><buffer><expr> <CR> defx#do_action('drop')
nnoremap <silent><buffer><expr> l <sid>defx_toggle_tree()
nnoremap <silent><buffer><expr> v defx#do_action('open', 'botright vsplit')
nnoremap <silent><buffer><expr> s defx#do_action('open', 'topleft split')
nnoremap <silent><buffer><expr> t defx#do_action('multi', [['drop', 'tabnew'], 'quit'])
nnoremap <silent><buffer><expr> P defx#do_action('open', 'pedit')
nnoremap <silent><buffer><expr> D defx#do_action('new_directory')
nnoremap <silent><buffer><expr> f defx#do_action('new_multiple_files')
nnoremap <silent><buffer><expr> dd defx#do_action('remove')
nnoremap <silent><buffer><expr> r defx#do_action('rename')
nnoremap <silent><buffer><expr> x defx#do_action('execute_system')
nnoremap <silent><buffer><expr> . defx#do_action('toggle_ignored_files')
nnoremap <silent><buffer><expr> yy defx#do_action('yank_path')
nnoremap <silent><buffer><expr> h defx#do_action('cd', ['..'])
nnoremap <silent><buffer><expr> ~ defx#async_action('cd')
nnoremap <silent><buffer><expr> q defx#do_action('quit')
nnoremap <silent><buffer><expr><nowait> / defx#do_action('cd', getcwd())
nnoremap <silent><buffer><expr><nowait> c defx#do_action('copy')
nnoremap <silent><buffer><expr><nowait> m defx#do_action('move')
nnoremap <silent><buffer><expr><nowait> p defx#do_action('paste')
nnoremap <silent><buffer><expr> ' defx#do_action('toggle_select') . 'j'
nnoremap <silent><buffer><expr> * defx#do_action('toggle_select_all')
nnoremap <silent><buffer><expr> <C-r> defx#do_action('redraw')
nnoremap <silent><buffer><expr> S defx#do_action('toggle_sort', 'Time')
endfunction
function! s:defx_toggle_tree() abort
if defx#is_directory()
return defx#do_action('open_or_close_tree')
endif
return defx#do_action('drop')
endfunction
nnoremap <silent> <F5> :Defx<CR>
" }}}
" REPL {{{
let g:my_active_terminal_job_id = -1
@ -576,7 +509,7 @@ nnoremap <silent> <leader>sv :source $MYVIMRC<CR>
nnoremap <silent> <leader>w :w!<CR>
" Fast closes
nnoremap <silent> <leader>c :clo<CR>
nnoremap <silent> <leader>b :bdelete<CR>
" Fast exits
nnoremap <silent> <leader>q :q!<CR>

View File

@ -98,10 +98,10 @@ handle_image() {
case "${mimetype}" in
# SVG
image/svg+xml)
convert "${FILE_PATH}" "${IMAGE_CACHE_PATH}" && exit 6
exit 1
;;
# image/svg+xml)
# convert "${FILE_PATH}" "${IMAGE_CACHE_PATH}" && exit 6
# exit 1
# ;;
# Image
image/*)

View File

@ -2,7 +2,7 @@
# font = Monaco 11
# font = MonacoB2 Nerd Font Mono Regular 10
# font = NotoSansMono Nerd Font Regular 9.5
font = RobotoMono Nerd Font Regular 10
font = RobotoMono Nerd Font Mono Regular 10
hyperlinks = true
icon_name = terminal
scroll_on_output = false

View File

@ -3,7 +3,6 @@ alias vdi='vimdiff'
alias gdl='gallery-dl'
alias m='neomutt'
alias r='ranger'
alias pmix='ncpamixer'
alias amix='alsamixer'
alias v='$EDITOR'
alias irc='irssi'
@ -12,7 +11,6 @@ alias torr='transmission-remote-cli'
alias cal='calcurse'
alias py='python '
alias py2='python2 '
alias git='lab'
alias help='run-help'
alias p='pacui'
alias surfraw='surfraw -browser=$BROWSER'
@ -22,6 +20,13 @@ alias nb='newsboat --quiet'
alias sxiv='sxiv-rifle -p -b -a -q'
alias yt='mpsyt'
# Git
alias git='lab'
alias gst='git status'
alias gca='git commit -a -m'
alias gc='git add --all && git commit -m'
alias gp="git push"
# MAXIMUM VERBOSITY YIELDS MAXIMUM RESULTS
alias chmod='chmod -v'
alias chown='chown -v'

View File

@ -26,16 +26,50 @@
pointer-events: auto !important;
}
#main-window {
:root[lwt-popup-brighttext] {
--panel-separator-color: #212121 !important;
border: none !important;
}
#nav-bar,
.sidebar-placesTree,
#sidebar-header {
background-color: rgb(12, 12, 13) !important;
border: none !important;
}
#sidebar-header {
border: none !important;
}
textbox {
background-color: #212121 !important;
border: none !important;
}
vbox[style],
hbox[style] {
background-color: #212121 !important;
border: none !important;
}
window#main-window {
--tabs-navbar-shadow-size: 0px !important;
--chrome-content-separator-color: none !important;
--backbutton-background: none !important;
--toolbar-bgcolor: #212121 !important;
--lwt-toolbar-field-background-color: #212121 !important;
--arrowpanel-background: #212121 !important;
--arrowpanel-border-color: #212121 !important;
--lwt-sidebar-background-color: #212121 !important;
}
#main-window[lwthemetextcolor="bright"] #urlbar,
#main-window[lwthemetextcolor="bright"] .searchbar-textbox {
box-shadow: initial !important;
background-color: rgb(20, 20, 22) !important;
background-color: rgb(12, 12, 13) !important;
transition: background-color 0.3s !important;
font-size: 12pt !important;
font-size: 8pt !important;
border: none !important;
}
@ -65,19 +99,7 @@
display: none !important;
}
#nav-bar {
height: 0px;
opacity: 0;
overflow: hidden;
}
/* #nav-bar:hover, */
#nav-bar:focus-within {
height: auto;
opacity: 1;
overflow: visible;
}
/* Removal of black bottom 1px line */
#navigator-toolbox::after {
border-bottom: 0px !important;
}
@ -92,6 +114,10 @@ tab:only-of-type {
display: none;
}
.tabbrowser-tab {
font-size: 8pt !important;
}
/* unset the tab bar min-height */
#tabbrowser-tabs,
#tabbrowser-tabs > .tabbrowser-arrowscrollbox,
@ -99,19 +125,9 @@ tab:only-of-type {
min-height: initial !important;
}
/* set the height on the tabs instead */
tab {
line-height: 32px;
height: 32px;
}
.tab-line {
display: none !important;
}
.tabbrowser-tab::after,
.tabbrowser-tab::before {
border-left: none !important;
border: none !important;
color: #141414 !important;
opacity: 0.2 !important;
}
@ -123,3 +139,8 @@ tab {
.tabbrowser-tab:not([visuallyselected="true"]):not([multiselected]) image {
display: none !important;
}
/* This moves the tabs under the URL bar */
#titlebar {
-moz-box-ordinal-group: 3 !important;
}

1
.zshrc
View File

@ -125,6 +125,7 @@ foreach extra (
extras.zsh
aliases.plugin.zsh
dotfiles.zsh
git-extras-completion.zsh
zsh-system-clipboard/zsh-system-clipboard.zsh
) {
source $MODULES_DIR/$extra

View File

@ -1,6 +1,7 @@
bashmount
bfs
colort-git
create-react-app
figlet-fonts
gimp-paint-studio
gimp-plugin-akkana-git
@ -10,6 +11,7 @@ gimp-plugin-export-layers
gimp-plugin-layer-via-copy-cut
gimp-plugin-saveforweb
gimp-plugin-scale-layer-to-image-size
git-extras
godot
gtk-theme-minwaita
lab
@ -29,7 +31,6 @@ python-proc
python-pysdl2
ranger-git
realtimeconfigquickscan-git
reaper-bin
rofi-git
simple-mtpfs
soulseekqt

2
bin/ae
View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash
set -euf -o pipefail
du -a -d 1 ~/bin | awk '{print $2}' | fzf -m --height='45%' | xargs -r "$EDITOR"
fd --type file --color=always . ~/bin -d=1 | fzf -m --cycle --preview='bat --color=always {}' --height='45%' --select-1 --exit-0 | xargs -r "$EDITOR"

View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash
set -euf -o pipefail
echo "╓───── m o u n t . p o i n t s"; echo "╙────────────────────────────────────── ─ ─ "; lsblk -a; echo ""; echo "╓───── d i s k . u s a g e"; echo "╙────────────────────────────────────── ─ ─ "; dfc;
echo "╓───── m o u n t . p o i n t s"; echo "╙────────────────────────────────────── ─ ─"; lsblk -a; echo ""; echo "╓───── d i s k . u s a g e"; echo "╙────────────────────────────────────── ─ ─ "; dfc -ds;

View File

@ -1,6 +1,13 @@
#!/usr/bin/env bash
set -euf -o pipefail
pidof umonitor >/dev/null
if ! pidof umonitor
then
rm ~/.umonitor.lock
umonitor --listen --quiet &
fi
I=1
M=$(bspc query -M | wc -l)
if [[ "$M" == 1 ]]; then

View File

@ -2,7 +2,15 @@
set -euf -o pipefail
echo "Actualizando la lista de paquetes..."
locate -e --regex "\.pac(new|save)$" > ~/Documents/pacman/pacnew.log
pacman -Qqettn > ~/Documents/pacman/paketes.txt
pacman -Qqettm > ~/Documents/pacman/paurketos.txt
echo "Listo."
locate -e --regex "\.pac(new|save)$" > ~/Documents/pacman/pacnew.log
status=$?
if test $status -eq 0
then
echo "Listo. Usa sudo pacdiff para ver los cambios a archivos de configuracion"
else
echo "Listo."
fi