From 9938f1e24e2d6d525e474223078ad1498ed4a0ad Mon Sep 17 00:00:00 2001 From: ds6 Date: Thu, 11 Jan 2018 01:44:56 -0600 Subject: [PATCH] urxvt perl extensions, Xresources changes urxvt perl extensions finalized, font size added edited install.sh for better filename compatibility URxvtRoot tail log turnover fixed (-f to -F) updated tint2 config to latest tint2 version volumeicon horizontal slider --- .gitmodules | 3 +++ base/.Xresources | 11 ++++++----- base/.xinitrc | 2 +- base/.zshenv | 2 -- install.sh | 24 ++++++++++++++++++++---- urxvt-ext/urxvt-font-size | 1 + xdg/tint2/tint2rc | 11 +++++++---- xdg/volumeicon/volumeicon | 2 +- 8 files changed, 39 insertions(+), 17 deletions(-) create mode 160000 urxvt-ext/urxvt-font-size diff --git a/.gitmodules b/.gitmodules index bc2ddca..22719d8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "base/.vim/pack/repeat.vim/start/vim-repeat"] path = base/.vim/pack/repeat.vim/start/vim-repeat url = https://github.com/tpope/vim-repeat +[submodule "urxvt-ext/urxvt-font-size"] + path = urxvt-ext/urxvt-font-size + url = https://github.com/majutsushi/urxvt-font-size diff --git a/base/.Xresources b/base/.Xresources index c72d6f3..7bccb52 100644 --- a/base/.Xresources +++ b/base/.Xresources @@ -65,8 +65,8 @@ Xft.rgba: none ! URxvt URxvt.termName: rxvt-256color -URxvt.perl-ext: matcher -URxvt.perl-ext-common: +URxvt.perl-ext: +URxvt.perl-ext-common: searchable-scrollback,confirm-paste,matcher,font-size URxvt.depth: 32 URxvt.background: rgba:0000/0a00/0d00/d000 @@ -81,10 +81,11 @@ URxvt.visualBell: true URxvt.url-launcher: /usr/local/bin/xdg-open URxvt.matcher.button: 1 +URxvt.matcher.pattern.0: \\w+:\\/\*[\\w\\-][\\w\\-\\.]*\\.\\w+(?::\\d)?(?:\\/[\\w\\-\\.\\/?&@#%_]*)? URxvt.matcher.rend.0: Uline Bold fg6 -URxvt.matcher.pattern.0: \\bwww\\.[\\w-]+\\.[\\w./?&@#-]*[\\w/-] -URxvt.matcher.pattern.1: \\B(/\\S+?):(\\d+)(?=:|$) -URxvt.matcher.launcher.1: vim +$2 $1 +! URxvt.matcher.pattern.1: \\s(/\\S+?):(\\d+)(?=:|$) +! URxvt.matcher.rend.1: Uline fg3 +URxvt.matcher.launcher.1: urxvtc -e vim +$2 $1 URxvt.keysym.M-o: matcher:last URxvt.keysym.M-u: matcher:list diff --git a/base/.xinitrc b/base/.xinitrc index 5bda964..3b41f3d 100755 --- a/base/.xinitrc +++ b/base/.xinitrc @@ -30,7 +30,7 @@ xset dpms 0 0 600 # root terminal urxvt -name URxvtBG -override-redirect -geometry x5+0-0 \ - -e tail -f /var/log/messages & + -e tail -F /var/log/messages & xdotool search --limit 1 --sync --classname URxvtBG windowsize -usehints 100% 6 # tray icons diff --git a/base/.zshenv b/base/.zshenv index 8297e11..e237b0e 100644 --- a/base/.zshenv +++ b/base/.zshenv @@ -10,5 +10,3 @@ export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46 export GREP_OPTIONS=--color=auto export PYTHONSTARTUP=~/.pythonrc - -export PUUSH_API_KEY=159C54A56C88394136BA1ACB6A9D8F80 diff --git a/install.sh b/install.sh index 4ced505..e7a959b 100755 --- a/install.sh +++ b/install.sh @@ -3,11 +3,27 @@ #fix permissions from git (should probably move this to git hook) chmod go= base/.zshenv base/.Xresources -for x in `find "$PWD/base" -mindepth 1 -maxdepth 1`; do - ln -vwis "$x" "$HOME/`basename $x`" +if [ 0 -eq 1 ]; then + alias mkdir="echo mkdir" + alias ln="echo ln" + alias rm="echo rm" + alias cap_mkdb="echo cap_mkdb" + alias unlink="echo unlink" +fi + +l() { + [ -L "$1" -o \! -e "$1" ] && ln -sFhvw "$x" "$1" +} + +find "$PWD/base" -depth 1 | while read -r x; do + l "$HOME/`basename "$x"`" +done +find "$PWD/xdg" -depth 1 | while read -r x; do + l "${XDG_CONFIG_HOME:-$HOME/.config}/`basename "$x"`" done -for x in `find "$PWD/xdg" -mindepth 1 -maxdepth 1`; do - ln -vwis "$x" "${XDG_CONFIG_HOME:-$HOME/.config}/`basename $x`" +mkdir -p "$HOME/.urxvt/ext" +find "$PWD/urxvt-ext" -type f -perm -ugo=x -mindepth 1 -maxdepth 2 | while read -r x; do + l "$HOME/.urxvt/ext/`basename $x`" done touch "$HOME/.hushlogin" diff --git a/urxvt-ext/urxvt-font-size b/urxvt-ext/urxvt-font-size new file mode 160000 index 0000000..0984499 --- /dev/null +++ b/urxvt-ext/urxvt-font-size @@ -0,0 +1 @@ +Subproject commit 0984499379e420de651dcfeedfbb7938867c44f8 diff --git a/xdg/tint2/tint2rc b/xdg/tint2/tint2rc index 3c60a85..3049139 100644 --- a/xdg/tint2/tint2rc +++ b/xdg/tint2/tint2rc @@ -1,4 +1,4 @@ -#---- Generated by tint2conf 30a7 ---- +#---- Generated by tint2conf 573e ---- # See https://gitlab.com/o9000/tint2/wikis/Configure for # full documentation of the configuration options. #------------------------------------- @@ -61,7 +61,6 @@ panel_dock = 1 panel_position = top center horizontal panel_layer = top panel_monitor = all -primary_monitor_first = 0 panel_shrink = 0 autohide = 0 autohide_show_timeout = 0 @@ -85,6 +84,7 @@ taskbar_active_background_id = 0 taskbar_name = 1 taskbar_hide_inactive_tasks = 0 taskbar_hide_different_monitor = 0 +taskbar_hide_different_desktop = 0 taskbar_always_show_all_desktop_tasks = 0 taskbar_name_padding = 4 0 taskbar_name_background_id = 1 @@ -146,13 +146,13 @@ launcher_tooltip = 1 #------------------------------------- # Clock time1_format = %H:%M:%S -time2_format = %a/%b %d/%m/%Y +time2_format = %a %d/%m/%Y time1_font = Dina 8 time1_timezone = time2_timezone = time2_font = Dina 6 clock_font_color = #93a1a1 100 -clock_padding = 4 0 +clock_padding = 6 0 clock_background_id = 0 clock_tooltip = clock_tooltip_timezone = @@ -167,9 +167,12 @@ clock_dwheel_command = battery_tooltip = 1 battery_low_status = 5 battery_low_cmd = notify-send -u critical "Battery low" +battery_full_cmd = bat1_font = Dina 8 bat2_font = Dina 6 battery_font_color = #93a1a1 100 +bat1_format = +bat2_format = battery_padding = 0 0 battery_background_id = 0 battery_hide = 101 diff --git a/xdg/volumeicon/volumeicon b/xdg/volumeicon/volumeicon index f3bf5b1..812f5b0 100644 --- a/xdg/volumeicon/volumeicon +++ b/xdg/volumeicon/volumeicon @@ -2,7 +2,7 @@ stepsize=5 lmb_slider=true mmb_mute=true -use_horizontal_slider=false +use_horizontal_slider=true show_sound_level=true use_transparent_background=false onclick=~/bin/xmixer -- 2.47.0