From 2b2a0ac827b80bf56aa9b14fef3bd3d95360bed4 Mon Sep 17 00:00:00 2001
From: Frieder Schlesier <frieder@fschl.de>
Date: Wed, 31 Jul 2019 16:51:10 +0200
Subject: [PATCH] add missing software reinstall new Debian

---
 .i3/config         |  2 +-
 scripts/install.sh | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.i3/config b/.i3/config
index 0949f24..2278a9e 100755
--- a/.i3/config
+++ b/.i3/config
@@ -251,5 +251,5 @@ exec --no-startup-id i3-msg 'workspace $WS1; exec firefox;'
 exec --no-startup-id i3-msg 'workspace $WS2; exec emacs'
 exec --no-startup-id i3-msg 'exec thunderbird'
 exec --no-startup-id i3-msg 'exec keepassxc'
-exec --no-startup-id i3-msg 'exec nextcloud'
+# exec --no-startup-id i3-msg 'exec nextcloud'
 exec --no-startup-id i3-msg 'workspace $WS3; exec urxvt;'
diff --git a/scripts/install.sh b/scripts/install.sh
index bec29dd..193285f 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -188,6 +188,10 @@ install_i3() {
 
     DEBIAN_FRONTEND=noninteractive
 
+
+    # TODO add non-free to apt/sources.list
+
+
     apt update
     apt install -y \
         alsa-utils \
@@ -197,10 +201,14 @@ install_i3() {
         emacs \
         feh \
         firefox-esr \
+        firmware-iwlwifi \
+        firmware-linux-nonfree \
+        firmware-realtek \
         fonts-font-awesome \
         fonts-noto \
         fonts-noto-cjk \
         fswebcam \
+        gimp \
         i3 \
         i3lock \
         i3lock-fancy \
@@ -223,6 +231,7 @@ install_i3() {
         thunderbird \
         thunderbird-l10n-de \
         thunderbird-l10n-en-gb \
+        vlc \
         xclip \
         xorg \
         --no-install-recommends
@@ -284,7 +293,7 @@ install_compose() {
     # https://github.com/docker/compose/releases
     # btw: *not* for raspbian! you got 3 choices: hypriot, install via pip or build yourself
     # https://www.berthon.eu/2017/getting-docker-compose-on-raspberry-pi-arm-the-easy-way/
-    VERS="1.23.2"
+    VERS="1.24.1"
     FILE="docker-compose-$(uname -s)-$(uname -m)"
     echo "installing docker-compose $VERS ... curling from github"
 
@@ -458,9 +467,11 @@ main() {
             install_server_base
             ;;
         desktop)
-            apt_sources buster
+ #           apt_sources buster
+ 		        base_applications
+		        install_docker
+		        install_compose
             install_i3
-            apt_sources buster
             if [ -f "./get_private_stuff.sh" ]; then
                 source get_private_stuff.sh
             fi