From 2b4295d8b8b09b15b3bd3220e6d5a67ebfb1a765 Mon Sep 17 00:00:00 2001
From: mitchell <m@mjfs.us>
Date: Sun, 15 Nov 2020 00:23:44 -0500
Subject: [PATCH] Updates to linux desktop configs and provisioning

---
 .config/bspwm/bspwmrc | 13 +++++++++----
 provision_linux       |  6 +++---
 sync                  | 31 +++++++++++++++++++------------
 upgrade_debian        |  4 ++--
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 5190379..e4e9dba 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -1,12 +1,17 @@
-#! /bin/sh
+#!/bin/sh
 
 setxkbmap -option altwin:swap_alt_win
 setxkbmap -option ctrl:swapcaps
+
 sxhkd &
-wmname LG3D
-polybar m-bar &
-xfce4-screensaver &
 picom -b
+
+wmname LG3D
+
+killall -q polybar
+polybar m-bar &
+
+xfce4-screensaver &
 ~/.fehbg &
 
 bspc monitor -d I II III IV V VI VII
diff --git a/provision_linux b/provision_linux
index a2692d4..f40de5d 100755
--- a/provision_linux
+++ b/provision_linux
@@ -213,9 +213,9 @@ function install_pkgs -S
             sudo $cmd --sync --refresh --sysupgrade --noconfirm
             sudo $cmd --sync --noconfirm $arch_pkgs $argv
         case debian
-            sudo apt-get update >/dev/null 2>&1
-            sudo apt-get upgrade --yes
-            sudo apt-get install --yes $debian_pkgs $argv
+            sudo apt-get --quiet --yes update
+            sudo apt-get --quiet --yes upgrade
+            sudo apt-get --quiet --yes install $debian_pkgs $argv
     end
 end
 
diff --git a/sync b/sync
index 1b2d252..a741337 100755
--- a/sync
+++ b/sync
@@ -25,14 +25,14 @@ function main
         log 'Syncing desktop environment configurations'
         set_color grey
 
-        sync_desktop_env
+        sync_desktop_env $uname
         set_kitty_font_size $uname
     end
 
     if test -n "$_flag_g"
         set_color normal
-        log 'Set git user'
-        set_git_user
+        log 'Sync git config'
+        sync_git_config
         set_color grey
     end
 
@@ -56,7 +56,6 @@ function sync_terminal_env
 
     rsync -aP ./.config/fish ~/.config/
     rsync -aP ./.config/nvim ~/.config/
-    rsync -aP ./.gitconfig ~/
     rsync -aP ./.tmux-line.conf ~/
     rsync -aP ./.tmux.conf ~/
     rsync -aP ./.vim ~/
@@ -64,16 +63,22 @@ function sync_terminal_env
     rsync -aP ./.taskrc ~/
 end
 
-function sync_desktop_env
+function sync_desktop_env -a uname
     rsync -aP ./.config/kitty ~/.config/
-    rsync -aP ./.config/bspwm ~/.config/
-    rsync -aP ./.config/sxhkd ~/.config/
-    rsync -aP ./.config/picom ~/.config/
     rsync -aP ./.config/qutebrowser ~/.config/
-    rsync -aP ./.config/polybar ~/.config/
     rsync -aP ./.ideavimrc ~/
-    rsync -aP ./.yabairc ~/
-    rsync -aP ./.skhdrc ~/
+
+    switch $uname
+        case Darwin
+            rsync -aP ./.yabairc ~/
+            rsync -aP ./.skhdrc ~/
+
+        case Linux
+            rsync -aP ./.config/bspwm ~/.config/
+            rsync -aP ./.config/sxhkd ~/.config/
+            rsync -aP ./.config/picom ~/.config/
+            rsync -aP ./.config/polybar ~/.config/
+    end
 end
 
 function set_kitty_font_size -a uname
@@ -90,7 +95,9 @@ function install_nvim_plugins
     command -q nvim; and nvim +PlugUpgrade +PlugUpdate +qa
 end
 
-function set_git_user
+function sync_git_config
+    rsync -aP ./.gitconfig ~/
+
     echo 'Please set your git user:'
     read -P 'name: ' name
     read -P 'email: ' email
diff --git a/upgrade_debian b/upgrade_debian
index 7ad6940..1176d2c 100755
--- a/upgrade_debian
+++ b/upgrade_debian
@@ -7,8 +7,8 @@ deb http://ftp.us.debian.org/debian unstable main contrib non-free
 deb-src http://ftp.us.debian.org/debian unstable main contrib non-free' | sudo tee /etc/apt/sources.list
 
     log 'Upgrading debian to unstable'
-    sudo apt-get update >/dev/null 2>&1
-    sudo apt-get dist-upgrade --yes
+    sudo apt-get --quiet --yes update
+    sudo apt-get --quiet --yes dist-upgrade
 
     log 'Rebooting'
     sudo reboot