From fc64617644272afca347489ce903091011b6cc5f Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Mon, 19 Mar 2018 13:53:25 -0400 Subject: [PATCH] "True" bg Okular fxn, Git/laptop changes laptop: - connect lab monitor alias - mute key - wi-fi symbol/name (i3blocks) Git: - checkout file - continue cherry-pick - checkout new branch --- aliases/zsh_aliases | 9 +++++++-- configs/X1-Carbon/i3/config | 20 ++++++++++++++------ configs/X1-Carbon/i3blocks/i3blocks.conf | 2 +- configs/X1-Carbon/ranger/rc.conf | 2 ++ configs/i3blocks-scripts/battery | 2 ++ configs/i3blocks-scripts/wifi | 4 +++- dotfiles/Xresources | 2 +- 7 files changed, 30 insertions(+), 11 deletions(-) diff --git a/aliases/zsh_aliases b/aliases/zsh_aliases index 44c99da..cffa1b9 100644 --- a/aliases/zsh_aliases +++ b/aliases/zsh_aliases @@ -100,7 +100,7 @@ alias tm="ni $usnp_dir/texmath.snippets" # applications {{{ # alias rg="ranger" -function ok() { okular $1 & ; } +function ok() { nohup okular $1 > /dev/null 2>&1& ; } function chr() { google-chrome $1 ; } function ni() { nvim $1 ; } function sni() { sudo nvim $1 ; } @@ -211,6 +211,9 @@ if [[ "$(hostname)" = "X1-Carbon" ]]; then alias gbl="xbacklight -get" function bl() { xbacklight -set $(echo "scale=2;$1*10" | bc) ; } + alias labm="xrandr --auto && xrandr --output HDMI2 --right-of eDP1 --dpi 100" + alias vlm="alsamixer -c 1" + alias thn="thunar ." alias plz="f ~/platterz2018/ocr-reader/app/src/main/java/com/google/android/gms/samples/vision/ocrreader" @@ -222,7 +225,7 @@ fi # git {{{ # # aliases {{{ -alias gstore="git config credential.helper store" +alias gstr="git config credential.helper store" # add {{{ # alias ga="git add -A . && gs" @@ -283,6 +286,8 @@ alias crm="mrk README.md" # functions {{{ function gcho() { git checkout $1 ; } function gchon() { git checkout -b $1 ; } +function gchof() { git checkout $1 $2 ; } + function gcln() { git clone $1 ; } function gchp() { git cherry-pick $1 ; } alias gchpc="git cherry-pick --continue" diff --git a/configs/X1-Carbon/i3/config b/configs/X1-Carbon/i3/config index b747d7a..fbe0ce3 100644 --- a/configs/X1-Carbon/i3/config +++ b/configs/X1-Carbon/i3/config @@ -1,8 +1,8 @@ # applications {{{ # # startup {{{ # -exec redshift -O 4000 -exec /home/kevin/.local/bin/wal -i "/home/kevin/Pictures/Backgrounds/" +# exec redshift -O 4000 +exec /home/kevin/.local/bin/wal -i "/home/kevin/Pictures/Backgrounds/vibrant" # exec_always /home/kevin/.local/bin/wal -i "/home/kevin/Pictures/Backgrounds/japan-street.jpg" exec imwheel exec $def_term @@ -71,7 +71,6 @@ bindsym control+Shift+x kill # }}} changing/focusing/moving windows # # container display {{{ # -bindsym $mod+g exec /home/kevin/.local/bin/wal -i "/home/kevin/Pictures/Backgrounds/" # enter fullscreen mode for the focused container bindsym $mod+f fullscreen toggle @@ -95,6 +94,12 @@ bindsym $mod+a focus parent # }}} container display # # workspace {{{ # + +# wallpaper +bindsym $mod+q exec /home/kevin/.local/bin/wal -i "/home/kevin/Pictures/Backgrounds/vibrant" +bindsym $mod+w exec /home/kevin/.local/bin/wal -i "/home/kevin/Pictures/Backgrounds/dim" +bindsym $mod+r exec /home/kevin/.local/bin/wal -i "/home/kevin/Pictures/Backgrounds/" + # ws names {{{ # set $ws1 "1 " bindsym F1 workspace $ws1; exec $def_term @@ -112,6 +117,8 @@ bindsym Mod4+d workspace $ws6; exec discord bindsym Mod4+l workspace $ws6; exec slack set $ws7 "7 ↥" +bindsym $mod+F7 workspace $ws7; exec $def_term + set $ws8 "8 𝅘𝅥𝅮" bindsym Mod4+s workspace $ws8; exec spotify @@ -186,8 +193,8 @@ bindsym $mod+control+j resize shrink height 10 px or 10 ppt # gaps {{{ # for_window [class="^.*"] border pixel 0 -gaps inner 30 -gaps outer 2 +gaps inner 25 +gaps outer -3 bindsym control+shift+plus gaps inner all plus 5;gaps outer all plus 5 bindsym control+shift+0 gaps inner all minus 5;gaps outer all minus 5 @@ -236,7 +243,8 @@ bindsym $mod+control+q exec nmcli radio wifi off # volume keys {{{ # bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -c 1 sset Master 5%+ bindsym XF86AudioLowerVolume exec --no-startup-id amixer -c 1 sset Master 5%- -bindsym XF86AudioMute exec --no-startup-id amixer -c 1 amixer -D pulse set Master 1+ toggle +bindsym XF86AudioMute exec --no-startup-id amixer -D pulse set Master 2+ toggle +# bindsym XF86AudioMute exec --no-startup-id amixer -c 1 amixer -D pulse set Master 1+ toggle # }}} volume keys # # media keys {{{ # diff --git a/configs/X1-Carbon/i3blocks/i3blocks.conf b/configs/X1-Carbon/i3blocks/i3blocks.conf index 85db6d8..471f5fa 100644 --- a/configs/X1-Carbon/i3blocks/i3blocks.conf +++ b/configs/X1-Carbon/i3blocks/i3blocks.conf @@ -59,7 +59,7 @@ interval=60 # wifi {{{ # [wifi] -label=🖧 +label= instance=wlp3s0 interval=5 # }}} wifi # diff --git a/configs/X1-Carbon/ranger/rc.conf b/configs/X1-Carbon/ranger/rc.conf index 99cba26..cecde56 100644 --- a/configs/X1-Carbon/ranger/rc.conf +++ b/configs/X1-Carbon/ranger/rc.conf @@ -672,6 +672,8 @@ map rr source ~/.config/ranger/rc.conf # backgrounds map bg cd ~/Pictures/Backgrounds map wb shell ~/.local/bin/wal -i %f +map md shell mv %f dim +map mb shell mv %f vibrant # bulk rename map cw eval fm.execute_console("bulkrename") if fm.thisdir.marked_items else fm.open_console("rename ") diff --git a/configs/i3blocks-scripts/battery b/configs/i3blocks-scripts/battery index d27fa53..3a53325 100755 --- a/configs/i3blocks-scripts/battery +++ b/configs/i3blocks-scripts/battery @@ -64,6 +64,8 @@ if ($status eq 'Discharging') { print "#FFF600\n"; } elsif ($percent < 85) { print "#A8FF00\n"; + } else { + print "#2c9332\n"; } if ($percent < 5) { diff --git a/configs/i3blocks-scripts/wifi b/configs/i3blocks-scripts/wifi index ffaccab..0f32f8a 100755 --- a/configs/i3blocks-scripts/wifi +++ b/configs/i3blocks-scripts/wifi @@ -28,10 +28,12 @@ INTERFACE="${BLOCK_INSTANCE:-wlan0}" #------------------------------------------------------------------------ QUALITY=$(grep $INTERFACE /proc/net/wireless | awk '{ print int($3 * 100 / 70) }') +W_inter=$(ip link | grep "[1-9]: wlp" | cut -d " " -f2 | tr -d ':') +W_name=$(nmcli d | grep "$W_inter" | awk '{print $4}') #------------------------------------------------------------------------ -echo $QUALITY% # full text +echo $QUALITY% "$W_name" # full text echo $QUALITY% # short text # color diff --git a/dotfiles/Xresources b/dotfiles/Xresources index 840916a..4711a3f 100644 --- a/dotfiles/Xresources +++ b/dotfiles/Xresources @@ -5,7 +5,7 @@ URxvt*inheritPixmap: true URxvt*transparent: true ! URxvt*shading: 0 to 99 darkens, 101 to 200 lightens ! URxvt*shading: 30 -URxvt*shading: 20 +URxvt*shading: 25 URxvt.scrollBar: false