From ee37eb058ea24fa795e7e774051842184970608c 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] 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..c96fdf0 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/) ([my 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"