From 146ffb643ee71cd255bdce30b920e4a586659c05 Mon Sep 17 00:00:00 2001
From: Kevin Mok <kevin.mok@live.ca>
Date: Tue, 4 Dec 2018 10:48:02 -0500
Subject: [PATCH] Update

---
 README.md                                           |  2 +-
 aliases/zsh_aliases                                 |  7 ++++++-
 configs/i3/config                                   | 13 +++++++------
 configs/i3blocks-scripts/cpu_usage                  |  2 +-
 dotfiles/vimrc                                      |  1 +
 scripts/install-arch-pkgs.sh                        |  4 ++++
 scripts/install-pacman-pkgs.sh                      |  3 ---
 .../{manual-pacman-pkgs.txt => aur-pkgs.txt}        |  2 +-
 .../{auto-pacman-pkgs.txt => pacman-pkgs.txt}       |  1 +
 9 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100755 scripts/install-arch-pkgs.sh
 delete mode 100755 scripts/install-pacman-pkgs.sh
 rename txt/pacman-pkgs/{manual-pacman-pkgs.txt => aur-pkgs.txt} (66%)
 rename txt/pacman-pkgs/{auto-pacman-pkgs.txt => pacman-pkgs.txt} (98%)

diff --git a/README.md b/README.md
index 692c577..405c94e 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ they should be in the system.
 <!---  }}} Setup --> 
 
 <!-- History {{{ -->
-## History
+## Old Screenshots
 ### 3/7
 * [laptop](https://i.imgur.com/UpdX90A.png)
 
diff --git a/aliases/zsh_aliases b/aliases/zsh_aliases
index 504fa77..05ae3c6 100644
--- a/aliases/zsh_aliases
+++ b/aliases/zsh_aliases
@@ -24,6 +24,7 @@ bindkey '\e[B' history-beginning-search-forward
 alias cs='printf "\033c"'
 alias hst="history"
 alias nf="cs && neofetch | lolcat"
+# nf
 alias rur="xrdb ~/.Xresources"
 # list file sizes in megabytes with depth 1
 alias dum="sudo du -d 1 -B M"
@@ -114,6 +115,7 @@ alias vlh="alsamixer -c 2"
 # alias aptu="sudo apt upgrade"
 alias pc="sudo pacman -S"
 alias pcr="sudo pacman -Rs"
+alias tri="trizen -S --noconfirm"
 
 #  }}} system # 
 
@@ -136,9 +138,10 @@ function vsnp() { ni ~/.vim/plugged/vim-snippets/UltiSnips/"$1".snippets ; }
 #  applications {{{ # 
 silent="> /dev/null 2>&1& "
 
-alias h="htop"
+alias h="htop -s PERCENT_CPU"
 alias r="ranger"
 alias mr="man ranger"
+alias clc="cloc ."
 # zathura
 function za() { nohup zathura $1 > /dev/null 2>&1& ; }
 function chr() { google-chrome $1 ; }
@@ -165,6 +168,8 @@ alias rmsw="rm .sw*"
 function rs(){ redshift -P -O $(echo "scale=2;$1*1000" | bc) ; }
 alias rx="redshift -x"
 
+alias kd="pkill discord"
+
 #  python related {{{ # 
 function grpy() { grep $1 *.py ; } 
 alias p3="python3"
diff --git a/configs/i3/config b/configs/i3/config
index f1176d8..11a85bf 100644
--- a/configs/i3/config
+++ b/configs/i3/config
@@ -206,9 +206,10 @@ set $ws7 "7 "
 workspace $ws7 output $samsung
 bindsym $mod+F7 workspace $ws7; exec $def_term
 
-set $ws8 "8 "
+set $ws8 "8 "
 # assign [class="jetbrains-"] $ws8
-bindsym $mod+F8 workspace $ws8; exec $def_term
+workspace $ws8 output $samsung
+bindsym $mod+F8 workspace $ws8; exec urxvt -e htop -s PERCENT_CPU 
 
 set $ws9 "9 "
 workspace $ws9 output $samsung
@@ -220,10 +221,10 @@ workspace $ws10 output $samsung
 bindsym $mod+F10 workspace $ws10; exec $def_term
 bindsym Mod4+s workspace $ws10; exec spotify
 
-set $ws11 "11 "
-assign [class="Summoners War Exporter"] $ws11
-workspace $ws11 output $benq
-bindsym $mod+F11 workspace $ws11; exec $def_term
+set $ws11 "11 "
+# assign [class="Summoners War Exporter"] $ws11
+workspace $ws11 output $samsung
+bindsym $mod+F11 workspace $ws8; exec $def_term
 
 set $ws12 "12 "
 bindsym $mod+F12 workspace $ws12; exec $def_term
diff --git a/configs/i3blocks-scripts/cpu_usage b/configs/i3blocks-scripts/cpu_usage
index a70a323..6809953 100755
--- a/configs/i3blocks-scripts/cpu_usage
+++ b/configs/i3blocks-scripts/cpu_usage
@@ -29,7 +29,7 @@ GetOptions("help|h" => \&help,
 
 # Get CPU usage
 $ENV{LC_ALL}="en_US"; # if mpstat is not run under en_US locale, things may break, so make sure it is
-open (MPSTAT, 'mpstat |') or die;
+open (MPSTAT, 'mpstat 1 1 -P ALL |') or die;
 while (<MPSTAT>) {
     if (/^.*\s+(\d+\.\d+)\s+$/) {
         $cpu_usage = 100 - $1; # 100% - %idle
diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index 7ef9f07..9a5aff1 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -134,6 +134,7 @@ Plug 'jiangmiao/auto-pairs'
 	let g:AutoPairsMapSpace = 0
 
 Plug 'henrik/vim-indexed-search'
+Plug 'PotatoesMaster/i3-vim-syntax'
 
 call plug#end()
 
diff --git a/scripts/install-arch-pkgs.sh b/scripts/install-arch-pkgs.sh
new file mode 100755
index 0000000..c46b356
--- /dev/null
+++ b/scripts/install-arch-pkgs.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sudo pacman -Sy --needed - < ../txt/pacman-pkgs/pacman-pkgs.txt
+sudo trizen -Sy --needed - < ../txt/pacman-pkgs/aur-pkgs.txt
diff --git a/scripts/install-pacman-pkgs.sh b/scripts/install-pacman-pkgs.sh
deleted file mode 100755
index 478a3a5..0000000
--- a/scripts/install-pacman-pkgs.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-sudo pacman -Sy --needed - < ../txt/pacman-pkgs/auto-pacman-pkgs.txt
diff --git a/txt/pacman-pkgs/manual-pacman-pkgs.txt b/txt/pacman-pkgs/aur-pkgs.txt
similarity index 66%
rename from txt/pacman-pkgs/manual-pacman-pkgs.txt
rename to txt/pacman-pkgs/aur-pkgs.txt
index 6307f80..31ca725 100644
--- a/txt/pacman-pkgs/manual-pacman-pkgs.txt
+++ b/txt/pacman-pkgs/aur-pkgs.txt
@@ -1,4 +1,4 @@
 gscreenshot
 rxvt-unicode-pixbuf
-rxvt-unicode-pixbuf
 Hack NF
+trizen
diff --git a/txt/pacman-pkgs/auto-pacman-pkgs.txt b/txt/pacman-pkgs/pacman-pkgs.txt
similarity index 98%
rename from txt/pacman-pkgs/auto-pacman-pkgs.txt
rename to txt/pacman-pkgs/pacman-pkgs.txt
index 2a0fba2..9a606d2 100644
--- a/txt/pacman-pkgs/auto-pacman-pkgs.txt
+++ b/txt/pacman-pkgs/pacman-pkgs.txt
@@ -1,6 +1,7 @@
 alsa-utils
 bc
 chromium
+cloc
 dhcpcd
 dialog
 dmenu