From 60c0e48e04eca8d195e6ba8f27ff50539c6a7fa4 Mon Sep 17 00:00:00 2001
From: Kevin Mok <kevin.mok@live.ca>
Date: Mon, 3 Dec 2018 17:33:11 -0500
Subject: [PATCH 1/2] Added pacman package installation script

Updated pacman packages lists.
---
 README.md                                     |  20 +--
 configs/set-configs.sh                        |  13 --
 dotfiles/set-dotfiles.sh                      |  27 ---
 scripts/dirs.sh                               |   7 -
 scripts/install-pacman-pkgs.sh                |   3 +
 root-setup.sh => setup-root.sh                |   0
 .../auto-pacman-pkgs.txt}                     |   8 -
 txt/pacman-pkgs/manual-pacman-pkgs.txt        |   4 +
 txt/pacman-pkgs/nzxt-pkgs.txt                 | 163 ++++++++++++++++++
 x/marble-mouse/set-config.sh                  |  13 --
 10 files changed, 178 insertions(+), 80 deletions(-)
 delete mode 100755 configs/set-configs.sh
 delete mode 100755 dotfiles/set-dotfiles.sh
 delete mode 100755 scripts/dirs.sh
 create mode 100755 scripts/install-pacman-pkgs.sh
 rename root-setup.sh => setup-root.sh (100%)
 rename txt/{pacman-pkgs.txt => pacman-pkgs/auto-pacman-pkgs.txt} (81%)
 create mode 100644 txt/pacman-pkgs/manual-pacman-pkgs.txt
 create mode 100644 txt/pacman-pkgs/nzxt-pkgs.txt
 delete mode 100755 x/marble-mouse/set-config.sh

diff --git a/README.md b/README.md
index 8964240..65ac641 100644
--- a/README.md
+++ b/README.md
@@ -11,23 +11,19 @@ are also for my Linux
 
 <!---  Basic Info {{{ --> 
 ## Basic Info
-* **OS**: [Arch Linux](https://www.archlinux.org/)
-* **Terminal**: [urxvt](https://www.wikiwand.com/en/Rxvt) 
-* **Shell**: [Zsh](http://zsh.sourceforge.net/)
-* **WM**: [i3-gaps](https://github.com/Airblader/i3)
-* **Editor**: [Neovim](https://github.com/neovim/neovim)
-* **File Explorer**: [ranger](https://ranger.github.io/)
-* [Packages I Use](https://github.com/Kevin-Mok/linux-config/blob/master/pacman-pkgs.txt)
-
+* **OS**: [Arch Linux](https://www.archlinux.org/) ([packages](https://github.com/Kevin-Mok/linux-config/blob/master/txt/pacman-pkgs/auto-pacman-pkgs.txt))
+* **Terminal**: [rxvt-unicode-pixbuf](https://www.wikiwand.com/en/Rxvt) 
+* **Shell**: [Zsh](http://zsh.sourceforge.net/) + [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh)
+* **Window Manager**: [i3wm](https://i3wm.org/) + [i3-gaps](https://github.com/Airblader/i3)
+* **Editor**: [Neovim](https://github.com/neovim/neovim) ([plugins](https://github.com/Kevin-Mok/linux-config/blob/master/dotfiles/vimrc#L51))
+* **File Manager**: [ranger](https://ranger.github.io/)
 <!---  }}} Basic Info --> 
 
 <!---  Setup {{{ --> 
 
 ## Setup
-I wrote a couple simple scripts
-([`set-configs.sh`](https://github.com/Kevin-Mok/linux-config/blob/master/configs/set-configs.sh) &
-[`set-dotfiles.sh`](https://github.com/Kevin-Mok/linux-config/blob/master/dotfiles/set-dotfiles.sh))
-to symbolically link the files/directories in the repository to the locations
+I wrote [a script](https://github.com/Kevin-Mok/linux-config/blob/master/setup.sh) to
+symbolically link the files/directories in the repository to the locations
 they should be in the system.
 
 <!---  }}} Setup --> 
diff --git a/configs/set-configs.sh b/configs/set-configs.sh
deleted file mode 100755
index f11eb73..0000000
--- a/configs/set-configs.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Get directory variables from script.
-. ../scripts/dirs.sh
-# List of config dirs in system config dir that I want to link to.
-config_dirs=(neofetch i3 i3blocks sam-i3blocks ranger)
-# config_dirs=(neofetch i3 i3blocks ranger)
-for cur_dir in $config_dirs; do
-	# Remove system file.
-	rm -rf "$sys_config_dir"/"$cur_dir"
-	# Link config file in repository to system config location.
-	ln -s "$config_dir"/"$cur_dir" "$sys_config_dir"/"$cur_dir"
-done
diff --git a/dotfiles/set-dotfiles.sh b/dotfiles/set-dotfiles.sh
deleted file mode 100755
index 6f558d2..0000000
--- a/dotfiles/set-dotfiles.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/zsh
-
-#  link files {{{ # 
-
-# Get directory variables from script.
-. ../scripts/dirs.sh
-# List of dotfiles I want to link to system.
-dotfiles=(bashrc gitconfig inputrc imwheelrc vimrc xinitrc Xmodmap Xresources zshrc)
-# cd $dot_dir
-for dotfile in $dotfiles; do
-	# Remove system dotfile.
-    rm ~/."$dotfile"
-	# Link dotfile in repository to system dotfile.
-    ln -s "$dot_dir"/"$dotfile" ~/."$dotfile"
-done
-
-#  }}} link files # 
-
-#  setup nvim config  {{{ # 
-
-orig_file="$sys_config_dir"/nvim/init.vim
-# Remove system dotfile.
-rm "$orig_file"
-# Link dotfile in repository to system dotfile.
-ln -s "$dot_dir"/nvim "$orig_file"
-
-#  }}} setup nvim config  # 
diff --git a/scripts/dirs.sh b/scripts/dirs.sh
deleted file mode 100755
index 59b0062..0000000
--- a/scripts/dirs.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-linux_config_dir=~/linux-config
-dot_dir=$linux_config_dir/dotfiles
-config_dir=$linux_config_dir/configs
-sys_config_dir=~/.config
-pc=$(hostname)
diff --git a/scripts/install-pacman-pkgs.sh b/scripts/install-pacman-pkgs.sh
new file mode 100755
index 0000000..478a3a5
--- /dev/null
+++ b/scripts/install-pacman-pkgs.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sudo pacman -Sy --needed - < ../txt/pacman-pkgs/auto-pacman-pkgs.txt
diff --git a/root-setup.sh b/setup-root.sh
similarity index 100%
rename from root-setup.sh
rename to setup-root.sh
diff --git a/txt/pacman-pkgs.txt b/txt/pacman-pkgs/auto-pacman-pkgs.txt
similarity index 81%
rename from txt/pacman-pkgs.txt
rename to txt/pacman-pkgs/auto-pacman-pkgs.txt
index 1ef4ca5..cc6b51e 100644
--- a/txt/pacman-pkgs.txt
+++ b/txt/pacman-pkgs/auto-pacman-pkgs.txt
@@ -1,11 +1,9 @@
 alsa-utils
 bc
 chromium
-cmake
 dhcpcd
 dialog
 dmenu
-eog
 fakeroot
 feh
 findutils
@@ -13,7 +11,6 @@ fzf
 git
 grep
 grub
-gscreenshot
 htop
 i3-gaps
 i3blocks
@@ -23,8 +20,6 @@ less
 linux
 linux-firmware
 linux-headers
-linux-lts
-linux-lts-headers
 lolcat
 make
 neofetch
@@ -38,11 +33,9 @@ pulseaudio
 python-pip
 python-pywal
 python-setuptools
-python2-pip
 python-dbus
 ranger
 redshift
-rxvt-unicode
 sed
 sudo
 tar
@@ -50,7 +43,6 @@ udiskie
 unzip
 vi
 wireless_tools
-wpa_actiond
 wpa_supplicant
 xclip
 zsh
diff --git a/txt/pacman-pkgs/manual-pacman-pkgs.txt b/txt/pacman-pkgs/manual-pacman-pkgs.txt
new file mode 100644
index 0000000..6307f80
--- /dev/null
+++ b/txt/pacman-pkgs/manual-pacman-pkgs.txt
@@ -0,0 +1,4 @@
+gscreenshot
+rxvt-unicode-pixbuf
+rxvt-unicode-pixbuf
+Hack NF
diff --git a/txt/pacman-pkgs/nzxt-pkgs.txt b/txt/pacman-pkgs/nzxt-pkgs.txt
new file mode 100644
index 0000000..a43c855
--- /dev/null
+++ b/txt/pacman-pkgs/nzxt-pkgs.txt
@@ -0,0 +1,163 @@
+alsa-utils
+autoconf
+automake
+bash
+bc
+bison
+broadcom-wl
+bzip2
+chromium
+chromium-widevine
+cmake
+colordiff
+coreutils
+cryptsetup
+device-mapper
+dhcpcd
+dialog
+diffutils
+dmenu
+e2fsprogs
+fakeroot
+feh
+file
+filesystem
+findutils
+flex
+fzf
+gawk
+gcc
+gcc-libs
+gdb
+gettext
+git
+glibc
+grep
+grub
+gscreenshot
+gzip
+htop
+i3-gaps
+i3blocks
+i3status
+imwheel
+inetutils
+iniparser
+iproute2
+iputils
+jfsutils
+less
+lib32-nvidia-utils
+licenses
+linux
+linux-firmware
+linux-headers
+logrotate
+lolcat
+lsof
+lvm2
+make
+man-db
+man-pages
+mdadm
+nano
+neofetch
+neovim
+netctl
+noto-fonts
+ntfs-3g
+nvidia
+pacman
+patch
+pciutils
+perl
+pkgconf
+procps-ng
+psmisc
+pulseaudio
+python-dbus
+python-pip
+python-pywal
+python-setuptools
+ranger
+redshift
+reiserfsprogs
+rxvt-unicode-pixbuf
+s-nail
+sed
+shadow
+spotify
+st
+sudo
+sysfsutils
+sysstat
+systemd-sysvcompat
+tar
+texinfo
+ttf-dejavu
+udiskie
+udisks2
+unzip
+usbutils
+util-linux
+vi
+w3m
+which
+wireless_tools
+wpa_supplicant
+xclip
+xf86-input-evdev
+xf86-input-keyboard
+xf86-input-mouse
+xf86-input-synaptics
+xf86-input-vmmouse
+xf86-input-void
+xf86-video-amdgpu
+xf86-video-ati
+xf86-video-dummy
+xf86-video-fbdev
+xf86-video-intel
+xf86-video-nouveau
+xf86-video-openchrome
+xf86-video-qxl
+xf86-video-vesa
+xf86-video-vmware
+xf86-video-voodoo
+xfsprogs
+xorg-bdftopcf
+xorg-iceauth
+xorg-luit
+xorg-mkfontdir
+xorg-mkfontscale
+xorg-server
+xorg-sessreg
+xorg-smproxy
+xorg-x11perf
+xorg-xbacklight
+xorg-xcmsdb
+xorg-xcursorgen
+xorg-xdpyinfo
+xorg-xdriinfo
+xorg-xev
+xorg-xgamma
+xorg-xhost
+xorg-xinit
+xorg-xinput
+xorg-xkbevd
+xorg-xkbutils
+xorg-xkill
+xorg-xlsatoms
+xorg-xlsclients
+xorg-xpr
+xorg-xprop
+xorg-xrandr
+xorg-xrefresh
+xorg-xset
+xorg-xsetroot
+xorg-xvinfo
+xorg-xwd
+xorg-xwininfo
+xorg-xwud
+zathura
+zathura-pdf-poppler
+zsh
diff --git a/x/marble-mouse/set-config.sh b/x/marble-mouse/set-config.sh
deleted file mode 100755
index bc22770..0000000
--- a/x/marble-mouse/set-config.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Get directory variables from script.
-. ../../scripts/dirs.sh
-
-config_file_name="10-evdev.conf"
-sys_layout_file="/etc/X11/xorg.conf.d/$config_file_name"
-config_dir="$linux_config_dir/x/marble-mouse"
-
-# Remove system file.
-sudo rm -rf "$sys_layout_file"
-# Link config file in repository to system config location.
-sudo ln -s "$config_dir"/"$config_file_name" "$sys_layout_file"

From 7a3f54c01e02d3da691fb151a1557af657c9b2e8 Mon Sep 17 00:00:00 2001
From: Kevin Mok <kevin.mok@live.ca>
Date: Mon, 3 Dec 2018 18:35:20 -0500
Subject: [PATCH 2/2] Roice

---
 README.md                              | 16 +++---
 aliases/zsh_aliases                    |  7 +--
 configs/i3/config                      | 76 +++++++++++++++++---------
 configs/i3blocks/i3blocks-display.conf | 27 ++++-----
 configs/i3blocks/i3blocks.conf         |  7 ++-
 txt/key_files.txt                      |  4 +-
 6 files changed, 80 insertions(+), 57 deletions(-)

diff --git a/README.md b/README.md
index 65ac641..be43424 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
 <!---  Intro {{{ --> 
 # Kevin's Linux Setup
 
-![desktop-screenshot](https://i.imgur.com/DivyfTu.png)
-*Screenshot from my desktop config.*
+![desktop-screenshot](https://i.imgur.com/lkicLP5.png)
+
+![desktop-screenshot-2](https://i.imgur.com/DivyfTu.png)
+*Screenshots from my desktop config.*
 
 This repository contains the dotfiles to increase my workflow efficiency. They
 are also for my Linux
@@ -30,15 +32,11 @@ they should be in the system.
 
 <!-- History {{{ -->
 ## History
-
 ### 3/7
-![laptop-screenshot](https://i.imgur.com/UpdX90A.png)
-*Laptop.*
+* [laptop](https://i.imgur.com/UpdX90A.png)
 
 ### 3/5
-![desktop-screenshot](https://i.imgur.com/mbu9aYf.png)
-*Dual-monitor desktop.*
+* [dual-monitor desktop](https://i.imgur.com/mbu9aYf.png)
+* [laptop](https://i.imgur.com/hrSnXmV.png)
 
-![laptop-screenshot](https://i.imgur.com/hrSnXmV.png)
-*Laptop.*
 <!-- }}} History -->
diff --git a/aliases/zsh_aliases b/aliases/zsh_aliases
index 742fe73..826de3d 100644
--- a/aliases/zsh_aliases
+++ b/aliases/zsh_aliases
@@ -24,7 +24,7 @@ function src() { source $1 ; }
 
 alias cs='printf "\033c"'
 alias hst="history"
-alias nf="neofetch | lolcat"
+alias nf="cs && neofetch | lolcat"
 alias rur="xrdb ~/.Xresources"
 function gvx() { urxvt --help 2>&1 | grep $1 ; } 
 # list file sizes in megabytes with depth 1
@@ -127,7 +127,7 @@ alias lca="f ~/linux-config/aliases"
 source ~/.shortcuts
 #  i3 
 alias i3b="f ~/i3blocks"
-alias pipes="pipes.sh -t 2"
+alias pipes="pipes.sh -t 3"
 	
 # UltiSnips {{{ #
 urnp_dir="~/.vim/plugged/vim-snippets/UltiSnips"
@@ -150,7 +150,6 @@ function xv() { nohup xviewer $1 > /dev/null 2>&1& ; }
 function chr() { google-chrome $1 ; }
 function ni() { nvim $1 ; }
 function sni() { sudo nvim $1 ; }
-alias spt="spotify $silent"
 # function mrk() { pandoc -o ${1%.*}.html $1 && chr ${1%.*}.html ; }
 function mrk() { pandoc -o ${1%.*}.html $1 ; } 
 function auc() { xdotool click --repeat 1000000 --delay $1 1 ; } 
@@ -234,7 +233,7 @@ alias grbc="git rebase --continue"
 #  }}} update # 
 
 #  edit {{{ # 
-alias vir="ni README.md"
+alias vre="ni README.md"
 alias crm="mrk README.md"
 #  }}} edit # 
 
diff --git a/configs/i3/config b/configs/i3/config
index 370a695..c4d03ac 100644
--- a/configs/i3/config
+++ b/configs/i3/config
@@ -71,7 +71,7 @@ bindsym Shift+F0 exec xbacklight -set 100
 
 #  menu {{{ # 
 # start dmenu (a program launcher)
-bindsym Mod4+Return exec dmenu_run
+# bindsym Mod4+Return exec dmenu_run
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
@@ -145,6 +145,31 @@ bindsym $mod+a focus parent
 
 # focus the child container
 #bindsym $mod+d focus child
+
+#  change container colors from pywal {{{ # 
+
+# Set colors from Xresources
+# Change 'color7' and 'color2' to whatever colors you want i3 to use 
+# from the generated scheme.
+# 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 i3wm.color7 #f0f0f0
+set_from_resource $bg i3wm.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
+
+# PROTIP: You can also dynamically set dmenu's colors this way:
+bindsym Mod4+Return exec dmenu_run -nb "$fg" -nf "$bg" -sb "$bg" -sf "$fg"
+
+#  }}} change container colors from pywal # 
+
 #  }}} container display # 
 
 #  workspace {{{ # 
@@ -276,15 +301,14 @@ bindsym $mod+control+l resize shrink width 3 px or 3 ppt
 #  gaps {{{ # 
 
 # remove window titlebars
-for_window [class="^.*"] border pixel 5
-# for_window [class="^.*"] border pixel 2
-
+for_window [class="^.*"] border pixel 4
 set $inner_gaps 30
 set $outer_gaps 5
-# gaps inner $inner_gaps
-# gaps outer $outer_gaps
-gaps inner 0
-gaps outer 0
+
+gaps inner $inner_gaps
+gaps outer $outer_gaps
+# gaps inner 0
+# gaps outer 0
 
 #  other gaps {{{ # 
 
@@ -322,30 +346,30 @@ bar {
 
 # #  display {{{ #
 
-# bar {
-        # font pango:$sb_font 24
-        # tray_output none
-        # status_command i3blocks -c ~/.config/i3blocks/i3blocks-display.conf
-        # output $samsung
-        # wheel_up_cmd nop
-        # wheel_down_cmd nop
-# }
-
-# #  }}}  display #
-
-#  samsung bar {{{ # 
-
 bar {
-		output $samsung
-		# output $benq
-		status_command i3blocks -c ~/.config/sam-i3blocks/sam-i3blocks.conf
-		tray_output none
 		font pango:$sb_font 23
+		tray_output none
+		status_command i3blocks -c ~/.config/i3blocks/i3blocks-display.conf
+		output $samsung
 		wheel_up_cmd nop
 		wheel_down_cmd nop
 }
 
-#  }}} samsung bar # 
+#  }}}  display #
+
+# #  samsung bar {{{ #
+
+# bar {
+		# output $samsung
+		# # output $benq
+		# status_command i3blocks -c ~/.config/sam-i3blocks/sam-i3blocks.conf
+		# tray_output none
+		# font pango:$sb_font 23
+		# wheel_up_cmd nop
+		# wheel_down_cmd nop
+# }
+
+# #  }}} samsung bar #
 
 #  }}} status bar #
 
diff --git a/configs/i3blocks/i3blocks-display.conf b/configs/i3blocks/i3blocks-display.conf
index fbfff0f..cadb718 100644
--- a/configs/i3blocks/i3blocks-display.conf
+++ b/configs/i3blocks/i3blocks-display.conf
@@ -37,38 +37,39 @@ markup=pango
 label=
 command=date '+%H:%M.%a-%m-%d'
 interval=30
-color=#cccccc
+color=#acc0cd
 
 [spotify]
 command=python ~/linux-config/configs/i3blocks-scripts/spotify.py
 label=
-# color=#006600
-color=#388E8E
+color=#999999
 interval=5
 
 # [wifi]
 # label=
-# instance=wlp3s0
+# instance=wlp4s0
 # interval=10
 
 # unbold this?
-[load_average]
+# [load_average]
+# label=
+# interval=5
+# color=#990000
+
+# [cpu_usage -w 50 -c 80]
+[cpu_usage]
 label=
-interval=5
 color=#990000
+interval=5
 
 [memory]
 label=
-color=#006600
-
-[cpu_usage -w 50 -c 80]
-label=
-min_width=CPU: 100.00%
-color=#adeaea
+color=#3da061
+interval=5
 
 [name]
 label=
-color=#cc5490
+color=#1e5b99
 interval=6000
 
 #  unused blocks {{{ # 
diff --git a/configs/i3blocks/i3blocks.conf b/configs/i3blocks/i3blocks.conf
index de58962..94dac81 100644
--- a/configs/i3blocks/i3blocks.conf
+++ b/configs/i3blocks/i3blocks.conf
@@ -37,7 +37,7 @@ markup=pango
 label=
 command=date '+%H:%M.%a-%m-%d'
 interval=30
-color=#cccccc
+color=#acc0cd
 
 # [wifi]
 # label=
@@ -58,12 +58,13 @@ interval=5
 
 [memory]
 label=
-color=#addfe3
+color=#3da061
 interval=5
 
 [name]
 label=
-color=#cc5490
+# color=#ba50a9
+color=#1e5b99
 interval=6000
 
 #  unused blocks {{{ # 
diff --git a/txt/key_files.txt b/txt/key_files.txt
index 9ecd38e..c6337c5 100644
--- a/txt/key_files.txt
+++ b/txt/key_files.txt
@@ -1,9 +1,9 @@
 # sys {{{ *
 
 3 ~/.config/i3/config
-3b ~/.config/i3blocks/i3blocks.conf
 d ~/linux-config/txt/key_dirs.txt
 f ~/linux-config/txt/key_files.txt
+i ~/.config/i3blocks/i3blocks.conf
 r ~/.config/ranger/rc.conf
 sr ~/linux-config/configs/ranger/shortcuts.conf
 ss ~/.shortcuts
@@ -19,8 +19,8 @@ z ~/linux-config/aliases/zsh_aliases
 hlg ~/coding/spotify-lib-vis/src/api/management/commands/update-history.log
 jn ~/Documents/journal/todo/11.md
 jnt ~/Documents/journal/todo/todo.md
+n ./.gitignore
 tm ~/.vim/plugged/vim-snippets/UltiSnips/texmath.snippets
-ig ./.gitignore
 
 # }}} cdn *