From 85939104d81269ca9f00c8bfd49df19a2a15f675 Mon Sep 17 00:00:00 2001
From: Vitor Lopes <vlopes@gmail.com>
Date: Thu, 18 Jun 2020 21:08:15 +0100
Subject: [PATCH] make image, bare bones DE, move everything to netinstaller,
 add software choices.

---
 community/webdad/Packages-Desktop             | 131 ++++++-------
 .../modules/netinstall-applications.conf      |  54 ++++++
 .../modules/netinstall-applications.yaml      | 177 ++++++++++++++++++
 .../live-overlay/etc/calamares/settings.conf  |  53 ++++++
 community/webdad/profile.conf                 |   4 +-
 5 files changed, 347 insertions(+), 72 deletions(-)
 create mode 100644 community/webdad/live-overlay/etc/calamares/modules/netinstall-applications.conf
 create mode 100644 community/webdad/live-overlay/etc/calamares/modules/netinstall-applications.yaml
 create mode 100644 community/webdad/live-overlay/etc/calamares/settings.conf

diff --git a/community/webdad/Packages-Desktop b/community/webdad/Packages-Desktop
index 3acea8c..4e31a00 100644
--- a/community/webdad/Packages-Desktop
+++ b/community/webdad/Packages-Desktop
@@ -1,68 +1,63 @@
 ## Connect Packages
-android-tools
-android-udev
-gvfs
-gvfs-google
-gvfs-afc
-gvfs-gphoto2
-gvfs-mtp
-gvfs-nfs
-gvfs-smb
-mtpfs
-udiskie
-udisks2
+>extra android-tools
+>extra android-udev
+>extra gvfs
+>extra gvfs-google
+>extra gvfs-afc
+>extra gvfs-gphoto2
+>extra gvfs-mtp
+>extra gvfs-nfs
+>extra gvfs-smb
+>extra mtpfs
+>extra udiskie
+>extra udisks2
 
 
 ## Libraries for Sound/Audio/Video
 alsa-firmware
 alsa-utils
-ffmpeg
-grilo-plugins
-gst-libav
-gst-plugins-bad
-gst-plugins-base
-gst-plugins-good
-gst-plugins-ugly
-libdvdcss
 >multilib manjaro-alsa
 manjaro-pulse
 pulseaudio-bluetooth
 pulseaudio-ctl
 pulseaudio-zeroconf
+>extra ffmpeg
+>extra grilo-plugins
+>extra gst-libav
+>extra gst-plugins-bad
+>extra gst-plugins-base
+>extra gst-plugins-good
+>extra gst-plugins-ugly
+>extra libdvdcss
 
 
 # Applications
-gthumb
-evince
-chromium
->extra geary
-gedit
-file-roller
 guake
 nautilus
-nautilus-admin
-nautilus-empty-file
+software-center-web-jak # for url handler's and discover
+>extra nautilus-admin
+>extra nautilus-empty-file
 >extra dconf-editor
->extra slack-web-jak
->extra skype-web-jak
->extra whatsapp-web-jak
->extra microsoft-office-web-jak
 >extra lxrandr
-vlc
+>extra vlc
 >extra lightdm-gtk-greeter-settings
-gufw
+>extra gufw
 >extra deja-dup
 >extra syncthing-gtk
-software-center-web-jak # for url handler's and discover
 >extra hardinfo
+>extra gthumb
+>extra evince
+>extra geary
+>extra gedit
+>extra file-roller
 
 
 ## Startup and shutdown
 lightdm
 lightdm-gtk-greeter
+accountsservice
 >extra bootsplash-systemd
 >extra bootsplash-theme-manjaro
-accountsservice
 
 
 ## Network
@@ -73,36 +68,19 @@ networkmanager-pptp
 networkmanager-vpnc
 mobile-broadband-provider-info
 modemmanager
-avahi
 networkmanager
 ntp
 openresolv
+>extra avahi
 
 
 ## Base
 manjaro-jade-settings
 gnome-keyring
-manjaro-browser-settings
-manjaro-settings-manager-notifier
 manjaro-hotfixes
 manjaro-hello
-mousetweaks
-nss-mdns
-numlockx
-powertop
 >basic squashfs-tools
-openssh
-tracker
-tracker-miners
 >basic disable-tracker
-inxi
->extra dunst-notify-speech
-dmidecode
->extra gtkhash-nautilus
-fprintd #need for finger id reader
-lxqt-powermanagement
-blueberry
-usb_modeswitch
 xdg-user-dirs
 xdg-user-dirs-gtk
 xdg-utils
@@ -113,15 +91,43 @@ xf86-input-void
 xorg-server
 xorg-xinit
 >extra xf86-input-wacom #support for tablet and pen display ( wacom ecc. )
+>extra manjaro-settings-manager-notifier
+>extra mousetweaks
+>extra nss-mdns
+>extra numlockx
+>extra powertop
+>extra inxi
+>extra dunst-notify-speech
+>extra dmidecode
+>extra gtkhash-nautilus
+>extra fprintd #need for finger id reader
+>extra lxqt-powermanagement
+>extra blueberry
+>extra usb_modeswitch
+>extra openssh
+>extra manjaro-browser-settings
+
+#extra depends for file-roller
+>extra gnome-getting-started-docs
+>extra p7zip
+>extra unrar
+>extra unace
+>extra lrzip
+>extra gtk3-print-backends
+>extra manjaro-documentation-en
+>extra manjaro-printer
+>extra simple-scan 
+>extra ffmpegthumbnailer
+>extra kernel-alive
 
 
 ## Package management
->extra apparmor
 pamac-gtk
 >extra snapd
 >extra snapd-glib
 >extra pamac-snap-plugin
 >extra pamac-flatpak-plugin
+>extra apparmor
 
 
 ## Java
@@ -135,21 +141,6 @@ ttf-roboto
 adobe-source-code-pro-fonts
 
 
-#extra depends for file-roller
->extra gnome-getting-started-docs
->extra p7zip
->extra unrar
->extra unace
->extra lrzip
->extra gtk3-print-backends
->extra manjaro-documentation-en
-#>x86_64 >extra steam-manjaro
->extra manjaro-printer
->extra simple-scan 
->extra ffmpegthumbnailer
->extra kernel-alive
-
-
 ## AUR Support/Development
 # Missing base-devel packages
 #>extra autoconf
diff --git a/community/webdad/live-overlay/etc/calamares/modules/netinstall-applications.conf b/community/webdad/live-overlay/etc/calamares/modules/netinstall-applications.conf
new file mode 100644
index 0000000..5495957
--- /dev/null
+++ b/community/webdad/live-overlay/etc/calamares/modules/netinstall-applications.conf
@@ -0,0 +1,54 @@
+---
+# This is the URL that is retrieved to get the netinstall groups-and-packages
+# data (which should be in the format described in netinstall.yaml), e.g.:
+#   groupsUrl: http://example.org/netinstall.php
+# or it can be a locally installed file:
+#   groupsUrl: file:///usr/share/calamares/netinstall.yaml
+#
+# Note that the contents of the groups file is the **important**
+# part of the configuration of this module. It specifies what
+# the user may select and what commands are to be run.
+#
+# The format of the groups file is documented in `README.md`.
+#
+# As a special case, setting *groupsUrl* to the literal string
+# `local` means that the data is obtained from **this** config
+# file, under the key *groups*.
+#
+groupsUrl: file:///etc/calamares/modules/netinstall-applications.yaml
+
+# If the installation can proceed without netinstall (e.g. the Live CD
+# can create a working installed system, but netinstall is preferred
+# to bring it up-to-date or extend functionality) leave this set to
+# false (the default). If set to true, the netinstall data is required.
+#
+# This only has an effect if the netinstall data cannot be retrieved,
+# or is corrupt: having "required" set, means the install cannot proceed.
+required: true
+
+# To support multiple instances of this module,
+# some strings are configurable and translatable here.
+# - *sidebar* This is the name of the module in the progress-tree / sidebar
+#   in Calamares.
+# - *title* This is displayed above the list of packages.
+# If no *sidebar* values are provided, defaults to "Package selection"
+# and existing translations. If no *title* values are provided, no string
+# is displayed.
+#
+# The following strings are already known to Calamares and can be
+# listed here in *untranslated* form (e.g. as value of *sidebar*)
+# without bothering with the translations: they are picked up from
+# the regular translation framework:
+#   - "Package selection"
+#   - "Office software"
+#   - "Office package"
+#   - "Browser software"
+#   - "Browser package"
+#   - "Web browser"
+label:
+    sidebar: "Applications"
+    sidebar[nl]: "Applicaties"
+    sidebar[ja]: "アプリケーション"
+    title: "Applications"
+    title[nl]: "Applicaties"
+    title[ja]: "アプリケーション"
diff --git a/community/webdad/live-overlay/etc/calamares/modules/netinstall-applications.yaml b/community/webdad/live-overlay/etc/calamares/modules/netinstall-applications.yaml
new file mode 100644
index 0000000..020e448
--- /dev/null
+++ b/community/webdad/live-overlay/etc/calamares/modules/netinstall-applications.yaml
@@ -0,0 +1,177 @@
+- name: "Web Browser"
+  description: "Choose your default browser"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: true
+  packages:
+    - chromium
+    - firefox
+    - opera
+    - brave
+    
+- name: "Communication"
+  description: "Communication apps"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - slack-web-jak
+    - skype-web-jak
+    - whatsapp-web-jak
+    - telegram-desktop
+    - discord
+    
+- name: "Office"
+  description: "Choose a office suite"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - calligra
+    - libreoffice-fresh
+    - microsoft-office-web-jak
+    - freeoffice
+    
+- name: "Steam"
+  description: "Steam Goodies"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - steam-manjaro
+    - linux-steam-integration
+    - game-devices-udev
+
+- name: "Design"
+  description: "Design Software"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - inkscape
+    - gimp
+    - fontforge
+    - mypaint
+
+- name: "Video Edit"
+  description: "Video Editing Software"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - pitivi
+    - openshot
+    - kdenlive
+
+- name: "Development"
+  description: "Development Software"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - atom
+    - code
+    - meld
+    - pycharm-community-edition
+
+- name: "Virtualization"
+  description: "Virtualbox"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - virtualbox
+    - virtualbox-host-dkms
+    - linux-headers
+
+- name: "Base Defaults"
+  description: "Leave it as it is if you not sure"
+  critical: false
+  hidden: true
+  selected: true
+  expanded: false
+  packages:
+    ## Connect Packages
+    - android-tools
+    - android-udev
+    - gvfs
+    - gvfs-google
+    - gvfs-afc
+    - gvfs-gphoto2
+    - gvfs-mtp
+    - gvfs-nfs
+    - gvfs-smb
+    - mtpfs
+    - udiskie
+    - udisks2
+    ## Libraries for Sound/Audio/Video
+    - ffmpeg
+    - grilo-plugins
+    - gst-libav
+    - gst-plugins-bad
+    - gst-plugins-base
+    - gst-plugins-good
+    - gst-plugins-ugly
+    - libdvdcss
+    # Applications
+    - nautilus-admin
+    - nautilus-empty-file
+    - dconf-editor
+    - lxrandr
+    - vlc
+    - lightdm-gtk-greeter-settings
+    - gufw
+    - deja-dup
+    - syncthing-gtk
+    - hardinfo
+    - gthumb
+    - evince
+    - geary
+    - gedit
+    - file-roller
+    ## Startup and shutdown
+    - bootsplash-systemd
+    - bootsplash-theme-manjaro
+    # Base
+    - xf86-input-wacom #support for tablet and pen display ( wacom ecc. )
+    - manjaro-settings-manager-notifier
+    - mousetweaks
+    - nss-mdns
+    - numlockx
+    - powertop
+    - inxi
+    - dunst-notify-speech
+    - dmidecode
+    - gtkhash-nautilus
+    - fprintd #need for finger id reader
+    - lxqt-powermanagement
+    - blueberry
+    - usb_modeswitch
+    - openssh
+    - manjaro-browser-settings
+    # Extra depends for file-roller
+    - gnome-getting-started-docs
+    - p7zip
+    - unrar
+    - unace
+    - lrzip
+    - gtk3-print-backends
+    - manjaro-documentation-en
+    - manjaro-printer
+    - simple-scan 
+    - ffmpegthumbnailer
+    - kernel-alive
+    ## Package management
+    - snapd
+    - snapd-glib
+    - pamac-snap-plugin
+    - pamac-flatpak-plugin
+    - apparmor
\ No newline at end of file
diff --git a/community/webdad/live-overlay/etc/calamares/settings.conf b/community/webdad/live-overlay/etc/calamares/settings.conf
new file mode 100644
index 0000000..8a68e3b
--- /dev/null
+++ b/community/webdad/live-overlay/etc/calamares/settings.conf
@@ -0,0 +1,53 @@
+modules-search: [ local ]
+
+
+instances:
+- id:       applications
+  module:   netinstall
+  config:   netinstall-applications.conf
+
+
+sequence:
+- show:
+  - welcome
+  - locale
+  - keyboard
+  - partition
+  - users
+  - netinstall@applications
+  - summary
+- exec:
+  - partition
+  - mount
+  - unpackfs
+  - machineid
+  - fstab
+  - locale
+  - keyboard
+  - localecfg
+  - luksopenswaphookcfg
+  - luksbootkeyfile
+  - plymouthcfg
+  - initcpiocfg
+  - initcpio
+  - users
+  - displaymanager
+  - mhwdcfg
+  - networkcfg
+  - hwclock
+  - services
+  - grubcfg
+  - bootloader
+  - postcfg
+  - umount
+- show:
+  - finished
+
+
+branding: manjaro
+prompt-install: false
+dont-chroot: false
+# oem-setup: true
+disable-cancel: false
+disable-cancel-during-exec: false
+quit-at-end: false
diff --git a/community/webdad/profile.conf b/community/webdad/profile.conf
index 4361d7a..98dafa1 100644
--- a/community/webdad/profile.conf
+++ b/community/webdad/profile.conf
@@ -6,7 +6,7 @@
 #multilib="true"
 
 # use extra packages as defined in pkglist to activate a full profile
-extra="true"
+extra="false"
 
 ################ install ################
 
@@ -31,7 +31,7 @@ custom_boot_args="'quiet'"
 #oem_used="true"
 
 # configure calamares for netinstall
-# netinstall="false"
+netinstall="true"
 
 # configure calamares to use chrootcfg instead of unpackfs
 # chrootcfg="false"