diff --git a/arch-config/.config/polybar/modules/date.ini b/arch-config/.config/polybar/modules/date.ini index 29e5424c..9d428ca9 100644 --- a/arch-config/.config/polybar/modules/date.ini +++ b/arch-config/.config/polybar/modules/date.ini @@ -15,4 +15,4 @@ format-prefix-foreground = ${colors.orange} format-underline = ${colors.orange} format-foreground = ${colors.foreground} format-background = ${colors.background} -label = %date% %time% \ No newline at end of file +label = %date% %time% diff --git a/arch-config/scripts/arcolinux-config.sh b/arch-config/scripts/arcolinux-config.sh index 6d9bcf79..b6f17aa8 100644 --- a/arch-config/scripts/arcolinux-config.sh +++ b/arch-config/scripts/arcolinux-config.sh @@ -21,23 +21,23 @@ mkdir ~/old_dat #back stuff up #config folders -rsync -ah --progress ~/.config/MangoHud ~/old_dat/.config/ && -rsync -ah --progress ~/.config/autostart ~/old_dat/.config/ && -rsync -ah --progress ~/.config/fish ~/old_dat/.config/ && -rsync -ah --progress ~/.config/gtk-3.0 ~/old_dat/.config/ && -rsync -ah --progress ~/.config/i3 ~/old_dat/.config/ && -rsync -ah --progress ~/.config/neofetch ~/old_dat/.config/ && -rsync -ah --progress ~/.config/openbox ~/old_dat/.config/ && -rsync -ah --progress ~/.config/polybar ~/old_dat/.config/ && -rsync -ah --progress ~/.config/termite ~/old_dat/.config/ && -rsync -ah --progress ~/.config/variety ~/old_dat/.config/ && +rsync -ah --progress ~/.config/MangoHud ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/autostart ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/fish ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/gtk-3.0 ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/i3 ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/neofetch ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/openbox ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/polybar ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/termite ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/variety ~/old_dat/.config/ > /dev/null #other directories -rsync -ah --progress ~/scripts ~/old_dat/ && -rsync -ah --progress ~/.mozilla ~/old_dat/ && -rsync -ah --progress ~/.easystroke ~/old_dat/ && -#rsync -ah --progress ~/.emacs.d ~/old_dat/ && -rsync -ah --progress ~/.doom.d ~/old_dat/ && +rsync -ah --progress ~/scripts ~/old_dat/ > /dev/null +rsync -ah --progress ~/.mozilla ~/old_dat/ > /dev/null +rsync -ah --progress ~/.easystroke ~/old_dat/ > /dev/null +#rsync -ah --progress ~/.emacs.d ~/old_dat/ > /dev/null +rsync -ah --progress ~/.doom.d ~/old_dat/ > /dev/null echo Made backups #copy folders @@ -68,15 +68,15 @@ sudo cp -r ~/config/var / sudo cp -r ~/config/usr / #gimp plugins -mkdir ~/.config/GIMP/ -mkdir ~/.config/GIMP/2.10/ -mkdir ~/.config/GIMP/2.10/plug-ins/ +mkdir ~/.config/GIMP/ || echo Not creating directory +mkdir ~/.config/GIMP/2.10/ || echo Not creating directory +mkdir ~/.config/GIMP/2.10/plug-ins/ || echo Not creating directory rsync -ah ~/config/gimp-plugins/* ~/.config/GIMP/2.10/plug-ins/ #unzip gimp plugins echo Unzipping gimp plugins -unzip -o ~/.config/GIMP/2.10/plug-ins/export_layers-3.3.1.zip -d ~/.config/GIMP/2.10/plug-ins/ -rm ~/.config/GIMP/2.10/plug-ins/export_layers-3.3.1.zip +unzip -o ~/.config/GIMP/2.10/plug-ins/export_layers-3.3.1.zip -d ~/.config/GIMP/2.10/plug-ins/ > /dev/null +rm ~/.config/GIMP/2.10/plug-ins/export_layers-3.3.1.zip > /dev/null echo Unzipped gimp plugins #make bash scripts executable diff --git a/arch-config/scripts/git-pull.sh b/arch-config/scripts/git-pull.sh index bbcfc932..277b6130 100644 --- a/arch-config/scripts/git-pull.sh +++ b/arch-config/scripts/git-pull.sh @@ -2,14 +2,18 @@ set -euo pipefail -cd "$HOME/GitProjects/config" || exit +cd "$HOME/GitProjects/config" +git fetch --all git pull -cd "$HOME/GitProjects/grab" || exit +cd "$HOME/GitProjects/grab" +git fetch --all git pull -cd "$HOME/GitProjects/setup" || exit +cd "$HOME/GitProjects/setup" +git fetch --all git pull -cd "$HOME/GitProjects/setup-pinephone" || exit +cd "$HOME/GitProjects/setup-pinephone" +git fetch --all git pull