Update

2018-08-24 21:44:45 +03:00
parent 6d7cd2f827
commit 3ffcc3eb1c
11 changed files with 69 additions and 75 deletions
--- a/.bashrc
+++ b/.bashrc
@@ -7,13 +7,23 @@ export LESSHISTFILE=-
 export PYTHONSTARTUP=~/.pythonrc
 export XAUTHORITY=~/.cache/.Xauthority

-alias ls='ls --color=auto'
-alias diff='diff --color=auto'
-alias grep='grep --color=auto'
+# Import colorscheme from "wal" asynchronously
+# &   # Run the process in the background.
+# ( ) # Hide shell job control messages.
+(cat ~/.cache/wal/sequences &)
+
+# Alternative (blocks terminal for 0-3ms)
+cat ~/.cache/wal/sequences
+
+alias ls="ls --color=auto"
+alias diff="diff --color=auto"
+alias grep="grep --color=auto"
 alias graphs="ssh net@192.168.1.137"

-alias installed_packages='comm -23 <(pacman -Qeq | sort) <(pacman -Qgq base base-devel | sort)'
-alias unused_packages='pacman -Qtdq'
+alias installed_packages="comm -23 <(pacman -Qeq | sort) <(pacman -Qgq base base-devel | sort)"
+alias unused_packages="pacman -Qtdq"

-PS1='\u@\h:\w \$ '
+alias piavpn="sh /opt/pia/ruby/ruby.sh /opt/pia/pia_manager/run.rb </dev/null &>/dev/null&"
+
+PS1="\u@\h:\w \$ "

--- a/.config/htop/htoprc
+++ b/.config/htop/htoprc
@@ -1,6 +1,6 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
-fields=0 46 39 1
+fields=0 46 39 109 110 1
 sort_key=46
 sort_direction=1
 hide_threads=1
@@ -20,8 +20,7 @@ update_process_names=0
 account_guest_in_cpu_meter=0
 color_scheme=0
 delay=15
-left_meters=AllCPUs
-left_meter_modes=1
-right_meters=Uptime Tasks Memory Swap
-right_meter_modes=2 2 2 2
-
+left_meters=Hostname CPU Memory
+left_meter_modes=2 1 1
+right_meters=Uptime Tasks Swap
+right_meter_modes=2 2 2
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -6,8 +6,22 @@ exec_always "xrandr --output HDMI1 --mode 2560x1440 --rate 59.95 --output HDMI2

 exec_always ~/.scripts/daemons.sh

-exec_always xrdb ~/.xresources
-exec_always feh --bg-fill --no-fehbg ~/.wallpapers/current
+# NOTE: The '#f0f0f0' in the lines below is the color i3 will use if
+# it fails to get colors from Xresources.
+set_from_resource $fg color7 #f0f0f0
+set_from_resource $bg color2 #f0f0f0
+
+#class                  border  backgr. text indicator child_border
+client.focused          $bg     $bg     $fg  $bg       $bg
+client.focused_inactive $bg     $bg     $fg  $bg       $bg
+client.unfocused        $bg     $bg     $fg  $bg       $bg
+client.urgent           $bg     $bg     $fg  $bg       $bg
+client.placeholder      $bg     $bg     $fg  $bg       $bg
+
+client.background       $bg
+
+exec_always xrdb ~/.Xresources
+exec_always ~/.scripts/wal.sh

 gaps inner 10
 default_border pixel 1
@@ -15,15 +29,20 @@ default_border pixel 1
 bindsym $mod+Ctrl+r restart
 bindsym $mod+Ctrl+q kill

-bindsym $mod+s      exec dmenu_run
+bindsym $mod+s      exec ~/.scripts/dmen_run.sh
 bindsym $mod+Return exec urxvt

 bindsym $mod+F1 exec ~/.scripts/audio.sh toggle_mute
 bindsym $mod+F2 exec ~/.scripts/audio.sh lower
 bindsym $mod+F3 exec ~/.scripts/audio.sh raise
-bindsym $mod+F5 exec ~/.scripts/music.sh toggle
-bindsym $mod+F7 exec ~/.scripts/music.sh prev
-bindsym $mod+F8 exec ~/.scripts/music.sh next
+
+bindsym $mod+F4 exec ~/.scripts/wal.sh
+
+bindsym $mod+F5       exec ~/.scripts/music.sh toggle
+bindsym $mod+Shift+F2 exec ~/.scripts/music.sh lower
+bindsym $mod+Shift+F3 exec ~/.scripts/music.sh raise
+bindsym $mod+F7       exec ~/.scripts/music.sh prev
+bindsym $mod+F8       exec ~/.scripts/music.sh next

 bindsym $mod+F9  exec ~/.scripts/mount.sh
 bindsym $mod+F10 exec ~/.scripts/umount.sh
@@ -63,9 +82,6 @@ bindsym $mod+Ctrl+4 move container to workspace 4
 bindsym $mod+Ctrl+5 move container to workspace 5
 bindsym $mod+Ctrl+6 move container to workspace 6

-set_from_resource $background background
-set_from_resource $foreground foreground
-
 set_from_resource $darkblack   color0
 set_from_resource $black       color8
 set_from_resource $darkred     color1
@@ -83,26 +99,16 @@ set_from_resource $cyan        color14
 set_from_resource $darkwhite   color7
 set_from_resource $white       color15

-set $transparent
-
-# class                 border    background  text        indicator child_border
-client.focused          $darkblue $background $foreground $darkblue $darkblue
-client.focused_inactive $darkblue $background $foreground $darkblue $darkblue
-client.unfocused        $black    $background $foreground $black    $black
-client.urgent           $darkblue $background $foreground $darkblue $darkblue
-client.background       $black
-
 bar {
 	font pango:DejaVu Sans Mono 9
 	colors {
-		background $background
-		statusline $foreground
+		statusline $fg
 		separator  $darkblue

-		focused_workspace  $background $darkblack   $foreground
-		active_workspace   $background $darkblack   $foreground
-		inactive_workspace $background $background  $black
-		urgent_workspace   $darkblue   $background  $foreground
+		focused_workspace  $darkblack $darkblack $fg
+		active_workspace   $darkblack $darkblack $fg
+		inactive_workspace $darkblack $darkblack $black
+		urgent_workspace   $darkblue  $bg        $fg
 	}

 	position top
--- a/.config/i3blocks/config
+++ b/.config/i3blocks/config
@@ -1,5 +1,5 @@
 [mpd]
-command=echo "$(mpc current)"
+command=echo "$(mpc current)" $(mpc volume | awk '{match($2,"[0-9]*",a)}END{print a[0]"%"}')
 interval=5
 signal=2

--- a/.config/mpd/pid
+++ b/.config/mpd/pid
@@ -1 +1 @@
-695
+732
--- a/.config/neofetch/config.conf
+++ b/.config/neofetch/config.conf
@@ -204,7 +204,7 @@ cpu_cores="logical"
 # C:   'Intel i7-6500U (4) @ 3.1GHz [27.2°C]'
 # F:   'Intel i7-6500U (4) @ 3.1GHz [82.0°F]'
 # off: 'Intel i7-6500U (4) @ 3.1GHz'
-cpu_temp="C"
+cpu_temp="off"


 # GPU
--- a/.scripts/mount.sh
+++ b/.scripts/mount.sh
@@ -3,21 +3,20 @@
 # If they're in /etc/fstab, they'll be mounted automatically.
 # Otherwise, you'll be prompted to give a mountpoint from already existsing directories.
 # If you input a novel directory, it will prompt you to create that directory.
-pgrep -x dmenu && exit
 COLS="name,type,size,mountpoint"

 drives="$(lsblk -rpo "$COLS" | awk '$2=="part"&&$4==""{printf "%s (%s)\n",$1,$3}')"
 [ -z "$drives" ] && exit 1
-chosen="$(echo "$drives" | dmenu -i -p "Mount which drive?" | awk '{print $1}')"
+chosen="$(echo "$drives" | ~/.scripts/dmen.sh -i -p "Mount which drive?" | awk '{print $1}')"
 [ -z "$chosen" ] && exit 1
 sudo -A mount "$chosen" && exit 0
 # You may want to change the line below for more suggestions for mounting.
 # I.e. you can increase the depth of the search, or add directories.
 # This will increase the load time briefly though.
-mp="$(find /mnt /media /mount /home -type d -maxdepth 5 2>/dev/null | dmenu -i -p "Type in mount point.")"
+mp="$(find /mnt /media /mount /home -type d -maxdepth 5 2>/dev/null | ~/.scripts/dmen.sh -i -p "Type in mount point.")"
 [ "$mp" = "" ] && exit 1
 if [ ! -d "$mp" ]; then
-	mkdiryn=$(printf "No\\nYes" | dmenu -i -p "$mp does not exist. Create it?")
+	mkdiryn=$(printf "No\\nYes" | ~/.scripts/dmen.sh -i -p "$mp does not exist. Create it?")
 	[ "$mkdiryn" = "Yes" ] && sudo -A mkdir -p "$mp"
 fi
 sudo -A mount "$chosen" "$mp" && pgrep -x dunst && notify-send "$chosen mounted to $mp."
--- a/.scripts/music.sh
+++ b/.scripts/music.sh
@@ -12,5 +12,15 @@ case $1 in
 	mpc next &
 	pkill -RTMIN+2 i3blocks
 ;;
+"lower")
+	mpc volume -5
+	notify-send -t 250 "VOL: $(mpc volume | awk '{match($2,"[0-9]*",a)}END{print a[0]}')"
+	pkill -RTMIN+2 i3blocks
+;;
+"raise")
+	mpc volume +5
+	notify-send -t 250 "VOL: $(mpc volume | awk '{match($2,"[0-9]*",a)}END{print a[0]}')"
+	pkill -RTMIN+2 i3blocks
+;;
 esac

--- a/.scripts/umount.sh
+++ b/.scripts/umount.sh
@@ -5,7 +5,7 @@

 drives=$(lsblk -nrpo "name,type,size,mountpoint" | awk '$2=="part"&&$4!~/\/boot|\/home$|SWAP/&&length($4)>1{printf "%s (%s) on %s\n",$1,$3,$4}')
 [ -z "$drives" ] && exit
-chosen=$(echo "$drives" | dmenu -i -p "Unmount which drive?" | awk '{print $1}')
+chosen=$(echo "$drives" | ~/.scripts/dmen.sh -i -p "Unmount which drive?" | awk '{print $1}')
 [ -z "$chosen" ] && exit
 sudo -A umount "$chosen" && pgrep -x dunst && notify-send "$chosen unmounted."

--- a/.xinitrc
+++ b/.xinitrc
@@ -1,2 +1,2 @@
-exec i3
+exec i3 

--- a/.xresources
+++ b/.xresources
@@ -1,30 +0,0 @@
-! Dracula Xresources palette
-*.foreground: #F8F8F2
-*.background: #282A36
-*.color0:     #000000
-*.color8:     #4D4D4D
-*.color1:     #FF5555
-*.color9:     #FF6E67
-*.color2:     #50FA7B
-*.color10:    #5AF78E
-*.color3:     #F1FA8C
-*.color11:    #F4F99D
-*.color4:     #BD93F9
-*.color12:    #CAA9FA
-*.color5:     #FF79C6
-*.color13:    #FF92D0
-*.color6:     #8BE9FD
-*.color14:    #9AEDFE
-*.color7:     #BFBFBF
-*.color15:    #E6E6E6
-
-urxvt.scrollBar:   false
-urxvt.letterSpace: -1
-urxvt.depth:       32
-urxvt.background:  rgba:2800/2A00/3600/F000
-
-urxvt.font:           xft:DejaVu Sans Mono:size=9
-urxvt.italicFont:     xft:DejaVu Sans Mono:size=9:italic
-urxvt.boldFont:       xft:DejaVu Sans Mono:size=9:bold
-urxvt.boldItalicFont: xft:DejaVu Sans Mono:size=9:bold:italic
-