Improved scripts - removes binary blobs

22 files changed, 43 insertions, 14 deletions

diff --git a/.repos/dmenu/dmenu b/.repos/dmenu/dmenu
deleted file mode 100755
index 0d06887..0000000
--- a/.repos/dmenu/dmenu
+++ /dev/null
diff --git a/.repos/dmenu/dmenu.o b/.repos/dmenu/dmenu.o
deleted file mode 100644
index 30cfb37..0000000
--- a/.repos/dmenu/dmenu.o
+++ /dev/null
diff --git a/.repos/dmenu/drw.o b/.repos/dmenu/drw.o
deleted file mode 100644
index db93e5e..0000000
--- a/.repos/dmenu/drw.o
+++ /dev/null
diff --git a/.repos/dmenu/stest b/.repos/dmenu/stest
deleted file mode 100755
index 60c69a1..0000000
--- a/.repos/dmenu/stest
+++ /dev/null
diff --git a/.repos/dmenu/stest.o b/.repos/dmenu/stest.o
deleted file mode 100644
index f3d9192..0000000
--- a/.repos/dmenu/stest.o
+++ /dev/null
diff --git a/.repos/dmenu/util.o b/.repos/dmenu/util.o
deleted file mode 100644
index 59a0745..0000000
--- a/.repos/dmenu/util.o
+++ /dev/null
diff --git a/.repos/dwm/config.h b/.repos/dwm/config.h
index 4951d41..4848be2 100644
--- a/.repos/dwm/config.h
+++ b/.repos/dwm/config.h
@@ -1,7 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-static const unsigned int borderpx  = 2;        /* border pixel of windows */
+static const unsigned int borderpx  = 0;        /* border pixel of windows */
 static const unsigned int snap      = 16;       /* snap pixel */
 static const int showbar            = 0;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
@@ -27,8 +27,8 @@ static const char col_base0F[]	    = "#be5046";
 
 static const char *colors[][3]	    = {
 	/*               fg          bg          border   */
-	[SchemeNorm] = { col_base05, col_base00, col_base00 },
-	[SchemeSel]  = { col_base05, col_base02, col_base02 },
+	[SchemeNorm] = { col_base05, col_base00, col_base02 },
+	[SchemeSel]  = { col_base05, col_base02, col_base00 },
 };
 
 /* scratchpad */
diff --git a/.repos/dwm/drw.o b/.repos/dwm/drw.o
deleted file mode 100644
index 3adc054..0000000
--- a/.repos/dwm/drw.o
+++ /dev/null
diff --git a/.repos/dwm/dwm b/.repos/dwm/dwm
deleted file mode 100755
index 4602f0c..0000000
--- a/.repos/dwm/dwm
+++ /dev/null
diff --git a/.repos/dwm/dwm.o b/.repos/dwm/dwm.o
deleted file mode 100644
index e3bc17f..0000000
--- a/.repos/dwm/dwm.o
+++ /dev/null
diff --git a/.repos/dwm/dwm.png b/.repos/dwm/dwm.png
deleted file mode 100644
index b1f9ba7..0000000
--- a/.repos/dwm/dwm.png
+++ /dev/null
diff --git a/.repos/dwm/util.o b/.repos/dwm/util.o
deleted file mode 100644
index 2a026a6..0000000
--- a/.repos/dwm/util.o
+++ /dev/null
diff --git a/.repos/slock/explicit_bzero.o b/.repos/slock/explicit_bzero.o
deleted file mode 100644
index 5524906..0000000
--- a/.repos/slock/explicit_bzero.o
+++ /dev/null
diff --git a/.repos/slock/slock b/.repos/slock/slock
deleted file mode 100755
index 1d595a0..0000000
--- a/.repos/slock/slock
+++ /dev/null
diff --git a/.repos/slock/slock.o b/.repos/slock/slock.o
deleted file mode 100644
index 19b490d..0000000
--- a/.repos/slock/slock.o
+++ /dev/null
diff --git a/.repos/surf/surf.png b/.repos/surf/surf.png
deleted file mode 100644
index f5b2ab1..0000000
--- a/.repos/surf/surf.png
+++ /dev/null
diff --git a/.repos/tabbed/tabbed b/.repos/tabbed/tabbed
deleted file mode 100755
index 3e5c127..0000000
--- a/.repos/tabbed/tabbed
+++ /dev/null
diff --git a/.repos/tabbed/tabbed.o b/.repos/tabbed/tabbed.o
deleted file mode 100644
index 39692c7..0000000
--- a/.repos/tabbed/tabbed.o
+++ /dev/null
diff --git a/.repos/tabbed/xembed b/.repos/tabbed/xembed
deleted file mode 100755
index 2c9a0e0..0000000
--- a/.repos/tabbed/xembed
+++ /dev/null
diff --git a/.repos/tabbed/xembed.o b/.repos/tabbed/xembed.o
deleted file mode 100644
index 7efd091..0000000
--- a/.repos/tabbed/xembed.o
+++ /dev/null
diff --git a/backup b/backup
index 401775c..4a07f16 100755
--- a/backup
+++ b/backup
@@ -1,8 +1,13 @@
 #!/usr/bin/env bash
 
+printf "\033[0;34m"
+
+echo "Cleaning previous configs"
 rm -rf .config/ .repos/ .scripts/ .boilerplates/
 mkdir -p .config/{dunst,qutebrowser,gtk-2.0,gtk-3.0,nvim,zathura,mpv} .repos
 
+echo "Copying configs"
+
 # Scripts
 cp -r "$HOME"/.scripts/ .
 
@@ -16,21 +21,29 @@ cp "$HOME"/.config/zathura/zathurarc .config/zathura/
 cp "$HOME"/.config/mpv/mpv.conf .config/mpv/
 cp "$HOME"/.config/uncrustify.cfg .config/
 
+# Inits
+cp "$HOME"/.bash_profile "$HOME"/.bashrc "$HOME"/.xinitrc "$HOME"/.Xresources .
+cp -r "$HOME"/.lein .
+
 # Boilerplates
 cp -r "$HOME"/.boilerplates .
 
 # Crypto keys etc.
-scp -r "$HOME"/.crypto/ root@10.0.0.33:/mnt/ssd/
+echo "Uploading keys"
+scp -rq "$HOME"/.crypto/ root@10.0.0.33:/mnt/ssd/
 
 # Repos
+echo "Cleaning suckless configs"
 cp -r "$HOME"/.repos/* .repos/
 find .repos/ -type d -name ".git" -exec rm -rf {} +
-
-# Inits
-cp "$HOME"/.bash_profile "$HOME"/.bashrc "$HOME"/.xinitrc "$HOME"/.Xresources .
-cp -r "$HOME"/.lein .
+find .repos/ -type f -exec sh -c "file -i '{}' | grep -q 'charset=binary'" \; -delete
 
 # Installed programs
+echo "Getting package list"
 pacman -Qqe > packages.txt
 
-git status
+printf "\nChanged files:\n"
+printf "\033[0;32m"
+git status -s | cut -c4-
+
+printf "\033[0m"
diff --git a/sync b/sync
index 899a0a6..0164156 100755
--- a/sync
+++ b/sync
@@ -1,8 +1,24 @@
 #!/usr/bin/env bash
 # The most awesome sync script! :)
 
-git pull || exit 1
-sudo pacman -Sy
-comm -23 <(sort packages.txt) <(pacman -Qqe | sort) | yay -S --needed -
-for d in ./.repos/*/ ; do (cd "$d" && sudo make install); done || exit 1
-scp -r root@10.0.0.33:/mnt/ssd/.crypto "$HOME"/
+printf "\033[0;34m"
+echo "Pulling newest configs"
+git pull --quiet || exit 1
+
+printf "\033[0;34m"
+echo "Syncing packages"
+sudo pacman -Syq &> /dev/null
+
+printf "\033[0;34m"
+echo "Comparing installed packages"
+comm -23 <(sort packages.txt) <(pacman -Qqe | sort) | yay -Sq --needed -
+
+printf "\033[0;34m"
+echo "Compiling local repos"
+for d in ./.repos/*/ ; do (cd "$d" && sudo make clean install &> /dev/null); done || exit 1
+
+printf "\033[0;34m"
+echo "Syncing crypto files from server"
+scp -rq root@10.0.0.33:/mnt/ssd/.crypto "$HOME"/
+
+printf "\033[0m"