added google-chrome and fixed gnome config

.dconf.conf

@@ -0,0 +1,29 @@
+[system/locale]
+region='sv_SE.UTF-8'
+
+
+[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0]
+binding='<Primary><Alt>Return'
+command='terminator'
+name='Open Terminator'
+
+[org/gnome/evolution-data-server/calendar]
+
+[org/gnome/shell]
+enabled-extensions=['TopIcons@phocean.net', 'multi-monitors-add-on@spin83', 'launch-new-instance@gnome-shell-extensions.gcampax.github.com']
+
+[org/gnome/shell/extensions/topicons]
+icon-opacity=221
+tray-pos='right'
+tray-order=1
+
+
+[org/gnome/shell/extensions/multi-monitors-add-on]
+show-activities=false
+show-app-menu=false
+available-indicators=@as []
+show-date-time=false
+show-panel=false
+thumbnails-on-left-side=false
+show-thumbnails-slider=false
+

bin/initDesktop

@@ -22,6 +22,7 @@ Usage ${0##*/} [options..]
 -h,-?, --help       Show help and exit
 -f, --firefox       configure firefox and install addons
 -g, --gnome         configure gnome and install extentions
+-G, --google-chrome configure and install google-chrome extentions
 -d, --dotfiles      configure dotfiles
 -s, --salt          run a masterless salt-call
 -y, --yes           answer 'yes' on all questions
@@ -56,7 +57,7 @@ function log(){
 
 function gnome_config(){
     new_log "Setting my default gnome bindings"
-    log "WARNING! All running firefox instances will be killed"
+    log "WARNING! All running google-chrome instances will be killed"
     if asktobreak; then
         return
     fi
@@ -65,42 +66,12 @@ function gnome_config(){
     set -e
     printf "Current version %s\n" "$(gnome-shell --version)"
     log "Launching firefox to install GNOME Extetions"
-    firefox https://extensions.gnome.org/extension/1031/topicons/
+    google-chrome https://extensions.gnome.org/extension/1031/topicons/ 2> /dev/null
-    firefox https://extensions.gnome.org/extension/600/launch-new-instance/
+    google-chrome https://extensions.gnome.org/extension/600/launch-new-instance/ 2> /dev/null
-    firefox https://extensions.gnome.org/extension/921/multi-monitors-add-on/
+    google-chrome https://extensions.gnome.org/extension/921/multi-monitors-add-on/ 2> /dev/null
 
     log "loading dconf settings"
-    dconf load < cat <<EOF
+    dconf load  /  < "$HOME/.dconf.conf"
-[system/locale]
-region='sv_SE.UTF-8'
-
-
-[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0]
-binding='<Primary><Alt>Return'
-command='terminator'
-name='Open Terminator'
-
-[org/gnome/evolution-data-server/calendar]
-
-[org/gnome/shell]
-enabled-extensions=['TopIcons@phocean.net', 'multi-monitors-add-on@spin83', 'launch-new-instance@gnome-shell-extensions.gcampax.github.com']
-
-[org/gnome/shell/extensions/topicons]
-icon-opacity=221
-tray-pos='right'
-tray-order=1
-
-
-[org/gnome/shell/extensions/multi-monitors-add-on]
-show-activities=false
-show-app-menu=false
-available-indicators=@as []
-show-date-time=false
-show-panel=false
-thumbnails-on-left-side=false
-show-thumbnails-slider=false
-EOF
-
 }
 
 function setup_dotfiles(){
@@ -155,12 +126,25 @@ function firefox_config(){
     $HOME/bin/install_firefox_addon
 }
 
+function chrome_config(){
+    new_log "Installing chrome extentions"
+    log "WARNING! all running instances of google-chrome will be killed"
+    if asktobreak; then
+        return
+    fi
+    set +e
+    pkill -f google-chrome
+    set -e
+    google-chrome https://chrome.google.com/webstore/detail/gnome-shell-integration/gphhapmejobijbbhgpjhcjognlahblep 2> /dev/null
+}
+
 #initialize all options
 ALL=true
 FIREFOX=false
 GNOME=false
 SALT=false
 DOTFILES=false
+CHROME=false
 ANSWER_YES=false
 while :; do
     case $1 in
@@ -176,6 +160,10 @@ while :; do
             GNOME=true
             ALL=false
             ;;
+        -G|--google-chrome)
+            CHROME=true
+            ALL=false
+            ;;
         -s|--salt)
             SALT=true
             ALL=false
@@ -204,6 +192,7 @@ done
 [[ $ALL == true ]] || [[ $DOTFILES == true ]] && setup_dotfiles
 [[ $ALL == true ]] || [[ $SALT == true ]] && do_salt_call
 [[ $ALL == true ]] || [[ $FIREFOX == true ]] && firefox_config
+[[ $ALL == true ]] || [[ $CHROME == true ]] && chrome_config
 [[ $ALL == true ]] || [[ $GNOME == true ]] && gnome_config
 
 printf "\n DONE!!!!!!!\n"