General improvements
La mayoria de mi setup ahora se ve bien sin importar si estoy en una sesion de x o en framebuffer. quedan algunas cuestiones pero son las de menos. mejore la manera en la cual manejo el setup multipantalla, focalizandome en servicios con runit y poniendo todo en la configuracion del wm. ahora solo se chequea la presencia de varios monitores en un solo lugar y listo. limpie algunas cosas de nvim y arregle otras que no funcionaban. Borre algunos archivos que no sirven e hice actualizaciones menores a otras cosas.
This commit is contained in:
parent
dc1ca55fdf
commit
1f1fa23221
|
@ -1,10 +1,14 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
setxkbmap -option caps:escape
|
setxkbmap -model pc105 -layout latam,latam -variant ,cmk_ed_ks -option caps:escape,grp:shifts_toggle,grp_led:caps
|
||||||
xsetroot -cursor_name left_ptr &
|
xsetroot -cursor_name left_ptr &
|
||||||
equiset &
|
sctd &
|
||||||
xss-lock -l -- exeflock4 &
|
|
||||||
xrdb -merge "$XDG_CONFIG_HOME/X11/xresources"
|
xrdb -merge "$XDG_CONFIG_HOME/X11/xresources"
|
||||||
monis &
|
|
||||||
|
|
||||||
exec runsvdir -P ~/.local/service.x 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
|
conectados=$(xrandr | awk '( $2 == "connected" ) { count++ } END { print count }')
|
||||||
|
if [ "$conectados" = 2 ]; then
|
||||||
|
monis &
|
||||||
|
exec runsvdir -P ~/.local/service.2x
|
||||||
|
else
|
||||||
|
exec runsvdir -P ~/.local/service.x
|
||||||
|
fi
|
||||||
|
|
|
@ -4,36 +4,36 @@
|
||||||
*.cursorColor: #b3b1ad
|
*.cursorColor: #b3b1ad
|
||||||
|
|
||||||
! black
|
! black
|
||||||
*.color0: #0e0e0e
|
*.color0: #2e2e2e
|
||||||
*.color8: #444444
|
*.color8: #666666
|
||||||
|
|
||||||
! red
|
! red
|
||||||
*.color1: #ff3333
|
*.color1: #ef2f27
|
||||||
*.color9: #ff3333
|
*.color9: #eb6655
|
||||||
|
|
||||||
! green
|
! green
|
||||||
*.color2: #aec82a
|
*.color2: #519f50
|
||||||
*.color10: #bae67e
|
*.color10: #98bc37
|
||||||
|
|
||||||
! yellow
|
! yellow
|
||||||
*.color3: #faa030
|
*.color3: #faa030
|
||||||
*.color11: #fccb00
|
*.color11: #ffe64d
|
||||||
|
|
||||||
! blue
|
! blue
|
||||||
*.color4: #008bbd
|
*.color4: #34608d
|
||||||
*.color12: #73d0ff
|
*.color12: #008bbd
|
||||||
|
|
||||||
! magenta
|
! magenta
|
||||||
*.color5: #ab6ba6
|
*.color5: #e02c6d
|
||||||
*.color13: #f28779
|
*.color13: #ff5c8f
|
||||||
|
|
||||||
! cyan
|
! cyan
|
||||||
*.color6: #6fa69f
|
*.color6: #0aaeb3
|
||||||
*.color14: #95e6cb
|
*.color14: #6fc3df
|
||||||
|
|
||||||
! white
|
! white
|
||||||
*.color7: #a89984
|
*.color7: #d0d0d0
|
||||||
*.color15: #ffffff
|
*.color15: #fcfcfc
|
||||||
|
|
||||||
dmenu.font: System Charcoal:pixelsize=15:antialias=true:autohint=true;
|
dmenu.font: System Charcoal:pixelsize=15:antialias=true:autohint=true;
|
||||||
dmenu.background: #080808
|
dmenu.background: #080808
|
||||||
|
@ -47,6 +47,23 @@ Sxiv.foreground: white
|
||||||
|
|
||||||
Xcursor.theme:BloxCursors-White
|
Xcursor.theme:BloxCursors-White
|
||||||
|
|
||||||
|
XTerm*utf8: true
|
||||||
|
XTerm*metaSendsEscape: true
|
||||||
|
XTerm*alternateScroll: true
|
||||||
|
XTerm*allowMouseOps: false
|
||||||
|
XTerm*bellIsUrgent: true
|
||||||
|
XTerm*charClass: 33:48,36-47:48,58-59:48,61:48,63-64:48,95:48,126:48
|
||||||
|
|
||||||
|
XTerm*VT100*translations: #override \n\
|
||||||
|
Super <Key>C: copy-selection(CLIPBOARD) \n\
|
||||||
|
Super <Key>V: insert-selection(CLIPBOARD)
|
||||||
|
|
||||||
|
XTerm*faceName: PragmataPro Mono:size=11
|
||||||
|
XTerm*internalBorder: 6
|
||||||
|
XTerm*colorBDMode: true
|
||||||
|
XTerm*scrollBar: false
|
||||||
|
XTerm*pointerMode: 2
|
||||||
|
|
||||||
Xft.autohint: 0
|
Xft.autohint: 0
|
||||||
Xft.lcdfilter: lcddefault
|
Xft.lcdfilter: lcddefault
|
||||||
Xft.hintstyle: hintslight
|
Xft.hintstyle: hintslight
|
||||||
|
|
|
@ -39,8 +39,6 @@ font:
|
||||||
x: 0
|
x: 0
|
||||||
y: 0
|
y: 0
|
||||||
|
|
||||||
use_thin_strokes: true
|
|
||||||
|
|
||||||
draw_bold_text_with_bright_colors: false
|
draw_bold_text_with_bright_colors: false
|
||||||
|
|
||||||
colors:
|
colors:
|
||||||
|
|
|
@ -1,45 +1,55 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
bspmonis &
|
hsetroot -solid "#080808"
|
||||||
|
|
||||||
bspc config border_width 2
|
bspc monitor -d 1 2 3 4 5 6 7 8 9 10
|
||||||
bspc config window_gap 6
|
bspc config top_padding 0
|
||||||
bspc config split_ratio 0.5
|
bspc config bottom_padding 0
|
||||||
|
bspc config left_padding 0
|
||||||
|
bspc config right_padding 0
|
||||||
|
bspc config border_width 2
|
||||||
|
bspc config window_gap 0
|
||||||
|
bspc config split_ratio 0.5
|
||||||
|
|
||||||
# Opciones
|
# Opciones
|
||||||
bspc config gapless_monocle true
|
bspc config single_monocle true
|
||||||
bspc config ignore_ewmh_focus true
|
bspc config borderless_monocle true
|
||||||
bspc config pointer_follows_focus true
|
bspc config remove_disabled_monitors true
|
||||||
bspc config removal_adjustment true
|
bspc config remove_unplugged_monitors true
|
||||||
bspc config honor_size_hints false
|
bspc config gapless_monocle true
|
||||||
|
bspc config ignore_ewmh_focus true
|
||||||
|
bspc config pointer_follows_focus true
|
||||||
|
bspc config removal_adjustment true
|
||||||
|
bspc config honor_size_hints false
|
||||||
bspc config directional_focus_tightness low
|
bspc config directional_focus_tightness low
|
||||||
bspc config automatic_scheme longest_side
|
bspc config automatic_scheme longest_side
|
||||||
bspc config initial_polarity second_child
|
bspc config initial_polarity second_child
|
||||||
bspc config click_to_focus any
|
bspc config click_to_focus any
|
||||||
bspc config pointer_modifier mod4
|
bspc config pointer_modifier mod4
|
||||||
bspc config pointer_action1 resize_side
|
bspc config pointer_action1 resize_side
|
||||||
bspc config pointer_action2 resize_corner
|
bspc config pointer_action2 resize_corner
|
||||||
bspc config pointer_action3 move
|
bspc config pointer_action3 move
|
||||||
|
|
||||||
# xrdb
|
# xrdb
|
||||||
get_xrdb() {
|
get_xrdb() {
|
||||||
xrdb -query | awk -v pat="$1" '$0~pat {print $2}'
|
xrdb -query | awk -v pat="$1" '$0~pat {print $2}'
|
||||||
}
|
}
|
||||||
|
|
||||||
# Colores
|
# Colores
|
||||||
bspc config normal_border_color "$(get_xrdb color0)"
|
bspc config normal_border_color "$(get_xrdb color0)"
|
||||||
bspc config focused_border_color "$(get_xrdb color3)"
|
bspc config focused_border_color "$(get_xrdb color3)"
|
||||||
bspc config active_border_color "$(get_xrdb color8)"
|
bspc config active_border_color "$(get_xrdb color8)"
|
||||||
bspc config presel_feedback_color "$(get_xrdb color6)"
|
bspc config presel_feedback_color "$(get_xrdb color6)"
|
||||||
|
|
||||||
# Flotantes
|
# Flotantes
|
||||||
bspc rule -a QjackCtl state=floating
|
bspc rule -a QjackCtl state=floating
|
||||||
bspc rule -a mpv state=floating
|
bspc rule -a mpv state=floating
|
||||||
bspc rule -a Alacritty:flota state=floating
|
bspc rule -a Alacritty:flota state=floating
|
||||||
bspc rule -a Sxiv:flota state=floating
|
bspc rule -a Sxiv:flota state=floating
|
||||||
bspc rule -a Firefox:Browser state=floating
|
bspc rule -a Firefox:Browser state=floating
|
||||||
bspc rule -a Zathura state=tiled
|
bspc rule -a Firefox:Navigator state=tiled desktop='^2'
|
||||||
bspc rule -a gzdoom state=fullscreen
|
bspc rule -a Zathura state=tiled
|
||||||
|
bspc rule -a gzdoom state=fullscreen
|
||||||
|
|
||||||
unclutter --jitter 30 --timeout 3 --ignore-scrolling &
|
unclutter --jitter 30 --timeout 3 --ignore-scrolling &
|
||||||
$TERMINAL &
|
$TERMINAL &
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
// this goes in /usr/lib/firefox
|
|
||||||
var {classes:Cc,interfaces:Ci,utils:Cu} = Components;
|
|
||||||
try {
|
|
||||||
Cu.import("resource:///modules/AboutNewTab.jsm");
|
|
||||||
var newTabURL = "file:///home/deadguy/.mozilla/firefox/thsxpwyd.testing-1586723279098/startpage/index.html";
|
|
||||||
AboutNewTab.newTabURL = newTabURL;
|
|
||||||
} catch(e){Cu.reportError(e);} // report errors in the Browser Console
|
|
|
@ -1,4 +0,0 @@
|
||||||
// this goes in /usr/lib/firefox/defaults/pref
|
|
||||||
pref("general.config.filename", "autoconfig.cfg");
|
|
||||||
pref("general.config.obscure_value", 0);
|
|
||||||
pref("general.config.sandbox_enabled", false);
|
|
|
@ -1,2 +0,0 @@
|
||||||
FONT=Lat2-Terminus16
|
|
||||||
KEYMAP=la-latin1
|
|
|
@ -32,7 +32,7 @@
|
||||||
stack_duplicates = true # Merge multiple similar notifications
|
stack_duplicates = true # Merge multiple similar notifications
|
||||||
hide_duplicate_count = true
|
hide_duplicate_count = true
|
||||||
sticky_history = no
|
sticky_history = no
|
||||||
history_length = 16
|
history_length = 1
|
||||||
show_indicators = no
|
show_indicators = no
|
||||||
|
|
||||||
# The spacing between lines. If smaller than font height,
|
# The spacing between lines. If smaller than font height,
|
||||||
|
@ -59,7 +59,7 @@
|
||||||
dmenu = /usr/bin/dmenu -p dunst:
|
dmenu = /usr/bin/dmenu -p dunst:
|
||||||
browser = /usr/bin/firefox -new-tab
|
browser = /usr/bin/firefox -new-tab
|
||||||
icon_position = right # Align icons left/right/off
|
icon_position = right # Align icons left/right/off
|
||||||
max_icon_size = 24
|
max_icon_size = 32
|
||||||
|
|
||||||
# Paths to default icons.
|
# Paths to default icons.
|
||||||
icon_path = /home/deadguy/.local/share/icons/Haiku/scalable/actions:/home/deadguy/.local/share/icons/Haiku/scalable/animations:/home/deadguy/.local/share/icons/Haiku/scalable/apps:/home/deadguy/.local/share/icons/Haiku/scalable/categories:/home/deadguy/.local/share/icons/Haiku/scalable/devices:/home/deadguy/.local/share/icons/Haiku/scalable/emblems:/home/deadguy/.local/share/icons/Haiku/scalable/emotes:/home/deadguy/.local/share/icons/Haiku/scalable/mimetypes:/home/deadguy/.local/share/icons/Haiku/scalable/places:/home/deadguy/.local/share/icons/Haiku/scalable/status:/home/deadguy/.local/share/icons/Haiku/scalable/stock
|
icon_path = /home/deadguy/.local/share/icons/Haiku/scalable/actions:/home/deadguy/.local/share/icons/Haiku/scalable/animations:/home/deadguy/.local/share/icons/Haiku/scalable/apps:/home/deadguy/.local/share/icons/Haiku/scalable/categories:/home/deadguy/.local/share/icons/Haiku/scalable/devices:/home/deadguy/.local/share/icons/Haiku/scalable/emblems:/home/deadguy/.local/share/icons/Haiku/scalable/emotes:/home/deadguy/.local/share/icons/Haiku/scalable/mimetypes:/home/deadguy/.local/share/icons/Haiku/scalable/places:/home/deadguy/.local/share/icons/Haiku/scalable/status:/home/deadguy/.local/share/icons/Haiku/scalable/stock
|
||||||
|
|
|
@ -62,22 +62,6 @@
|
||||||
line-numbers-minus-style = red italic
|
line-numbers-minus-style = red italic
|
||||||
line-numbers-plus-style = green italic
|
line-numbers-plus-style = green italic
|
||||||
|
|
||||||
[delta "flashy"]
|
|
||||||
side-by-side = true
|
|
||||||
line-numbers = true
|
|
||||||
decorations = true
|
|
||||||
syntax-theme = dracula
|
|
||||||
plus-style = syntax "#003800"
|
|
||||||
minus-style = syntax "#3f0001"
|
|
||||||
commit-decoration-style = bold yellow box ul
|
|
||||||
file-style = bold yellow ul
|
|
||||||
file-decoration-style = none
|
|
||||||
hunk-header-decoration-style = cyan box ul
|
|
||||||
line-numbers-left-style = cyan
|
|
||||||
line-numbers-right-style = cyan
|
|
||||||
line-numbers-minus-style = 124
|
|
||||||
line-numbers-plus-style = 28
|
|
||||||
|
|
||||||
[web]
|
[web]
|
||||||
browser = firefox
|
browser = firefox
|
||||||
|
|
||||||
|
@ -120,32 +104,6 @@ line-numbers-plus-style = 28
|
||||||
lineNumber = true
|
lineNumber = true
|
||||||
extendRegexp = true
|
extendRegexp = true
|
||||||
|
|
||||||
[color "branch"]
|
|
||||||
remote = red bold
|
|
||||||
current = yellow bold
|
|
||||||
local = yellow
|
|
||||||
[color "status"]
|
|
||||||
added = yellow bold
|
|
||||||
changed = red bold
|
|
||||||
untracked = red
|
|
||||||
header = cyan bold
|
|
||||||
branch = yellow bold
|
|
||||||
[color "grep"]
|
|
||||||
separator = green bold
|
|
||||||
filename = green
|
|
||||||
linenumber = blue bold
|
|
||||||
[color "diff"]
|
|
||||||
meta = yellow
|
|
||||||
frag = magenta bold
|
|
||||||
commit = yellow bold
|
|
||||||
old = red bold
|
|
||||||
new = green bold
|
|
||||||
whitespace = red reverse
|
|
||||||
[color "diff-highlight"]
|
|
||||||
oldNormal = red bold
|
|
||||||
oldHighlight = red bold 52
|
|
||||||
newNormal = green bold
|
|
||||||
newHighlight = green bold 22
|
|
||||||
|
|
||||||
[gpg]
|
[gpg]
|
||||||
program = gpg2
|
program = gpg2
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
# Beware! This file is rewritten by htop when settings are changed in the interface.
|
# Beware! This file is rewritten by htop when settings are changed in the interface.
|
||||||
# The parser is also very primitive, and not human-friendly.
|
# The parser is also very primitive, and not human-friendly.
|
||||||
fields=0 48 47 46 2 17 49 18 38 1
|
fields=0 48 39 2 46 47 49 1
|
||||||
sort_key=38
|
sort_key=47
|
||||||
sort_direction=1
|
sort_direction=1
|
||||||
tree_sort_key=47
|
tree_sort_key=0
|
||||||
tree_sort_direction=1
|
tree_sort_direction=1
|
||||||
hide_kernel_threads=0
|
hide_kernel_threads=1
|
||||||
hide_userland_threads=0
|
hide_userland_threads=1
|
||||||
shadow_other_users=0
|
shadow_other_users=0
|
||||||
show_thread_names=1
|
show_thread_names=0
|
||||||
show_program_path=1
|
show_program_path=1
|
||||||
highlight_base_name=1
|
highlight_base_name=1
|
||||||
highlight_megabytes=1
|
highlight_megabytes=1
|
||||||
|
@ -20,17 +20,18 @@ strip_exe_from_cmdline=1
|
||||||
show_merged_command=0
|
show_merged_command=0
|
||||||
tree_view=1
|
tree_view=1
|
||||||
tree_view_always_by_pid=0
|
tree_view_always_by_pid=0
|
||||||
header_margin=1
|
header_margin=0
|
||||||
detailed_cpu_time=1
|
detailed_cpu_time=0
|
||||||
cpu_count_from_one=1
|
cpu_count_from_one=1
|
||||||
show_cpu_usage=1
|
show_cpu_usage=1
|
||||||
show_cpu_frequency=0
|
show_cpu_frequency=0
|
||||||
update_process_names=1
|
update_process_names=0
|
||||||
account_guest_in_cpu_meter=0
|
account_guest_in_cpu_meter=0
|
||||||
color_scheme=0
|
color_scheme=0
|
||||||
enable_mouse=0
|
enable_mouse=0
|
||||||
delay=15
|
delay=15
|
||||||
left_meters=AllCPUs
|
left_meters=Blank AllCPUs2 Blank
|
||||||
left_meter_modes=1
|
left_meter_modes=2 1 2
|
||||||
right_meters=Tasks Memory Swap CPU
|
right_meters=Blank Memory Tasks
|
||||||
right_meter_modes=2 2 2 1
|
right_meter_modes=2 2 2
|
||||||
|
hide_function_bar=0
|
||||||
|
|
|
@ -31,6 +31,7 @@ cmd open ${{
|
||||||
case $(file --mime-type $f -bL) in
|
case $(file --mime-type $f -bL) in
|
||||||
text/*|application/json) vix "$f";;
|
text/*|application/json) vix "$f";;
|
||||||
image/gif) setsid sxiv-gif $f 2>/dev/null & ;;
|
image/gif) setsid sxiv-gif $f 2>/dev/null & ;;
|
||||||
|
image/svg+xml) display -- $f ;;
|
||||||
image/*) setsid sxiv-rifle $f 2>/dev/null & ;;
|
image/*) setsid sxiv-rifle $f 2>/dev/null & ;;
|
||||||
audio/*) mpv $f ;;
|
audio/*) mpv $f ;;
|
||||||
video/*) setsid mpv $f -quiet >/dev/null 2>&1 & ;;
|
video/*) setsid mpv $f -quiet >/dev/null 2>&1 & ;;
|
||||||
|
|
|
@ -3,12 +3,11 @@ ncmpcpp_directory = "~/.config/ncmpcpp"
|
||||||
execute_on_song_change = "tapa"
|
execute_on_song_change = "tapa"
|
||||||
|
|
||||||
# VISULAIZER
|
# VISULAIZER
|
||||||
visualizer_fifo_path = "/tmp/mpd.fifo"
|
visualizer_data_source = "/tmp/mpd.fifo"
|
||||||
visualizer_output_name = "mpd spectrum"
|
visualizer_output_name = "mpd spectrum"
|
||||||
visualizer_type = "wave"
|
visualizer_type = "wave"
|
||||||
visualizer_in_stereo = no
|
visualizer_in_stereo = no
|
||||||
visualizer_color = "red,yellow,green,cyan,blue,red,yellow,green,cyan,blue,red,yellow,green,cyan,blue,red"
|
visualizer_color = "red,yellow,green,cyan,blue,red,yellow,green,cyan,blue,red,yellow,green,cyan,blue,red"
|
||||||
visualizer_sync_interval = 15
|
|
||||||
visualizer_look = "∙│"
|
visualizer_look = "∙│"
|
||||||
|
|
||||||
# COLORS
|
# COLORS
|
||||||
|
|
|
@ -78,6 +78,6 @@ save-path ~/.config/newsboat/saved
|
||||||
macro , open-in-browser
|
macro , open-in-browser
|
||||||
macro d set browser "ytdl"; open-in-browser ; set browser linkhandler
|
macro d set browser "ytdl"; open-in-browser ; set browser linkhandler
|
||||||
macro v set browser "setsid nohup mpv"; open-in-browser ; set browser linkhandler
|
macro v set browser "setsid nohup mpv"; open-in-browser ; set browser linkhandler
|
||||||
macro w set browser "tmux split-window -hp 60 && tmux send-keys 'lynx %u && tmux kill-pane\n'"; open-in-browser ; set browser linkhandler
|
macro w set browser "tmux split-window -hp 60 && tmux send-keys 'elinks %u && tmux kill-pane\n'"; open-in-browser ; set browser linkhandler
|
||||||
|
|
||||||
# vim: ft=conf cms=#%s
|
# vim: ft=conf cms=#%s
|
||||||
|
|
|
@ -13,13 +13,15 @@ let g:go_fmt_command = "goimports"
|
||||||
let g:go_list_type = "quickfix"
|
let g:go_list_type = "quickfix"
|
||||||
|
|
||||||
" Go syntax highlighting
|
" Go syntax highlighting
|
||||||
let g:go_highlight_types = 1
|
let g:go_highlight_build_constraints = 1
|
||||||
let g:go_highlight_build_constraints = 1
|
let g:go_highlight_fields = 1
|
||||||
let g:go_highlight_fields = 1
|
let g:go_highlight_function_calls = 1
|
||||||
let g:go_highlight_functions = 1
|
let g:go_highlight_functions = 1
|
||||||
let g:go_highlight_function_calls = 1
|
let g:go_highlight_methods = 1
|
||||||
|
let g:go_highlight_operators = 1
|
||||||
|
let g:go_highlight_structs = 1
|
||||||
|
let g:go_highlight_types = 1
|
||||||
let g:go_highlight_extra_types = 1
|
let g:go_highlight_extra_types = 1
|
||||||
let g:go_highlight_operators = 1
|
|
||||||
|
|
||||||
" Status line types/signatures
|
" Status line types/signatures
|
||||||
let g:go_auto_type_info = 1
|
let g:go_auto_type_info = 1
|
||||||
|
|
|
@ -1,6 +1,21 @@
|
||||||
setlocal path=.,**
|
setlocal path=.,**
|
||||||
setlocal path-=/usr/include
|
setlocal path-=/usr/include
|
||||||
setlocal suffixesadd+=.js
|
setlocal suffixesadd+=.js
|
||||||
setlocal include=^\\s*[^\/]\\+\\(from\\\|require(['\"]\\)
|
|
||||||
setlocal define=^\\s*function
|
|
||||||
set wildignore=*.min.*,*/.git/**/*,node_modules/*
|
set wildignore=*.min.*,*/.git/**/*,node_modules/*
|
||||||
|
|
||||||
|
let b:match_words = '\<function\>:\<return\>,'
|
||||||
|
\ . '\<do\>:\<while\>,'
|
||||||
|
\ . '\<switch\>:\<case\>:\<default\>,'
|
||||||
|
\ . '\<if\>:\<else\>,'
|
||||||
|
\ . '\<try\>:\<catch\>:\<finally\>'
|
||||||
|
|
||||||
|
setlocal include=^\\s*[^\/]\\+\\(from\\\|require(\\)\\s*['\"\.]
|
||||||
|
|
||||||
|
let &l:define = '^\s*\('
|
||||||
|
\ . '\(export\s\)*\(default\s\)*\(var\|const\|let\|function\|class\|interface\)\s'
|
||||||
|
\ . '\|\(public\|private\|protected\|readonly\|static\)\s'
|
||||||
|
\ . '\|\(get\s\|set\s\)'
|
||||||
|
\ . '\|\(export\sdefault\s\|abstract\sclass\s\)'
|
||||||
|
\ . '\|\(async\s\)'
|
||||||
|
\ . '\|\(\ze\i\+([^)]*).*{$\)'
|
||||||
|
\ . '\)'
|
||||||
|
|
|
@ -1,4 +1,13 @@
|
||||||
setlocal nonumber norelativenumber laststatus=0 showmode
|
aug Status
|
||||||
|
au!
|
||||||
|
au BufNew,BufEnter *.md set laststatus=0
|
||||||
|
au BufHidden,BufLeave *.md set laststatus=2
|
||||||
|
aug END
|
||||||
|
|
||||||
|
let g:markdown_syntax_conceal = 0
|
||||||
|
let g:markdown_fenced_languages = ['html', 'css', 'yaml', 'toml', 'sh', 'viml=vim']
|
||||||
|
|
||||||
|
setlocal nonumber norelativenumber
|
||||||
setlocal signcolumn=no textwidth=80 wrap sw=2
|
setlocal signcolumn=no textwidth=80 wrap sw=2
|
||||||
setlocal tabstop=2 noexpandtab softtabstop=0 linebreak
|
setlocal tabstop=2 noexpandtab softtabstop=0 linebreak
|
||||||
setlocal autoindent ruler colorcolumn=80
|
setlocal autoindent ruler colorcolumn=80
|
||||||
|
@ -6,6 +15,7 @@ setlocal complete+=kspell
|
||||||
setlocal spell spelllang=es,en_us,cjk
|
setlocal spell spelllang=es,en_us,cjk
|
||||||
setlocal formatoptions=1tqnw
|
setlocal formatoptions=1tqnw
|
||||||
setlocal comments=n:>
|
setlocal comments=n:>
|
||||||
|
setlocal errorformat="%f",\ line\ %l:\ %m
|
||||||
setlocal formatlistpat=^\\s* " Optional leading whitespace
|
setlocal formatlistpat=^\\s* " Optional leading whitespace
|
||||||
setlocal formatlistpat+=[ " Start character class
|
setlocal formatlistpat+=[ " Start character class
|
||||||
setlocal formatlistpat+=\\[({]\\? " | Optionally match opening punctuation
|
setlocal formatlistpat+=\\[({]\\? " | Optionally match opening punctuation
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
setlocal cursorline
|
setlocal cursorline
|
||||||
setlocal nospell
|
setlocal nospell
|
||||||
setlocal nolist
|
setlocal nolist
|
||||||
|
set nobuflisted
|
||||||
|
|
||||||
" Close with q
|
" Close with q
|
||||||
nnoremap <silent><buffer> q :<C-u>close<CR>
|
nnoremap <silent><buffer> q :<C-u>close<CR>
|
||||||
|
@ -44,3 +45,6 @@ if !exists('*s:newer')
|
||||||
endtry
|
endtry
|
||||||
endfunction
|
endfunction
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
" Quit QuickFix window along with source file window
|
||||||
|
autocmd WinEnter * if winnr('$') == 1 && getbufvar(winbufnr(winnr()), "&buftype") == "quickfix" | q | endif
|
||||||
|
|
|
@ -4,12 +4,12 @@ endif
|
||||||
|
|
||||||
let b:sh_indent_options['continuation-line'] = 2
|
let b:sh_indent_options['continuation-line'] = 2
|
||||||
|
|
||||||
" command! -buffer -bang Lint compiler shfmt | lmake<bang>
|
if executable('shfmt')
|
||||||
" command! -buffer -bang Compile compiler shellcheck | make<bang>
|
let &l:formatprg='shfmt -i ' . &l:shiftwidth . ' -ln posix -sr -ci -s'
|
||||||
|
endif
|
||||||
|
|
||||||
" augroup linty
|
" force Man to be used along side lsc
|
||||||
" au! * <buffer>
|
nnoremap <buffer> K :Man <c-r><c-w><CR>
|
||||||
" au BufWritePre <buffer=abuf> Lint
|
|
||||||
" au BufWritePost <buffer=abuf> :silent Compile
|
" allow for commands with - in the name
|
||||||
" au QuickFixCmdPost make cwindow
|
set iskeyword+=-
|
||||||
" augroup END
|
|
||||||
|
|
|
@ -3,4 +3,12 @@ setlocal nonumber norelativenumber
|
||||||
setlocal signcolumn=no
|
setlocal signcolumn=no
|
||||||
setlocal wrap noruler
|
setlocal wrap noruler
|
||||||
|
|
||||||
startinsert!
|
aug MyTerminal
|
||||||
|
au!
|
||||||
|
au TermOpen * set laststatus=0 noshowmode noshowcmd
|
||||||
|
" workaround for a segfault: https://github.com/neovim/neovim/issues/11548#issuecomment-583081783
|
||||||
|
" immediately enter insert mode when switching to a terminal
|
||||||
|
au BufEnter term://* startinsert!
|
||||||
|
au TermClose * set laststatus=2 showmode showcmd
|
||||||
|
au BufLeave term://* stopinsert
|
||||||
|
aug END
|
||||||
|
|
|
@ -1,2 +1,15 @@
|
||||||
setlocal spell spelllang=es,en_us
|
setlocal spell spelllang=es,en_us
|
||||||
|
setlocal complete+=kspell
|
||||||
|
|
||||||
|
" Spellcheck
|
||||||
|
nnoremap <buffer> <silent> <F7> [s
|
||||||
|
nnoremap <buffer> <silent> <F8> ]s
|
||||||
|
nnoremap <buffer> <silent> <F9> z=
|
||||||
|
nnoremap <buffer> <silent> <F10> z=1<CR><CR>
|
||||||
|
nnoremap <buffer> <silent> <F11> zg
|
||||||
inoremap <buffer> <C-l> <c-g>u<Esc>[s1z=`]a<c-g>u
|
inoremap <buffer> <C-l> <c-g>u<Esc>[s1z=`]a<c-g>u
|
||||||
|
|
||||||
|
aug Create
|
||||||
|
au!
|
||||||
|
au BufWritePost *.tex !pdflatex %
|
||||||
|
aug END
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
" if exists('b:coc_enabled=1')
|
|
||||||
set completeopt-=preview
|
set completeopt-=preview
|
||||||
|
|
||||||
nnoremap <silent><F6> :vsplit<CR><Bar>:CocConfig<CR>
|
nnoremap <silent><F6> :vsplit<CR><Bar>:CocConfig<CR>
|
||||||
|
|
||||||
let g:coc_global_extensions = ['coc-diagnostic', 'coc-prettier', 'coc-highlight', 'coc-snippets', 'coc-tsserver', 'coc-css', 'coc-html', 'coc-json', 'coc-emmet']
|
let g:coc_global_extensions = ['coc-highlight', 'coc-snippets', 'coc-tsserver', 'coc-css', 'coc-html', 'coc-json']
|
||||||
|
|
||||||
" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current
|
" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current
|
||||||
" position. Coc only does snippet and additional edit on confirm.
|
" position. Coc only does snippet and additional edit on confirm.
|
||||||
|
@ -44,12 +43,3 @@
|
||||||
" au CursorHold * silent call CocActionAsync('highlight')
|
" au CursorHold * silent call CocActionAsync('highlight')
|
||||||
au User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
|
au User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
|
||||||
aug END
|
aug END
|
||||||
" else
|
|
||||||
" set omnifunc=syntaxcomplete#Complete
|
|
||||||
" " open omni completion menu closing previous if open and opening new menu without changing the text
|
|
||||||
" inoremap <silent> <expr> <C-Space> (pumvisible() ? (col('.') > 1 ? '<Esc>i<Right>' : '<Esc>i') : '') .
|
|
||||||
" \ '<C-x><C-o><C-r>=pumvisible() ? "\<lt>C-n>\<lt>C-p>\<lt>Down>" : ""<CR>'
|
|
||||||
" " open user completion menu closing previous if open and opening new menu without changing the text
|
|
||||||
" inoremap <silent> <expr> <M-Space> (pumvisible() ? (col('.') > 1 ? '<Esc>i<Right>' : '<Esc>i') : '') .
|
|
||||||
" \ '<C-x><C-u><C-r>=pumvisible() ? "\<lt>C-n>\<lt>C-p>\<lt>Down>" : ""<CR>'
|
|
||||||
" endif
|
|
||||||
|
|
|
@ -1,15 +1,3 @@
|
||||||
function! dead#functions#PopOutOfInsertMode() abort
|
|
||||||
if v:insertmode
|
|
||||||
call feedkeys("\<C-\>\<C-n>")
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! dead#functions#Relativize(v) abort
|
|
||||||
if &number
|
|
||||||
let &cursorline = a:v
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! dead#functions#JumpToNextHeading(direction, count)
|
function! dead#functions#JumpToNextHeading(direction, count)
|
||||||
let col = col('.')
|
let col = col('.')
|
||||||
silent execute a:direction ==? 'up' ? '?^#' : '/^#'
|
silent execute a:direction ==? 'up' ? '?^#' : '/^#'
|
||||||
|
@ -44,3 +32,10 @@ command! -bang -nargs=* GGrep
|
||||||
\ call fzf#vim#grep(
|
\ call fzf#vim#grep(
|
||||||
\ 'git grep --line-number '.shellescape(<q-args>), 0,
|
\ 'git grep --line-number '.shellescape(<q-args>), 0,
|
||||||
\ fzf#vim#with_preview({'dir': systemlist('git rev-parse --show-toplevel')[0]}), <bang>0)
|
\ fzf#vim#with_preview({'dir': systemlist('git rev-parse --show-toplevel')[0]}), <bang>0)
|
||||||
|
|
||||||
|
function! dead#functions#FormatFile()
|
||||||
|
let b:PlugView=winsaveview()
|
||||||
|
exe 'silent normal! gg=G'
|
||||||
|
call winrestview(b:PlugView)
|
||||||
|
echo 'file indented'
|
||||||
|
endfunction
|
||||||
|
|
|
@ -8,14 +8,14 @@ endfunction
|
||||||
|
|
||||||
function! dead#statusline#StatusLine() abort
|
function! dead#statusline#StatusLine() abort
|
||||||
let l:statusline=''
|
let l:statusline=''
|
||||||
let l:statusline.='%#User9#%f %m'
|
|
||||||
let l:statusline.=' %#User8#%{fugitive#head()} '
|
|
||||||
let l:statusline.='%#User7#%{GitStatus()}'
|
|
||||||
let l:statusline.='%{dead#statusline#LinePasteMode()}'
|
|
||||||
let l:statusline.='%= '
|
|
||||||
let l:statusline.='%#User9#%p%% ☰ %l:%c '
|
|
||||||
let l:statusline.=dead#statusline#ModeColor()
|
let l:statusline.=dead#statusline#ModeColor()
|
||||||
let l:statusline.=dead#statusline#CurrentMode()
|
let l:statusline.=dead#statusline#CurrentMode()
|
||||||
|
let l:statusline.=' %#User9#%p%% = %l:%c'
|
||||||
|
let l:statusline.=' %#User8#%{fugitive#head()} '
|
||||||
|
let l:statusline.='%= '
|
||||||
|
let l:statusline.='%#User7#%{GitStatus()} '
|
||||||
|
let l:statusline.='%#User9#%m %f'
|
||||||
|
let l:statusline.='%{dead#statusline#LinePasteMode()}'
|
||||||
return l:statusline
|
return l:statusline
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
@ -69,8 +69,7 @@ function! GitStatus() abort
|
||||||
if !get(g:, 'gitgutter_enabled', 0) || empty(FugitiveHead())
|
if !get(g:, 'gitgutter_enabled', 0) || empty(FugitiveHead())
|
||||||
return ''
|
return ''
|
||||||
endif
|
endif
|
||||||
let [ l:added, l:modified, l:removed ] = GitGutterGetHunkSummary()
|
return join(filter(map(['A','M','D'], {i,v -> v.': '.GitGutterGetHunkSummary()[i]}), 'v:val[-1:]'), ' ')
|
||||||
return printf('+%d ~%d -%d', l:added, l:modified, l:removed)
|
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
let g:modes={
|
let g:modes={
|
||||||
|
|
|
@ -1,4 +1,21 @@
|
||||||
{
|
{
|
||||||
|
"languageserver": {
|
||||||
|
"efm": {
|
||||||
|
"command": "efm-langserver",
|
||||||
|
"args": [],
|
||||||
|
// custom config path
|
||||||
|
// "args": ["-c", "/path/to/your/config.yaml"],
|
||||||
|
"filetypes": [
|
||||||
|
"vim",
|
||||||
|
"html",
|
||||||
|
"sh",
|
||||||
|
"javascript",
|
||||||
|
"css",
|
||||||
|
"markdown",
|
||||||
|
"yaml"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
"coc.preferences.formatOnSaveFiletypes": [
|
"coc.preferences.formatOnSaveFiletypes": [
|
||||||
"javascript",
|
"javascript",
|
||||||
"html",
|
"html",
|
||||||
|
@ -8,32 +25,32 @@
|
||||||
"sh"
|
"sh"
|
||||||
],
|
],
|
||||||
"codeLens.enable": true,
|
"codeLens.enable": true,
|
||||||
"diagnostic.errorSign": "𝐗",
|
"diagnostic.errorSign": "X",
|
||||||
"diagnostic.warningSign": "➤",
|
"diagnostic.warningSign": "!",
|
||||||
"diagnostic.infoSign": "●",
|
"diagnostic.infoSign": "●",
|
||||||
"diagnostic-languageserver.mergeConfig": true,
|
/* "diagnostic-languageserver.mergeConfig": true, */
|
||||||
"diagnostic-languageserver.filetypes": {
|
/* "diagnostic-languageserver.filetypes": { */
|
||||||
// lint `sh` (includes `bash`) files
|
/* // lint `sh` (includes `bash`) files */
|
||||||
"sh": "shellcheck",
|
/* "sh": "shellcheck", */
|
||||||
"html": "prettier",
|
/* "html": "prettier", */
|
||||||
"vim": "vint"
|
/* "vim": "vint" */
|
||||||
},
|
/* }, */
|
||||||
"diagnostic-languageserver.formatFiletypes": {
|
/* "diagnostic-languageserver.formatFiletypes": { */
|
||||||
// format `sh` (includes `bash`) files using formatter defined below
|
/* // format `sh` (includes `bash`) files using formatter defined below */
|
||||||
"sh": "shfmt"
|
/* "sh": "shfmt" */
|
||||||
},
|
/* }, */
|
||||||
"diagnostic-languageserver.formatters": {
|
/* "diagnostic-languageserver.formatters": { */
|
||||||
// define our formatter so that we can reference it from
|
/* // define our formatter so that we can reference it from */
|
||||||
// `diagnostic-languageserver.formatFiletypes`
|
/* // `diagnostic-languageserver.formatFiletypes` */
|
||||||
"shfmt": {
|
/* "shfmt": { */
|
||||||
"command": "shfmt",
|
/* "command": "shfmt", */
|
||||||
// all the below args are entirely optional
|
/* // all the below args are entirely optional */
|
||||||
// primarily listed here to call out that flags which take an
|
/* // primarily listed here to call out that flags which take an */
|
||||||
// argument (such as `-i <num-spaces>` for specifying indentation)
|
/* // argument (such as `-i <num-spaces>` for specifying indentation) */
|
||||||
// should be split into two strings, the flag and then the value
|
/* // should be split into two strings, the flag and then the value */
|
||||||
"args": ["-p", "-ci", "-sr"]
|
/* "args": ["-p", "-ci", "-sr"] */
|
||||||
}
|
/* } */
|
||||||
},
|
/* }, */
|
||||||
"list.alignColumns": true,
|
"list.alignColumns": true,
|
||||||
"suggest.echodocSupport": true,
|
"suggest.echodocSupport": true,
|
||||||
"suggest.maxPreviewWidth": 100,
|
"suggest.maxPreviewWidth": 100,
|
||||||
|
@ -43,10 +60,7 @@
|
||||||
"javascriptreact": ["javascript"],
|
"javascriptreact": ["javascript"],
|
||||||
"typescript": ["javascript"]
|
"typescript": ["javascript"]
|
||||||
},
|
},
|
||||||
"tailwindCSS.enable": true,
|
|
||||||
"tailwindCSS.validate": true,
|
|
||||||
"tailwindCSS.emmetCompletions": true,
|
"tailwindCSS.emmetCompletions": true,
|
||||||
"tailwindCSS.lint.cssConflict": "warning",
|
|
||||||
"tsserver.npm": "/home/deadguy/.config/yarn/bin/yarn",
|
"tsserver.npm": "/home/deadguy/.config/yarn/bin/yarn",
|
||||||
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": true,
|
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": true,
|
||||||
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": true,
|
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": true,
|
||||||
|
|
|
@ -1,19 +1,29 @@
|
||||||
let g:loaded_python_provider=1 " Disable python 2 interface
|
let g:loaded_python_provider = 0
|
||||||
let g:python_host_skip_check=1 " Skip python 2 host check
|
let g:loaded_ruby_provider = 0
|
||||||
|
let g:loaded_node_provider = 0
|
||||||
|
let g:loaded_gzip = 1
|
||||||
|
let g:loaded_tarPlugin = 1
|
||||||
|
let g:loaded_zipPlugin = 1
|
||||||
|
let g:loaded_2html_plugin = 1
|
||||||
|
|
||||||
if filereadable('bin/python3')
|
if filereadable('bin/python3')
|
||||||
let g:python3_host_prog = '/bin/python3'
|
let g:python3_host_prog = '/bin/python3'
|
||||||
endif
|
endif
|
||||||
if filereadable('~/.local/share/npm/bin/neovim-node-host')
|
|
||||||
let g:node_host_prog = '~/.local/share/npm/bin/neovim-node-host'
|
|
||||||
endif
|
|
||||||
if executable('rg')
|
if executable('rg')
|
||||||
set grepprg=rg\ --vimgrep
|
set grepprg=rg\ --vimgrep
|
||||||
set grepformat=%f:%l:%c:%m
|
set grepformat=%f:%l:%c:%m
|
||||||
|
else
|
||||||
|
set grepprg=grep\ -R\ -n\ --exclude-dir=.git,.cache
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if empty(glob('~/.local/share/nvim/site/autoload/plug.vim'))
|
if empty(glob('~/.local/share/nvim/site/autoload/plug.vim'))
|
||||||
silent !curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs
|
silent !curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs
|
||||||
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||||
autocmd VimEnter * PlugInstall --sync | call coc#util#install() | source $MYVIMRC
|
aug Plugins
|
||||||
|
au!
|
||||||
|
au VimEnter * PlugInstall --sync | call coc#util#install() | source $MYVIMRC
|
||||||
|
aug END
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if has('nvim')
|
if has('nvim')
|
||||||
|
@ -23,24 +33,28 @@ endif
|
||||||
let mapleader="\<SPACE>"
|
let mapleader="\<SPACE>"
|
||||||
let maplocalleader=','
|
let maplocalleader=','
|
||||||
|
|
||||||
set termguicolors
|
if exists('$DISPLAY')
|
||||||
aug colores
|
aug Colores
|
||||||
au!
|
au!
|
||||||
au ColorScheme * call dead#colores#Barra()
|
au ColorScheme * call dead#colores#Barra()
|
||||||
au ColorScheme * call dead#colores#Maquillaje()
|
au ColorScheme * call dead#colores#Maquillaje()
|
||||||
aug END
|
aug END
|
||||||
let g:srcery_transparent_background = 1
|
set termguicolors
|
||||||
let g:srcery_italic = 1
|
let g:srcery_transparent_background = 1
|
||||||
let g:srcery_inverse_matches = 1
|
let g:srcery_italic = 1
|
||||||
let g:srcery_underline = 1
|
let g:srcery_inverse_matches = 1
|
||||||
|
let g:srcery_underline = 1
|
||||||
|
let g:srcery_undercurl = 1
|
||||||
|
endif
|
||||||
let g:srcery_underline_match_paren = 1
|
let g:srcery_underline_match_paren = 1
|
||||||
let g:srcery_undercurl = 1
|
|
||||||
colorscheme srcery
|
colorscheme srcery
|
||||||
|
|
||||||
|
set tabline=%!dead#tabline#Tabline()
|
||||||
|
|
||||||
if filereadable(expand('~/.local/share/nvim/site/autoload/plug.vim'))
|
if filereadable(expand('~/.local/share/nvim/site/autoload/plug.vim'))
|
||||||
call plug#begin(stdpath('data') . '/plugged')
|
call plug#begin(stdpath('data') . '/plugged')
|
||||||
Plug 'lervag/vimtex', {'for': 'latex'}
|
Plug 'lervag/vimtex', {'for': 'latex'}
|
||||||
Plug 'neoclide/coc.nvim', {'branch': 'release', 'for': ['javascript', 'html', 'css', 'json', 'jsonc', 'typescript', 'jsx', 'tsx', 'sh', 'vim']}
|
Plug 'neoclide/coc.nvim', {'branch': 'release', 'for': ['javascript', 'html', 'css', 'json', 'jsonc', 'sh', 'vim']}
|
||||||
Plug 'fatih/vim-go', {'for': 'go', 'do': ':GoInstallBinaries'}
|
Plug 'fatih/vim-go', {'for': 'go', 'do': ':GoInstallBinaries'}
|
||||||
Plug 'tpope/vim-fugitive'
|
Plug 'tpope/vim-fugitive'
|
||||||
Plug 'airblade/vim-gitgutter'
|
Plug 'airblade/vim-gitgutter'
|
||||||
|
|
|
@ -2,13 +2,13 @@ scriptencoding utf-8
|
||||||
|
|
||||||
if !exists('autocommands_loaded') && has('autocmd')
|
if !exists('autocommands_loaded') && has('autocmd')
|
||||||
let autocommands_loaded = 1
|
let autocommands_loaded = 1
|
||||||
let ftToIgnore = ['markdown', 'html']
|
let ftToIgnore = ['markdown', 'html', 'text']
|
||||||
|
let noNumbers = ['markdown', 'help', 'text']
|
||||||
|
|
||||||
aug OnInsert
|
aug OnInsert
|
||||||
au BufWinEnter,FocusGained,InsertLeave,WinEnter * call dead#functions#Relativize(1)
|
au BufWinEnter,FocusGained,InsertLeave,WinEnter * if index(noNumbers, &ft) < 0 | setlocal cursorline norelativenumber
|
||||||
au BufWinLeave,FocusLost,InsertEnter,WinLeave * call dead#functions#Relativize(0)
|
au BufWinLeave,FocusLost,InsertEnter,WinLeave * if index(noNumbers, &ft) < 0 | setlocal nocursorline relativenumber
|
||||||
au InsertEnter * setlocal relativenumber
|
au InsertLeave * if &paste | setlocal nopaste | endif
|
||||||
au InsertLeave * setlocal nopaste norelativenumber
|
|
||||||
au InsertLeave,CompleteDone * if pumvisible() == 0 | pclose | endif
|
au InsertLeave,CompleteDone * if pumvisible() == 0 | pclose | endif
|
||||||
aug END
|
aug END
|
||||||
|
|
||||||
|
@ -27,16 +27,6 @@ if !exists('autocommands_loaded') && has('autocmd')
|
||||||
au BufWritePre * if index(ftToIgnore, &ft) < 0 | :%s/\s\+$//e
|
au BufWritePre * if index(ftToIgnore, &ft) < 0 | :%s/\s\+$//e
|
||||||
au BufWritePost *xresources !xrdb %
|
au BufWritePost *xresources !xrdb %
|
||||||
au BufWritePost *sxhkdrc !pkill -USR1 sxhkd
|
au BufWritePost *sxhkdrc !pkill -USR1 sxhkd
|
||||||
au BufWritePost *.tex !pdflatex %
|
|
||||||
au QuitPre * if empty(&buftype) | lclose | endif
|
au QuitPre * if empty(&buftype) | lclose | endif
|
||||||
aug END
|
aug END
|
||||||
|
|
||||||
aug MyTerminal
|
|
||||||
au TermOpen * setlocal wrap nonumber norelativenumber noruler signcolumn=no
|
|
||||||
au TermOpen * set laststatus=0
|
|
||||||
" workaround for a segfault: https://github.com/neovim/neovim/issues/11548#issuecomment-583081783
|
|
||||||
" immediately enter insert mode when switching to a terminal
|
|
||||||
au BufEnter term://* startinsert!
|
|
||||||
au TermClose * set laststatus=2
|
|
||||||
aug END
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -6,3 +6,9 @@ let g:gitgutter_set_sign_backgrounds = 1
|
||||||
let g:gitgutter_grep = 'rg --color=never'
|
let g:gitgutter_grep = 'rg --color=never'
|
||||||
|
|
||||||
let g:fugitive_summary_format = "%an\t%s"
|
let g:fugitive_summary_format = "%an\t%s"
|
||||||
|
|
||||||
|
nmap {g <Plug>(GitGutterPrevHunk)zz
|
||||||
|
nmap }g <Plug>(GitGutterNextHunk)zz
|
||||||
|
nmap <Space>+ <Plug>(GitGutterStageHunk)
|
||||||
|
nmap <Space>- <Plug>(GitGutterUndoHunk)
|
||||||
|
nmap <Space>p <Plug>(GitGutterPreviewHunk)
|
||||||
|
|
|
@ -5,8 +5,7 @@ set inccommand=nosplit
|
||||||
set clipboard^=unnamedplus
|
set clipboard^=unnamedplus
|
||||||
set number
|
set number
|
||||||
set noshowmode
|
set noshowmode
|
||||||
set noshowcmd
|
set signcolumn=auto:1
|
||||||
set showtabline=0
|
|
||||||
set noswapfile
|
set noswapfile
|
||||||
set hidden
|
set hidden
|
||||||
set lazyredraw
|
set lazyredraw
|
||||||
|
@ -36,7 +35,6 @@ set diffopt+=algorithm:histogram,indent-heuristic
|
||||||
set diffopt+=foldcolumn:0
|
set diffopt+=foldcolumn:0
|
||||||
set diffopt+=vertical
|
set diffopt+=vertical
|
||||||
set fillchars=diff:\ ,eob:\ ,stlnc:\ ,stl:\ ,vert:\│
|
set fillchars=diff:\ ,eob:\ ,stlnc:\ ,stl:\ ,vert:\│
|
||||||
set formatoptions+=n
|
set formatoptions=tnqj
|
||||||
set formatoptions-=crot
|
|
||||||
let formatlistpat='^\s*\(\d\+[\]:.)}\t ]\|[*-][\t ]\)\s*'
|
let formatlistpat='^\s*\(\d\+[\]:.)}\t ]\|[*-][\t ]\)\s*'
|
||||||
match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
|
match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
|
||||||
|
|
|
@ -36,12 +36,12 @@ set -g pane-border-style fg=colour0,dim
|
||||||
set -g pane-active-border-style fg=colour0,dim
|
set -g pane-active-border-style fg=colour0,dim
|
||||||
set -g set-titles on
|
set -g set-titles on
|
||||||
set -g status-interval 60
|
set -g status-interval 60
|
||||||
set -g mode-style 'fg=#EEEEEE,bg=#75507B'
|
set -g mode-style 'fg=#EEEEEE,bg=colour100'
|
||||||
set -g message-command-style bg=colour0,fg=colour13
|
set -g message-command-style bg=colour0,fg=colour13
|
||||||
set -g message-style 'bg=#222222,fg=white,italics'
|
set -g message-style 'bg=colour233,fg=white,italics'
|
||||||
set -g status-style "bg=#080808,fg=#999999"
|
set -g status-style "bg=#080808,fg=colour248"
|
||||||
set -g status-left '#[fg=#555555]#S: '
|
set -g status-left '#[fg=colour238]#S: '
|
||||||
set -g status-right '#(txbar) #[fg=colour134]%a %d #[fg=colour167]%R'
|
set -g status-right '#(txbar) #[fg=colour13]%a %d #[fg=colour2]%R'
|
||||||
set -g window-status-separator ' '
|
set -g window-status-separator ' '
|
||||||
set -g window-status-current-style bg=default,fg=colour3
|
set -g window-status-current-style bg=default,fg=colour3
|
||||||
set -g window-status-activity-style bg=default,fg=colour15,italics
|
set -g window-status-activity-style bg=default,fg=colour15,italics
|
||||||
|
|
|
@ -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
|
# hash tmux 2>/dev/null && source "${ZDOTDIR}"/tmux.zsh
|
||||||
|
|
||||||
foreach programa (
|
foreach programa (
|
||||||
doc/fzf/completion.zsh
|
doc/fzf/completion.zsh
|
||||||
|
|
|
@ -6,6 +6,13 @@ function precmd() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
autoload -Uz vcs_info
|
||||||
|
precmd_vcs_info() { vcs_info }
|
||||||
|
precmd_functions+=( precmd_vcs_info )
|
||||||
|
setopt prompt_subst
|
||||||
|
zstyle ':vcs_info:git:*' formats '%b'
|
||||||
|
zstyle ':vcs_info:*' enable git
|
||||||
|
|
||||||
function () {
|
function () {
|
||||||
if [[ $EUID == 0 ]]; then
|
if [[ $EUID == 0 ]]; then
|
||||||
local SUFFIX='%(?,%F{yellow},%F{red})%n%f:'
|
local SUFFIX='%(?,%F{yellow},%F{red})%n%f:'
|
||||||
|
@ -14,7 +21,7 @@ function () {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PS1="%B${SUFFIX}%b "
|
PS1="%B${SUFFIX}%b "
|
||||||
export RPS1="%B%(?..%{%F{red}%}(%?%)%{%f%}) %b%F{12}%2~%f"
|
export RPS1="%F{green}\$vcs_info_msg_0_%f %B%(?..%{%F{red}%}(%?%)%{%f%}) %b%F{12}%2~%f"
|
||||||
}
|
}
|
||||||
export SPROMPT="zsh: correct %F{red}'%R'%f to %F{green}'%r'%f [%B%Uy%u%bes, %B%Un%u%bo, %B%Ue%u%bdit, %B%Ua%u%bbort]? "
|
export SPROMPT="zsh: correct %F{red}'%R'%f to %F{green}'%r'%f [%B%Uy%u%bes, %B%Un%u%bo, %B%Ue%u%bdit, %B%Ua%u%bbort]? "
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,9 @@ alias \
|
||||||
ttx='txtnish timeline' \
|
ttx='txtnish timeline' \
|
||||||
ytv='straw-viewer' \
|
ytv='straw-viewer' \
|
||||||
vdf='nvim -d' \
|
vdf='nvim -d' \
|
||||||
|
sxiv='sxiv-rifle' \
|
||||||
play='mpd && ncmpcpp' \
|
play='mpd && ncmpcpp' \
|
||||||
|
mumble='barnard -certificate ~g./barnard/dgy.pem -insecure -password Texto-plano' \
|
||||||
pyserv='python -m http.server'
|
pyserv='python -m http.server'
|
||||||
|
|
||||||
# XBPS
|
# XBPS
|
||||||
|
@ -92,13 +94,14 @@ alias \
|
||||||
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" \
|
||||||
|
links="links -g"
|
||||||
|
|
||||||
# Comandos
|
# Comandos
|
||||||
alias \
|
alias \
|
||||||
sudo='doas ' \
|
sudo='doas ' \
|
||||||
reboot='doas reboot' \
|
reboot='loginctl reboot' \
|
||||||
shutdown='doas shutdown -h now' \
|
shutdown='loginctl poweroff' \
|
||||||
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' \
|
||||||
|
|
|
@ -1,230 +1,232 @@
|
||||||
export LF_ICONS="\
|
if [[ -n $DISPLAY ]]; then
|
||||||
di= :\
|
export LF_ICONS="\
|
||||||
fi= :\
|
di= :\
|
||||||
ln= :\
|
fi= :\
|
||||||
or= :\
|
ln= :\
|
||||||
ex= :\
|
or= :\
|
||||||
.git= :\
|
ex= :\
|
||||||
Desktop= :\
|
.git= :\
|
||||||
Documents= :\
|
Desktop= :\
|
||||||
Downloads= :\
|
Documents= :\
|
||||||
Music= :\
|
Downloads= :\
|
||||||
Pictures= :\
|
Music= :\
|
||||||
Public= :\
|
Pictures= :\
|
||||||
Templates= :\
|
Public= :\
|
||||||
Videos= :\
|
Templates= :\
|
||||||
mail= :\
|
Videos= :\
|
||||||
.mail= :\
|
mail= :\
|
||||||
.cache= :\
|
.mail= :\
|
||||||
.config= :\
|
.cache= :\
|
||||||
trash= :\
|
.config= :\
|
||||||
Trash= :\
|
trash= :\
|
||||||
bin= :\
|
Trash= :\
|
||||||
hexagons= :\
|
bin= :\
|
||||||
xresources= :\
|
hexagons= :\
|
||||||
xinitrc= :\
|
xresources= :\
|
||||||
.bashprofile= :\
|
xinitrc= :\
|
||||||
.zprofile= :\
|
.bashprofile= :\
|
||||||
.bashrc= :\
|
.zprofile= :\
|
||||||
.zshrc= :\
|
.bashrc= :\
|
||||||
.zshenv= :\
|
.zshrc= :\
|
||||||
.dmrc= :\
|
.zshenv= :\
|
||||||
.ds_store= :\
|
.dmrc= :\
|
||||||
.fasd= :\
|
.ds_store= :\
|
||||||
.gitconfig= :\
|
.fasd= :\
|
||||||
.gitignore= :\
|
.gitconfig= :\
|
||||||
gitignore= :\
|
.gitignore= :\
|
||||||
.jack-settings= :\
|
gitignore= :\
|
||||||
.mime.types= :\
|
.jack-settings= :\
|
||||||
.pam_environment= :\
|
.mime.types= :\
|
||||||
.profile= :\
|
.pam_environment= :\
|
||||||
.recently-used= :\
|
.profile= :\
|
||||||
.selected_editor= :\
|
.recently-used= :\
|
||||||
.vimrc= :\
|
.selected_editor= :\
|
||||||
config= :\
|
.vimrc= :\
|
||||||
exact-match-case-sensitive-1.txt=X1:\
|
config= :\
|
||||||
exact-match-case-sensitive-2=X2:\
|
exact-match-case-sensitive-1.txt=X1:\
|
||||||
favicon.ico= :\
|
exact-match-case-sensitive-2=X2:\
|
||||||
gruntfile.coffee= :\
|
favicon.ico= :\
|
||||||
gruntfile.js= :\
|
gruntfile.coffee= :\
|
||||||
gruntfile.ls= :\
|
gruntfile.js= :\
|
||||||
gulpfile.coffee= :\
|
gruntfile.ls= :\
|
||||||
gulpfile.js= :\
|
gulpfile.coffee= :\
|
||||||
gulpfile.ls= :\
|
gulpfile.js= :\
|
||||||
ini= :\
|
gulpfile.ls= :\
|
||||||
ledger= :\
|
ini= :\
|
||||||
mimeapps.list= :\
|
ledger= :\
|
||||||
node_modules= :\
|
mimeapps.list= :\
|
||||||
procfile= :\
|
node_modules= :\
|
||||||
react.jsx= :\
|
procfile= :\
|
||||||
user-dirs.dirs= :\
|
react.jsx= :\
|
||||||
Makefile= :\
|
user-dirs.dirs= :\
|
||||||
TODO= :\
|
Makefile= :\
|
||||||
LICENSE= :\
|
TODO= :\
|
||||||
COPYING= :\
|
LICENSE= :\
|
||||||
*.vim= :\
|
COPYING= :\
|
||||||
*.dmg= :\
|
*.vim= :\
|
||||||
*.toml= :\
|
*.dmg= :\
|
||||||
*.m3u= :\
|
*.toml= :\
|
||||||
*.pls= :\
|
*.m3u= :\
|
||||||
*.woff=𝑾:\
|
*.pls= :\
|
||||||
*.woff2=𝑾:\
|
*.woff=𝑾:\
|
||||||
*.eot=𝑬:\
|
*.woff2=𝑾:\
|
||||||
*.yaml= :\
|
*.eot=𝑬:\
|
||||||
*.yml= :\
|
*.yaml= :\
|
||||||
*.wad=ﰁ :\
|
*.yml= :\
|
||||||
*.WAD=ﰁ :\
|
*.wad=ﰁ :\
|
||||||
*.pk3= :\
|
*.WAD=ﰁ :\
|
||||||
*.doc= :\
|
*.pk3= :\
|
||||||
*.docx= :\
|
*.doc= :\
|
||||||
*.webp= :\
|
*.docx= :\
|
||||||
*.bib= :\
|
*.webp= :\
|
||||||
*.7z= :\
|
*.bib= :\
|
||||||
*.ai= :\
|
*.7z= :\
|
||||||
*.apk= :\
|
*.ai= :\
|
||||||
*.avi= :\
|
*.apk= :\
|
||||||
*.bat= :\
|
*.avi= :\
|
||||||
*.bmp= :\
|
*.bat= :\
|
||||||
*.bz2= :\
|
*.bmp= :\
|
||||||
*.c= :\
|
*.bz2= :\
|
||||||
*.c++= :\
|
*.c= :\
|
||||||
*.cab= :\
|
*.c++= :\
|
||||||
*.cbr= :\
|
*.cab= :\
|
||||||
*.cbz= :\
|
*.cbr= :\
|
||||||
*.cc= :\
|
*.cbz= :\
|
||||||
*.clj= :\
|
*.cc= :\
|
||||||
*.cljc= :\
|
*.clj= :\
|
||||||
*.cljs= :\
|
*.cljc= :\
|
||||||
*.coffee= :\
|
*.cljs= :\
|
||||||
*.conf= :\
|
*.coffee= :\
|
||||||
*.cp= :\
|
*.conf= :\
|
||||||
*.cpio= :\
|
*.cp= :\
|
||||||
*.cpp= :\
|
*.cpio= :\
|
||||||
*.css= :\
|
*.cpp= :\
|
||||||
*.cxx= :\
|
*.css= :\
|
||||||
*.d= :\
|
*.cxx= :\
|
||||||
*.dart= :\
|
*.d= :\
|
||||||
*.db= :\
|
*.dart= :\
|
||||||
*.deb= :\
|
*.db= :\
|
||||||
*.diff= :\
|
*.deb= :\
|
||||||
*.dump= :\
|
*.diff= :\
|
||||||
*.edn= :\
|
*.dump= :\
|
||||||
*.ejs= :\
|
*.edn= :\
|
||||||
*.epub= :\
|
*.ejs= :\
|
||||||
*.erl= :\
|
*.epub= :\
|
||||||
*.exe= :\
|
*.erl= :\
|
||||||
*.f#= :\
|
*.exe= :\
|
||||||
*.fish= :\
|
*.f#= :\
|
||||||
*.flac= :\
|
*.fish= :\
|
||||||
*.flv= :\
|
*.flac= :\
|
||||||
*.fs= :\
|
*.flv= :\
|
||||||
*.fsi= :\
|
*.fs= :\
|
||||||
*.fsscript= :\
|
*.fsi= :\
|
||||||
*.fsx= :\
|
*.fsscript= :\
|
||||||
*.gem= :\
|
*.fsx= :\
|
||||||
*.gif= :\
|
*.gem= :\
|
||||||
*.go= :\
|
*.gif= :\
|
||||||
*.gz= :\
|
*.go= :\
|
||||||
*.gzip= :\
|
*.gz= :\
|
||||||
*.hbs= :\
|
*.gzip= :\
|
||||||
*.hrl= :\
|
*.hbs= :\
|
||||||
*.hs= :\
|
*.hrl= :\
|
||||||
*.htm= :\
|
*.hs= :\
|
||||||
*.html= :\
|
*.htm= :\
|
||||||
*.ico= :\
|
*.html= :\
|
||||||
*.ini= :\
|
*.ico= :\
|
||||||
*.java= :\
|
*.ini= :\
|
||||||
*.jl= :\
|
*.java= :\
|
||||||
*.jpeg= :\
|
*.jl= :\
|
||||||
*.jpg= :\
|
*.jpeg= :\
|
||||||
*.js= :\
|
*.jpg= :\
|
||||||
*.json= :\
|
*.js= :\
|
||||||
*.jsx= :\
|
*.json= :\
|
||||||
*.less= :\
|
*.jsx= :\
|
||||||
*.lha= :\
|
*.less= :\
|
||||||
*.lhs= :\
|
*.lha= :\
|
||||||
*.log= :\
|
*.lhs= :\
|
||||||
*.lua= :\
|
*.log= :\
|
||||||
*.lzh= :\
|
*.lua= :\
|
||||||
*.lzma= :\
|
*.lzh= :\
|
||||||
*.m4a= :\
|
*.lzma= :\
|
||||||
*.markdown= :\
|
*.m4a= :\
|
||||||
*.md= :\
|
*.markdown= :\
|
||||||
*.mkv= :\
|
*.md= :\
|
||||||
*.ml=λ:\
|
*.mkv= :\
|
||||||
*.mli=λ:\
|
*.ml=λ:\
|
||||||
*.mov= :\
|
*.mli=λ:\
|
||||||
*.mp3= :\
|
*.mov= :\
|
||||||
*.mp4= :\
|
*.mp3= :\
|
||||||
*.mpeg= :\
|
*.mp4= :\
|
||||||
*.mpg= :\
|
*.mpeg= :\
|
||||||
*.mustache= :\
|
*.mpg= :\
|
||||||
*.ogg= :\
|
*.mustache= :\
|
||||||
*.pdf= :\
|
*.ogg= :\
|
||||||
*.php= :\
|
*.pdf= :\
|
||||||
*.pl= :\
|
*.php= :\
|
||||||
*.pm= :\
|
*.pl= :\
|
||||||
*.png= :\
|
*.pm= :\
|
||||||
*.psb= :\
|
*.png= :\
|
||||||
*.psd= :\
|
*.psb= :\
|
||||||
*.py= :\
|
*.psd= :\
|
||||||
*.pyc= :\
|
*.py= :\
|
||||||
*.pyd= :\
|
*.pyc= :\
|
||||||
*.pyo= :\
|
*.pyd= :\
|
||||||
*.rar= :\
|
*.pyo= :\
|
||||||
*.rb= :\
|
*.rar= :\
|
||||||
*.rc= :\
|
*.rb= :\
|
||||||
*.rlib= :\
|
*.rc= :\
|
||||||
*.rpm= :\
|
*.rlib= :\
|
||||||
*.rs= :\
|
*.rpm= :\
|
||||||
*.rss= :\
|
*.rs= :\
|
||||||
*.scala= :\
|
*.rss= :\
|
||||||
*.scss= :\
|
*.scala= :\
|
||||||
*.sh= :\
|
*.scss= :\
|
||||||
*.slim= :\
|
*.sh= :\
|
||||||
*.sln= :\
|
*.slim= :\
|
||||||
*.sql= :\
|
*.sln= :\
|
||||||
*.styl= :\
|
*.sql= :\
|
||||||
*.suo= :\
|
*.styl= :\
|
||||||
*.t= :\
|
*.suo= :\
|
||||||
*.tar= :\
|
*.t= :\
|
||||||
*.tgz= :\
|
*.tar= :\
|
||||||
*.ts= :\
|
*.tgz= :\
|
||||||
*.twig= :\
|
*.ts= :\
|
||||||
*.wav= :\
|
*.twig= :\
|
||||||
*.webm= :\
|
*.wav= :\
|
||||||
*.xml= :\
|
*.webm= :\
|
||||||
*.xul= :\
|
*.xml= :\
|
||||||
*.xz= :\
|
*.xul= :\
|
||||||
*.zip= :\
|
*.xz= :\
|
||||||
*.zsh= :\
|
*.zip= :\
|
||||||
*.kra= :\
|
*.zsh= :\
|
||||||
*.xcf= :\
|
*.kra= :\
|
||||||
*.go= :\
|
*.xcf= :\
|
||||||
*.tex= :\
|
*.go= :\
|
||||||
*.txt= :\
|
*.tex= :\
|
||||||
*.lock= :\
|
*.txt= :\
|
||||||
*.h= :\
|
*.lock= :\
|
||||||
*.o= :\
|
*.h= :\
|
||||||
*.blend= :\
|
*.o= :\
|
||||||
*.1= :\
|
*.blend= :\
|
||||||
*.jar= :\
|
*.1= :\
|
||||||
*.desktop= :\
|
*.jar= :\
|
||||||
*.mk= :\
|
*.desktop= :\
|
||||||
*.torrent= :\
|
*.mk= :\
|
||||||
*.added= :\
|
*.torrent= :\
|
||||||
*.pem= :\
|
*.added= :\
|
||||||
*.svg= :\
|
*.pem= :\
|
||||||
*.scd= :\
|
*.svg= :\
|
||||||
*.theme= :\
|
*.scd= :\
|
||||||
*.iso= :\
|
*.theme= :\
|
||||||
*.mid= :\
|
*.iso= :\
|
||||||
*.url= :\
|
*.mid= :\
|
||||||
*.part= :\
|
*.url= :\
|
||||||
*.nfo= :\
|
*.part= :\
|
||||||
*.pd= :\
|
*.nfo= :\
|
||||||
*.ttf= :\
|
*.pd= :\
|
||||||
*.otf= :\
|
*.ttf= :\
|
||||||
*.bdf= :\
|
*.otf= :\
|
||||||
*.pcf= :\
|
*.bdf= :\
|
||||||
"
|
*.pcf= :\
|
||||||
|
"
|
||||||
|
fi
|
||||||
|
|
|
@ -42,7 +42,8 @@ tmux_sessions() {
|
||||||
}
|
}
|
||||||
|
|
||||||
tmux_base_session(){
|
tmux_base_session(){
|
||||||
client_cnt="$(tmux list-clients | wc -l 2>/dev/null)"
|
# create base session, then prompt for others
|
||||||
|
client_cnt="$(tmux list-clients 2>/dev/null | wc -l)"
|
||||||
if [[ $client_cnt -eq 0 ]]; then
|
if [[ $client_cnt -eq 0 ]]; then
|
||||||
tmux new-session -d -s z
|
tmux new-session -d -s z
|
||||||
tmux attach-session -t z
|
tmux attach-session -t z
|
||||||
|
|
|
@ -17,13 +17,13 @@ case $1 in
|
||||||
echo "$focusedNode $focusedID $focusedName" >> "$file"
|
echo "$focusedNode $focusedID $focusedName" >> "$file"
|
||||||
xdo hide "$focusedNode"
|
xdo hide "$focusedNode"
|
||||||
notiflines="$((lines + 1))"
|
notiflines="$((lines + 1))"
|
||||||
notify-send -i "$icon" "${notiflines} ventanas escondidas." "$focusedName"
|
[ "$notiflines" -gt 1 ] && notiftext="ventanas escondidas" || notiftext="ventana escondida"
|
||||||
|
notify-send -i "$icon" "${notiflines} $notiftext." "$focusedName"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
show)
|
show)
|
||||||
[ -z "$file" ] && exit
|
[ -z "$file" ] && exit
|
||||||
|
[ "$lines" -eq 1 ] && sel=$(awk '{print $2,$3}' "$file") || sel=$(awk '{print $2,$3}' "$file" | rofi -dmenu -p ' ')
|
||||||
sel=$(awk '{print $2,$3}' "$file" | rofi -dmenu -p ' ')
|
|
||||||
selectedID=$(awk -v pat="$sel" '$0~pat {print $1}' "$file")
|
selectedID=$(awk -v pat="$sel" '$0~pat {print $1}' "$file")
|
||||||
selectedDesktop=$(awk -v pat="$sel" '$0~pat {print $2}' "$file")
|
selectedDesktop=$(awk -v pat="$sel" '$0~pat {print $2}' "$file")
|
||||||
bspc desktop -f "$selectedDesktop"
|
bspc desktop -f "$selectedDesktop"
|
||||||
|
|
|
@ -1,11 +1,13 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
conectados=$(xrandr | awk '( $2 == "connected" ) { count++ } END { print count }')
|
# conectados=$(xrandr | awk '( $2 == "connected" ) { count++ } END { print count }')
|
||||||
pri=$(xrandr | awk '( $2 == "connected" ) {print $1}' | sed -sn 1p)
|
pri=$(xrandr | awk '( $2 == "connected" ) {print $1}' | sed -sn 1p)
|
||||||
sec=$(xrandr | awk '( $2 == "connected" ) {print $1}' | sed -sn 2p)
|
sec=$(xrandr | awk '( $2 == "connected" ) {print $1}' | sed -sn 2p)
|
||||||
|
|
||||||
if [ "$conectados" = 1 ]; then
|
xrandr --output "$pri" --primary --auto --scale 1.0x1.0 --output "$sec" --right-of "$pri" --auto --scale 1.0x1.0
|
||||||
xrandr --output "$pri" --primary --auto --scale 1.0x1.0 "$(xrandr | awk '( $2 "disconnected" ) {print "--output", $1, "--off"}' | paste -sd ' ')"
|
|
||||||
elif [ "$conectados" = 2 ]; then
|
# if [ "$conectados" = 1 ]; then
|
||||||
xrandr --output "$pri" --primary --auto --scale 1.0x1.0 --output "$sec" --right-of "$pri" --auto --scale 1.0x1.0
|
# xrandr --output "$pri" --primary --auto --scale 1.0x1.0 "$(xrandr | awk '( $2 "disconnected" ) {print "--output", $1, "--off"}' | paste -sd ' ')"
|
||||||
fi
|
# elif [ "$conectados" = 2 ]; then
|
||||||
|
# xrandr --output "$pri" --primary --auto --scale 1.0x1.0 --output "$sec" --right-of "$pri" --auto --scale 1.0x1.0
|
||||||
|
# fi
|
||||||
|
|
|
@ -9,15 +9,15 @@ notify() {
|
||||||
}
|
}
|
||||||
|
|
||||||
case "$(printf "Seleccion\\nVentana\\nPantalla\\nCopiar seleccion\\nCopiar ventana\\nCopiar pantalla" | rofi -dmenu -p " ")" in
|
case "$(printf "Seleccion\\nVentana\\nPantalla\\nCopiar seleccion\\nCopiar ventana\\nCopiar pantalla" | rofi -dmenu -p " ")" in
|
||||||
"Seleccion") maim -us "$file" ;;
|
"Seleccion") maim -us "$file" && notify ;;
|
||||||
"Ventana") maim -ui "$(printf "%d\n" $vent)" "$file" ;;
|
"Ventana") maim -ui "$(printf "%d\n" $vent)" "$file" && notify ;;
|
||||||
"Pantalla")
|
"Pantalla")
|
||||||
conectados=$(xrandr | awk '( $2 == "connected" ) { count++ } END { print count }')
|
conectados=$(xrandr | awk '( $2 == "connected" ) { count++ } END { print count }')
|
||||||
if [ "$conectados" = 1 ]; then
|
if [ "$conectados" = 1 ]; then
|
||||||
maim -u "$file"
|
maim -u "$file" && notify
|
||||||
elif [ "$conectados" = 2 ]; then
|
elif [ "$conectados" = 2 ]; then
|
||||||
moni="$(xrandr | awk '( $2 == "connected" ) { print $1 }' | rofi -dmenu -p "Pantalla")"
|
moni="$(xrandr | awk '( $2 == "connected" ) { print $1 }' | rofi -dmenu -p "Pantalla")"
|
||||||
maim -u "$moni" "$file"
|
maim -u "$moni" "$file" && notify
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
"Copiar seleccion") maim -us | xclip -selection clipboard -t image/png && notify ;;
|
"Copiar seleccion") maim -us | xclip -selection clipboard -t image/png && notify ;;
|
||||||
|
|
|
@ -1,8 +1,16 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
HEART=' '
|
# if ! xset q &>/dev/null; then
|
||||||
WIFI='直'
|
if [ -z $DISPLAY ]; then
|
||||||
THERM=''
|
HEART='B'
|
||||||
|
WIFI='W '
|
||||||
|
THERM='T'
|
||||||
|
else
|
||||||
|
HEART=' '
|
||||||
|
WIFI='直'
|
||||||
|
THERM=''
|
||||||
|
fi
|
||||||
|
MAIL='@'
|
||||||
|
|
||||||
if [ -d /sys/class/power_supply/BAT0 ]; then
|
if [ -d /sys/class/power_supply/BAT0 ]; then
|
||||||
battery_info="$(head -n 1 /sys/class/power_supply/BAT0/capacity)%"
|
battery_info="$(head -n 1 /sys/class/power_supply/BAT0/capacity)%"
|
||||||
|
@ -10,14 +18,20 @@ if [ -d /sys/class/power_supply/BAT0 ]; then
|
||||||
printf '#[fg=colour123] %s' "$HEART$current_charge"
|
printf '#[fg=colour123] %s' "$HEART$current_charge"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ping -q -w 1 -c 1 "$(ip r | awk '/default/ {print $3}')" >/dev/null; then
|
unread="$(find "$XDG_DATA_HOME"/mail/*/[Ii][Nn][Bb][Oo][Xx]/new/* -type f | wc -l 2>/dev/null)"
|
||||||
net="$(awk 'NR == 3 { print substr($3, 1, length($3) - 1) }' /proc/net/wireless)"
|
if [ "$unread" -gt 0 ]; then
|
||||||
printf '#[fg=colour177] %s' "$WIFI$net"
|
printf ' %s' "$MAIL$unread"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$(cat /sys/class/net/w*/operstate)" = up ]; then
|
||||||
|
net="$(awk '/^\s*w/ { print int($3 * 100 / 70) }' /proc/net/wireless)"
|
||||||
|
printf '#[fg=colour184] %s' "$WIFI$net"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# if ping -q -w 1 -c 1 "$(ip r | awk '/default/ {print $3}')" >/dev/null; then
|
||||||
|
# net="$(awk 'NR == 3 { print substr($3, 1, length($3) - 1) }' /proc/net/wireless)"
|
||||||
|
# printf '#[fg=colour184] %s' "$WIFI$net"
|
||||||
|
# fi
|
||||||
|
|
||||||
temp="$(sensors | awk '(/Core 0/){printf $3}' | sed 's/\.0//; s/+//')"
|
temp="$(sensors | awk '(/Core 0/){printf $3}' | sed 's/\.0//; s/+//')"
|
||||||
printf '#[fg=default] %s' "$THERM $temp"
|
printf '#[fg=default] %s' "$THERM $temp"
|
||||||
|
|
||||||
# ip -o -4 a show dev tun0 | awk '{print $4}'
|
|
||||||
# ip -4 -br a | awk '/UP/ {print $3}' | cut -f1 -d'/'
|
|
||||||
# chequear tmux show-env|grep ^SSH_CONNECTION=|cut -d= -f2|cut -d" " -f1 o tmux show-env|sed -n "/^SSH_CONNECTION=/{s/[^=]*=//;s/ .*//;p;} y usar eso como condicion?
|
|
||||||
|
|
19
.zshenv
19
.zshenv
|
@ -5,12 +5,12 @@ else
|
||||||
export EDITOR="nvim"
|
export EDITOR="nvim"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export EXINIT="set ai ic nu sm smd"
|
export EXINIT="set ai ic nu sm smd sw=4 ts=4 ruler searchincr para=BlBdPpIt sect=ShSs | map gg 1G"
|
||||||
export VISUAL="$EDITOR"
|
export VISUAL="$EDITOR"
|
||||||
export GIT_EDITOR="$EDITOR"
|
export GIT_EDITOR="$EDITOR"
|
||||||
export TERMINAL="alacritty"
|
export TERMINAL="alacritty"
|
||||||
export BROWSER="${${DISPLAY:-elinks}:+firefox}"
|
|
||||||
export COLORTERM="truecolor"
|
export COLORTERM="truecolor"
|
||||||
|
export BROWSER="${${DISPLAY:-links}:+firefox}"
|
||||||
export OPENER="xdg-open"
|
export OPENER="xdg-open"
|
||||||
export PAGER="less"
|
export PAGER="less"
|
||||||
export FILE="lf"
|
export FILE="lf"
|
||||||
|
@ -57,11 +57,11 @@ export FZF_DEFAULT_OPTS="--cycle \
|
||||||
--color=bg:-1,hl:#5fff87,bg+:-1,hl+:#ffaf5f,border:#080808 \
|
--color=bg:-1,hl:#5fff87,bg+:-1,hl+:#ffaf5f,border:#080808 \
|
||||||
--color=info:#af87ff,prompt:#5fff87,pointer:#ff87d7,marker:#ff87d7,spinner:#ff87d7 \
|
--color=info:#af87ff,prompt:#5fff87,pointer:#ff87d7,marker:#ff87d7,spinner:#ff87d7 \
|
||||||
--reverse \
|
--reverse \
|
||||||
--inline-info \
|
--info=inline \
|
||||||
--no-bold \
|
--no-bold \
|
||||||
--ansi \
|
--ansi \
|
||||||
--pointer='🡢' \
|
--pointer='→' \
|
||||||
--marker='⦁ ' \
|
--marker='∙' \
|
||||||
--preview-window :wrap:sharp"
|
--preview-window :wrap:sharp"
|
||||||
|
|
||||||
export FZF_DEFAULT_COMMAND="fd -t f -c always -H"
|
export FZF_DEFAULT_COMMAND="fd -t f -c always -H"
|
||||||
|
@ -72,11 +72,12 @@ export FZF_VIM_LOG=$(git config --get alias.l | awk '{$1=""; print $0;}' | tr -d
|
||||||
# }}}
|
# }}}
|
||||||
# Less {{{
|
# Less {{{
|
||||||
export LESSCHARSET=UTF-8
|
export LESSCHARSET=UTF-8
|
||||||
export LESS=-MR
|
# export LESS=-MR
|
||||||
export LESS_TERMCAP_mb="$(printf '%b' '[1;34m')"
|
export LESS=FRXix4
|
||||||
export LESS_TERMCAP_md="$(printf '%b' '[1;32m')"
|
export LESS_TERMCAP_mb="$(printf '%b' '[0;34m')"
|
||||||
|
export LESS_TERMCAP_md="$(printf '%b' '[0;32m')"
|
||||||
export LESS_TERMCAP_me="$(printf '%b' '[0m')"
|
export LESS_TERMCAP_me="$(printf '%b' '[0m')"
|
||||||
export LESS_TERMCAP_so="$(printf '%b' '[1;33m')"
|
export LESS_TERMCAP_so="$(printf '%b' '[0;33m')"
|
||||||
export LESS_TERMCAP_se="$(printf '%b' '[0m')"
|
export LESS_TERMCAP_se="$(printf '%b' '[0m')"
|
||||||
export LESS_TERMCAP_us="$(printf '%b' '[14;32m')"
|
export LESS_TERMCAP_us="$(printf '%b' '[14;32m')"
|
||||||
export LESS_TERMCAP_ue="$(printf '%b' '[0m')"
|
export LESS_TERMCAP_ue="$(printf '%b' '[0m')"
|
||||||
|
|
|
@ -25,12 +25,16 @@ dunst
|
||||||
elinks
|
elinks
|
||||||
elogind
|
elogind
|
||||||
faac
|
faac
|
||||||
|
fbgrab
|
||||||
|
fbpdf
|
||||||
fd
|
fd
|
||||||
ffmpeg
|
ffmpeg
|
||||||
ffmpeg-devel
|
ffmpeg-devel
|
||||||
figlet
|
figlet
|
||||||
file-roller
|
file-roller
|
||||||
firefox
|
firefox
|
||||||
|
font-b612
|
||||||
|
font-hermit-otf
|
||||||
fontconfig-devel
|
fontconfig-devel
|
||||||
freepats
|
freepats
|
||||||
fzf
|
fzf
|
||||||
|
@ -67,6 +71,7 @@ libressl-devel
|
||||||
librsvg
|
librsvg
|
||||||
librsvg-utils
|
librsvg-utils
|
||||||
libva-intel-driver
|
libva-intel-driver
|
||||||
|
links
|
||||||
lm_sensors
|
lm_sensors
|
||||||
love
|
love
|
||||||
maim
|
maim
|
||||||
|
@ -77,6 +82,7 @@ mpc
|
||||||
mpd
|
mpd
|
||||||
mpv
|
mpv
|
||||||
msmtp
|
msmtp
|
||||||
|
musikcube
|
||||||
ncmpcpp
|
ncmpcpp
|
||||||
ncurses-devel
|
ncurses-devel
|
||||||
ncurses-term
|
ncurses-term
|
||||||
|
@ -84,7 +90,6 @@ neomutt
|
||||||
neovim
|
neovim
|
||||||
neovim-remote
|
neovim-remote
|
||||||
newsboat
|
newsboat
|
||||||
nfs-utils
|
|
||||||
nicotine+
|
nicotine+
|
||||||
ninja
|
ninja
|
||||||
nodejs
|
nodejs
|
||||||
|
@ -102,7 +107,6 @@ pinentry-tty
|
||||||
pkg-config
|
pkg-config
|
||||||
polkit
|
polkit
|
||||||
powertop
|
powertop
|
||||||
pulseaudio
|
|
||||||
pulsemixer
|
pulsemixer
|
||||||
python3
|
python3
|
||||||
python3-pip
|
python3-pip
|
||||||
|
@ -110,6 +114,7 @@ qjackctl
|
||||||
ripgrep
|
ripgrep
|
||||||
rkhunter
|
rkhunter
|
||||||
rofi
|
rofi
|
||||||
|
sct
|
||||||
setxkbmap
|
setxkbmap
|
||||||
shellcheck
|
shellcheck
|
||||||
shfmt
|
shfmt
|
||||||
|
@ -122,6 +127,7 @@ sxiv
|
||||||
texlive-bin
|
texlive-bin
|
||||||
thermald
|
thermald
|
||||||
tmux
|
tmux
|
||||||
|
tnftp
|
||||||
toilet
|
toilet
|
||||||
transmission
|
transmission
|
||||||
tremc
|
tremc
|
||||||
|
@ -146,6 +152,7 @@ xrdb
|
||||||
xset
|
xset
|
||||||
xsetroot
|
xsetroot
|
||||||
xss-lock
|
xss-lock
|
||||||
|
xterm
|
||||||
xtitle
|
xtitle
|
||||||
xtools
|
xtools
|
||||||
xz
|
xz
|
||||||
|
|
Reference in New Issue