From 0165cce775e2efedbff4a08e04039f4e2b996368 Mon Sep 17 00:00:00 2001
From: Harri Lahtinen <lahtinen.harri@gmail.com>
Date: Thu, 19 Dec 2019 00:22:50 +0200
Subject: [PATCH] separate pacman and yay packages, yadm bootstrap

---
 .Xresources                                 |   2 +
 .config/i3/config                           |  16 +-
 .config/polybar/config                      |  31 ++-
 .config/ranger/plugins/ranger_devicons      |   2 +-
 .config/wpg/templates/config_i3_config.base |   4 +-
 .config/yadm/bootstrap                      |  76 +++++++
 .ncmpcpp/config                             |   2 +-
 addons/pacman-packages                      | 236 ++++++++++++++++++++
 addons/yay-packages                         |  48 ++++
 9 files changed, 389 insertions(+), 28 deletions(-)
 create mode 100755 .config/yadm/bootstrap
 create mode 100644 addons/pacman-packages
 create mode 100644 addons/yay-packages

diff --git a/.Xresources b/.Xresources
index 72a3913..69956c4 100644
--- a/.Xresources
+++ b/.Xresources
@@ -4,6 +4,8 @@
 *.background: #282828
 *.foreground: white
 *.cursorColor: white
+Xcursor.theme: Dot-Dark
+Xcursor.size: 48
 
 !/* !! gruvbox: */
 !/* *.color0: #1d2021 */
diff --git a/.config/i3/config b/.config/i3/config
index 8bac455..d3d8242 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -51,11 +51,11 @@ bindsym $mod+Shift+c sticky toggle
 
 ######### COLORS ##########
 #                       BORDER		    BACKGROUND	TEXT		INDICATOR       CHILD_BORDER
-client.focused		    #997A7E	    #3B5A87	#0F0F15	#997A7E    	#7288B0
-client.unfocused	    #7288B0    	#997A7E	#c5cee0	#7288B0		#0F0F15
-client.focused_inactive	#0F0F15    	#232332	#c5cee0	#7288B0	    #0F0F15
-client.urgent		    #657194	    #657194	#0F0F15	#657194		#657194
-client.background #232332
+client.focused		    #364665	    #3B4C91	#07060A	#364665    	#682E8C
+client.unfocused	    #682E8C    	#364665	#c79acb	#682E8C		#07060A
+client.focused_inactive	#07060A    	#8b6b8e	#c79acb	#682E8C	    #07060A
+client.urgent		    #504E71	    #504E71	#07060A	#504E71		#504E71
+client.background #8b6b8e
 
 ###---Starting External Scripts---###
 
@@ -197,7 +197,7 @@ bindsym $mod+s			gaps inner current plus 5
 bindsym $mod+Shift+s		gaps inner current minus 5
 
 #bindsym $mod+d			exec rofi -config ~/.config/rofi/config -show drun
-bindsym $mod+d          exec dmenu_run -fn 'Ubuntu Mono derivative Powerline-18' -h '35' -nb '#9B93A4' -sf '#0F0F15' -sb '#738bd0' -nf '#eef9ff' 
+bindsym $mod+d          exec dmenu_run -fn 'Ubuntu Mono derivative Powerline-18' -h '35' -nb '#635D94' -sf '#07060A' -sb '#504E71' -nf '#c79acb' 
 bindsym Mod1+d          exec ~/.config/Scripts/rofi-bangs.sh
 
 bindsym $mod+Shift+d		gaps inner current set 0; gaps outer current set 0
@@ -377,6 +377,6 @@ bindsym XF86MonBrightnessDown	exec --no-startup-id light -U 5
 bindsym XF86MonBrightnessUp	exec --no-startup-id light -A 5
 #bindsym XF86AudioMedia		exec $music
 #bindsym XF86Display		exec --no-startup-id arandr
-bindsym XF86KbdBrightnessDown	exec --no-startup-id light -U 5 
-bindsym XF86KbdBrightnessUp	exec --no-startup-id light -A 5
+#bindsym XF86KbdBrightnessDown	exec --no-startup-id light -U 5 
+#bindsym XF86KbdBrightnessUp	exec --no-startup-id light -A 5
 #bindsym XF86WLAN		exec --no-startup-id sudo systemctl restart NetworkManager
diff --git a/.config/polybar/config b/.config/polybar/config
index fcaaa1c..31f9b24 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -5,21 +5,21 @@
 ;
 [colors]
 background = #00000000
-background-alt = #997A7E
-foreground = #7288B0
-foreground-alt = #7196C8
-highlight = #c5cee0
-error = #738bd0
-red = #657194
-yellow = #3B5A87
-green = #9B93A4
-darkblue = #7288B0
+background-alt = #364665
+foreground = #682E8C
+foreground-alt = #8B4883
+highlight = #c79acb
+error = #504E71
+red = #504E71
+yellow = #3B4C91
+green = #635D94
+darkblue = #682E8C
 alert = #FF0000
-lightblue = #eef9ff
-orange = #7196C8
-blue = #d88c96
-black = #0F0F15
-grey = #232332
+lightblue = #c79acb
+orange = #8B4883
+blue = #364665
+black = #07060A
+grey = #8b6b8e
 
 [bar/top]
 monitor = ${env:MONITOR:eDP-1}
@@ -211,8 +211,7 @@ type = custom/script
 interval = 256
 format = "<label>"
 format-prefix = "  "
-;format-prefix = "%{T5}  %{T-}"
-;format-prefix-font = 5
+;format-prefix = ""
 exec = echo "$(uname -nr)"
 format-prefix-foreground = ${colors.black}
 format-prefix-background = ${colors.blue}
diff --git a/.config/ranger/plugins/ranger_devicons b/.config/ranger/plugins/ranger_devicons
index cb93df5..b0e6b1c 160000
--- a/.config/ranger/plugins/ranger_devicons
+++ b/.config/ranger/plugins/ranger_devicons
@@ -1 +1 @@
-Subproject commit cb93df52e7d75493d737b8200c41408fe71e5f7b
+Subproject commit b0e6b1c580d5c71a9cd4bc0703cab86434fa4b2f
diff --git a/.config/wpg/templates/config_i3_config.base b/.config/wpg/templates/config_i3_config.base
index ccc175a..5dee597 100644
--- a/.config/wpg/templates/config_i3_config.base
+++ b/.config/wpg/templates/config_i3_config.base
@@ -377,6 +377,6 @@ bindsym XF86MonBrightnessDown	exec --no-startup-id light -U 5
 bindsym XF86MonBrightnessUp	exec --no-startup-id light -A 5
 #bindsym XF86AudioMedia		exec $music
 #bindsym XF86Display		exec --no-startup-id arandr
-bindsym XF86KbdBrightnessDown	exec --no-startup-id light -U 5 
-bindsym XF86KbdBrightnessUp	exec --no-startup-id light -A 5
+#bindsym XF86KbdBrightnessDown	exec --no-startup-id light -U 5 
+#bindsym XF86KbdBrightnessUp	exec --no-startup-id light -A 5
 #bindsym XF86WLAN		exec --no-startup-id sudo systemctl restart NetworkManager
diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
new file mode 100755
index 0000000..6ec337e
--- /dev/null
+++ b/.config/yadm/bootstrap
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+#For less headaches
+cd ${HOME}
+
+#Submodules
+yadm submodule update --recursive --init
+
+#Installing packages
+
+#Arch Linux
+if command -v pacman >/dev/null 2>&1; then
+	PACMAN="pacman"
+	PACINSTALL="-Syu --needed"
+else
+	echo "Pacman not found" >&2
+	exit 1
+fi
+
+#Packages in the repositories
+echo "Installing packages"
+sed "s/#.*//g"
+	${HOME}/addons/${PACMAN}-packages | \
+	xargs sudo ${PACMAN} ${PACINSTALL}
+
+
+#Packages in the aur
+if command -v yay >/dev/null 2>&1; then
+	echo "Yay already installed"
+else
+	echo "Yay not found" >&2
+	echo "Installing yay"
+
+	#Yay installation
+	cd /tmp
+	git clone https://aur.archlinux.org/yay.git
+	cd yay
+	makepkg -s
+	sudo pacman -U *.pkg.tar.xz
+	cd ..
+	rm -rf yay
+	cd ${HOME}
+fi
+
+if command -v yay >/dev/null 2>&1; then
+	AUR="yay"
+	AURARGS="-S --needed --nocleanmenu --nodiffmenu --noeditmenu --noupgrademenu"
+else
+	echo "Couldn't install yay" >&2
+	exit 2
+fi
+
+#xargs -a ${HOME}/addons/${AUR}-packages ${AUR} ${AURINSTALL}
+
+sed "s/#.*//g"
+	${HOME}/addons/${AUR}-packages | \
+	xargs ${AUR} ${AURARGS}
+
+#Installing ranger plugin
+cd ${HOME}/.config/ranger/plugins/ranger_devicons
+make
+cd ${HOME}
+
+#Neovim bootstraping
+
+#Because a bug that inserts text on neovim, this doesn't work.
+#Checking if neovim is installed
+if command -v nvim >/dev/null 2>&1; then
+	echo "Installing plugins"
+
+		nvim \
+			'+PlugUpdate'\
+			'+PlugClean!'\
+			'+PlugUpdate'\
+			'+qall'
+fi
diff --git a/.ncmpcpp/config b/.ncmpcpp/config
index 62f90a5..5c86e19 100644
--- a/.ncmpcpp/config
+++ b/.ncmpcpp/config
@@ -1,5 +1,5 @@
 mpd_crossfade_time = "3"
-mpd_host = "192.168.1.20"
+mpd_host = "192.168.1.33"
 mpd_port = "6600"
 
 visualizer_fifo_path = "/tmp/mpd.fifo"
diff --git a/addons/pacman-packages b/addons/pacman-packages
new file mode 100644
index 0000000..30fe1fc
--- /dev/null
+++ b/addons/pacman-packages
@@ -0,0 +1,236 @@
+acpi
+acpi_call
+alsa-utils
+arandr
+autoconf
+autofs
+automake
+base
+bash
+bat
+binutils
+bison
+bluez
+bluez-utils
+borg
+bzip2
+chrony
+cmatrix
+coreutils
+crda
+cryptsetup
+device-mapper
+dhcpcd
+dialog
+diffutils
+e2fsprogs
+exfat-utils
+fakeroot
+fcron
+fd
+feh
+ffmpegthumbnailer
+file
+filesystem
+findutils
+flex
+fwupd
+gawk
+gcc
+gcc-libs
+gettext
+git
+glibc
+gnome-keyring
+grep
+groff
+gtop
+gucharmap
+gvfs-mtp
+gzip
+htop
+inetutils
+intel-media-driver
+intel-ucode
+iproute2
+iputils
+iwd
+jfsutils
+jq
+jsoncpp
+less
+libglade
+libtool
+libva-utils
+licenses
+lightdm
+linux
+linux-firmware
+logrotate
+lsb-release
+lsd
+lvm2
+lxappearance
+m4
+make
+man-db
+man-pages
+mdadm
+mlocate
+mopidy
+mpc
+mpd
+mpv
+nano
+ncdu
+ncmpcpp
+neofetch
+neovim
+netctl
+network-manager-applet
+networkmanager
+networkmanager-openvpn
+newsboat
+nfs-utils
+noto-fonts
+noto-fonts-emoji
+npm
+ntp
+openvpn
+p7zip
+pacman
+pacman-contrib
+papirus-icon-theme
+pass
+patch
+pavucontrol
+pciutils
+pcmanfm-gtk3
+perl
+pkgconf
+polkit-gnome
+powertop
+procps-ng
+psmisc
+pulseaudio-bluetooth
+pygtk
+python-cairo
+python-dbus
+python-mpd2
+python-musicbrainzngs
+python-mutagen
+python-pip
+python-pyqt5
+python-pywal
+python-setuptools
+python-urwid
+python2-cairo
+python2-dbus
+python2-gobject2
+python2-mpd
+python2-pip
+qt5-styleplugins
+reflector
+reiserfsprogs
+ripgrep
+rofi
+rpmextract
+s-nail
+s-tui
+scrot
+seahorse
+sed
+shadow
+stress
+sudo
+surfraw
+sysfsutils
+sysstat
+systemd
+systemd-sysvcompat
+tar
+tcl
+terminus-font
+texinfo
+the_silver_searcher
+tk
+tmux
+ttf-liberation
+udiskie
+udisks2
+unclutter
+unzip
+upower
+usbutils
+util-linux
+vi
+vulkan-intel
+w3m
+wget
+which
+wireless_tools
+wpa_supplicant
+xcursor-vanilla-dmz
+xdg-user-dirs
+xdg-utils
+xdo
+xdotool
+xfsprogs
+xkeycaps
+xorg-bdftopcf
+xorg-docs
+xorg-font-util
+xorg-fonts-100dpi
+xorg-fonts-75dpi
+xorg-fonts-encodings
+xorg-iceauth
+xorg-luit
+xorg-mkfontscale
+xorg-server
+xorg-server-common
+xorg-server-devel
+xorg-server-xdmx
+xorg-server-xephyr
+xorg-server-xnest
+xorg-server-xvfb
+xorg-server-xwayland
+xorg-sessreg
+xorg-setxkbmap
+xorg-smproxy
+xorg-x11perf
+xorg-xauth
+xorg-xbacklight
+xorg-xcmsdb
+xorg-xcursorgen
+xorg-xdpyinfo
+xorg-xdriinfo
+xorg-xev
+xorg-xgamma
+xorg-xhost
+xorg-xinit
+xorg-xinput
+xorg-xkbcomp
+xorg-xkbevd
+xorg-xkbutils
+xorg-xkill
+xorg-xlsatoms
+xorg-xlsclients
+xorg-xmodmap
+xorg-xpr
+xorg-xprop
+xorg-xrandr
+xorg-xrdb
+xorg-xrefresh
+xorg-xset
+xorg-xsetroot
+xorg-xvinfo
+xorg-xwd
+xorg-xwininfo
+xorg-xwud
+xterm
+youtube-dl
+youtube-viewer
+zathura
+zathura-pdf-poppler
+zsh
+zsh-completions
diff --git a/addons/yay-packages b/addons/yay-packages
new file mode 100644
index 0000000..a315987
--- /dev/null
+++ b/addons/yay-packages
@@ -0,0 +1,48 @@
+awesome-terminal-fonts-git
+awesome-terminal-fonts-patched
+betterlockscreen-git
+bibata-cursor-theme
+breeze-snow-cursor-theme
+chkservice
+chromium-vaapi-bin
+chromium-widevine
+compton-tryone-git
+dell-bios-fan-control-git
+dmenu2
+downgrader
+dtrx-git
+etcher-bin
+expac-git
+expressvpn
+fasd-git
+freerdp-git
+google-chrome
+googler
+i3-gaps-next-git
+i3-resurrect-git
+i8kutils
+inxi-git
+libgksu
+libinput-gestures-git
+libunarr-git
+light-git
+lightdm-mini-greeter-git
+mcomix-gtk3-git
+networkmanager-dispatcher-chrony
+networkmanager-dmenu-git
+oomox-git
+otf-powerline-symbols-git
+polybar-git
+powerline-fonts-git
+python-ueberzug
+ranger-git
+remmina-git
+st-luke-git
+systemd-boot-pacman-hook
+ttf-weather-icons
+twmn-git
+wpgtk-git
+yacreader
+yad-git
+yadm-git
+yay-git