move netinstaller to gitlab repo

community/webdad/Packages-Desktop

@@ -1,3 +1,6 @@
+# All extra packages are also part of netinstaller
+# https://gitlab.manjaro.org/packages/community/jade/calamares/-/blob/master/netinstall-applications.yaml
+
 ## Connect Packages
 >extra android-tools
 >extra android-udev
@@ -31,7 +34,7 @@ pulseaudio-zeroconf
 >extra libdvdcss
 
 
-# Applications
+## Applications
 guake
 nautilus
 software-center-web-jak # for url handler's and discover
@@ -62,19 +65,20 @@ accountsservice
 
 ## Network
 netctl
-networkmanager-openconnect
-networkmanager-openvpn
-networkmanager-pptp
-networkmanager-vpnc
 mobile-broadband-provider-info
 modemmanager
 networkmanager
 ntp
 openresolv
 >extra avahi
+>extra networkmanager-openconnect
+>extra networkmanager-openvpn
+>extra networkmanager-pptp
+>extra networkmanager-vpnc
 
 
 ## Base
+manjaro-settings-manager-notifier
 manjaro-jade-settings
 gnome-keyring
 manjaro-hotfixes
@@ -90,7 +94,7 @@ xf86-input-libinput
 xf86-input-void
 xorg-server
 xorg-xinit
->extra xf86-input-wacom #support for tablet and pen display ( wacom ecc. )
+>extra xf86-input-wacom # Support for tablet and pen display ( wacom ecc. )
 >extra manjaro-settings-manager-notifier
 >extra mousetweaks
 >extra nss-mdns
@@ -107,7 +111,7 @@ xorg-xinit
 >extra openssh
 >extra manjaro-browser-settings
 
-#extra depends for file-roller
+# Dependencies for file-roller
 >extra gnome-getting-started-docs
 >extra p7zip
 >extra unrar
@@ -140,26 +144,3 @@ pamac-gtk
 ttf-roboto
 adobe-source-code-pro-fonts
 
-
-## AUR Support/Development
-# Missing base-devel packages
-#>extra autoconf
-#>extra automake
-#>extra binutils
-#>extra bison
-#>extra fakeroot
-#>extra flex
-#>extra gcc
-#>extra >multilib gcc-libs-multilib
-#>extra >multilib gcc-multilib
-#>extra libtool
-#>extra m4
-#>extra make
-#>extra patch
-#>extra pkg-config
-#>extra >multilib lib32-flex
-# Extra packages for AUR support
-#>extra git
-#>extra patchutils
-#>extra subversion
-

community/webdad/live-overlay/etc/calamares/modules/netinstall-applications.conf

@@ -1,54 +1,6 @@
 ---
-# This is the URL that is retrieved to get the netinstall groups-and-packages
+groupsUrl: https://gitlab.manjaro.org/packages/community/jade/calamares-netinstall-settings/-/raw/master/netinstall-applications.yaml
-# 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: "Software"
-    sidebar[nl]: "Applicaties"
+
-    sidebar[ja]: "アプリケーション"
-    title: "Applications"
-    title[nl]: "Applicaties"
-    title[ja]: "アプリケーション"

community/webdad/live-overlay/etc/calamares/modules/netinstall-applications.yaml

@@ -1,177 +0,0 @@
-- 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

community/webdad/live-overlay/etc/calamares/modules/webview.conf

@@ -0,0 +1,3 @@
+---
+prettyName: "Release Notes"
+url:        "https://arcolinux.info/getting-to-know-arcolinux-d-b/"

community/webdad/live-overlay/etc/calamares/settings.conf

@@ -10,11 +10,11 @@ instances:
 sequence:
 - show:
   - welcome
+  - users
   - locale
   - keyboard
-  - partition
-  - users
   - netinstall@applications
+  - partition
   - summary
 - exec:
   - partition

community/webdad/profile.conf

@@ -6,6 +6,8 @@
 #multilib="true"
 
 # use extra packages as defined in pkglist to activate a full profile
+# for remote netinstall, comment line 388(write_settings_conf "$1") in /usr/lib/manjaro-tools/util-yaml.sh 
+# or if netinstall is not wanted turn extra=true and delete /livefs/etc/calamares/settings.conf
 extra="false"
 
 ################ install ################