feat: update comp-neuro image

- make it leaner by limiting to comp neuro tools only, and removing
  extra analysis tools (which users can install when required)

Signed-off-by: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>

fedora-arm-base.ks

@@ -1,76 +0,0 @@
-#keyboard us
-lang en_US.UTF-8
-selinux --enforcing
-firewall --enabled --service=mdns,ssh
-
-bootloader --extlinux --location=mbr
-
-part /boot/efi --size=80 --fstype vfat --asprimary
-part /boot --size=512 --fstype ext4 --asprimary
-
-# make sure that initial-setup runs and lets us do all the configuration bits
-firstboot --reconfig
-
-services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup
-
-%include fedora-repo.ks
-
-%packages
-@core
-@standard
-@hardware-support
-
-kernel
-# remove this in %post
-dracut-config-generic
--dracut-config-rescue
-# install tools needed to manage and boot arm systems
-@arm-tools
--uboot-images-armv8
-chrony
-extlinux-bootloader
-bcm283x-firmware
-initial-setup
-initial-setup-gui
--iwl*
--ipw*
--usb_modeswitch
-#lets resize / on first boot
-# dracut-modules-growroot
-
-# make sure all the locales are available for inital0-setup and anaconda to work
-glibc-all-langpacks
-%end
-
-%post
-
-# Setup Raspberry Pi firmware
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
-
-# work around for poor key import UI in PackageKit
-rm -f /var/lib/rpm/__db*
-releasever=$(rpm --eval '%{fedora}')
-basearch=armhfp
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-echo "Packages within this ARM disk image"
-rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
-
-# remove random seed, the newly installed instance should make it's own
-rm -f /var/lib/systemd/random-seed
-
-# Because memory is scarce resource in most arm systems we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-dnf -y remove dracut-config-generic
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-%end

fedora-arm-kde.ks

@@ -1,12 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-kde-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=6300
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%post
-
-%end

fedora-arm-lxde.ks

@@ -1,12 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-lxde-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=4300
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%post
-
-%end

fedora-arm-lxqt.ks

@@ -1,17 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-lxqt-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=4400
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%packages
-# trojita not available on non-x86 platforms
--trojita
-%end
-
-%post
-
-%end

fedora-arm-mate.ks

@@ -1,12 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-mate-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=7168
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%post
-
-%end

fedora-arm-minimal.ks

@@ -1,4 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-minimal-common.ks
-
-part / --size=1600 --fstype ext4

fedora-arm-python-classroom.ks

@@ -1,30 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# The ARM Workstion based Python Classroom Lab
-
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-workstation-common.ks
-%include fedora-python-classroom-gnome-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=7000
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%packages
--initial-setup
--initial-setup-gui
--libvirt*
--gnome-boxes
-
-%end
-
-%post
-# Most of the ARM X accelerated drivers need some level of CMA allocation
-sed -i 's/\(append .*\)/\1 cma=256MB/' /boot/extlinux/extlinux.conf
-
-%end
-

fedora-arm-server.ks

@@ -1,30 +0,0 @@
-%include fedora-arm-base.ks
-
-# server defaults to xfs for / so lets do so on arm also
-part / --size=2500 --fstype xfs
-
-%packages
-fedora-release-server
-# install the default groups for the server environment since installing the environment is not working
-@server-product
-@standard
-@headless-management
-@hardware-support
-@networkmanager-submodules
-
-@container-management
-@domain-client
--initial-setup-gui
--generic-release*
-%end
-
-%post
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-%end
-

fedora-arm-soas.ks

@@ -1,12 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-soas-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=3400
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%post
-
-%end

fedora-arm-workstation.ks

@@ -1,22 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-workstation-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=6200
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%packages
--initial-setup
--initial-setup-gui
--libvirt*
--gnome-boxes
-
-%end
-
-%post
-# Most of the ARM X accelerated drivers need some level of CMA allocation
-sed -i 's/\(append .*\)/\1 cma=256MB/' /boot/extlinux/extlinux.conf
-
-%end

fedora-arm-xbase.ks

@@ -1,17 +0,0 @@
-%packages
-@base-x
-@fonts
-@input-methods
-@multimedia
-@printing
-epiphany
-%end
-
-%post
-# Most of the ARM X accelerated drivers need some level of CMA allocation
-sed -i 's/\(append .*\)/\1 cma=192MB/' /boot/extlinux/extlinux.conf
-
-# Explicitly set graphical.target as default as this is how initial-setup detects which version to run
-ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
-
-%end

fedora-arm-xfce.ks

@@ -1,12 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-xfce-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=6000
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%post
-
-%end

fedora-cinnamon-common.ks

@@ -18,6 +18,6 @@ parole
 rhythmbox
 
 # extra backgrounds
-f33-backgrounds-extras-gnome
+f35-backgrounds-extras-gnome
 
 %end

fedora-cloud-base-gcp.ks

@@ -9,9 +9,16 @@
 # Don't show bootloader as it's impossible for the user to get to it in time
 # So we might as well not waste the 1 second on each boot.
 # https://cloud.google.com/compute/docs/import/import-existing-image
-bootloader --timeout=0 --append="no_timer_check net.ifnames=0 console=ttyS0,38400n8d"
+bootloader --timeout=0 --location=mbr --append="no_timer_check net.ifnames=0 console=ttyS0,38400n8d"
+
+# redefine `services` here to drop cloud-init systemd unit enablements from
+# fedora-cloud-base.ks since we don't use them.
+services --enabled=sshd
 
 %packages
+# GCP provides its own guest environment.
+google-compute-engine-guest-configs
+-cloud-init
 # Fedora Cloud Base includes the qemu guest agent. GCP prefers
 # that it not be installed  https://pagure.io/cloud-sig/issue/319
 -qemu-guest-agent

fedora-cloud-base-vagrant.ks

@@ -19,7 +19,7 @@ rootpw vagrant
 # even on VirtualBox virt, we get a primary network device with "eth0" as the name
 # This simplifies things and allows a single disk image for both supported Vagrant
 # platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
+bootloader --timeout=1 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
 
 %packages
 # The default koji Vagrantfile configuration uses rsync to sync files between

fedora-cloud-base.ks

@@ -32,13 +32,20 @@ rootpw --lock --iscrypted locked
 firewall --disabled
 
 # We pass net.ifnames=0 because we always want to use eth0 here on all the cloud images.
-bootloader --timeout=1 --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
+bootloader --timeout=1 --location=mbr --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
 
 services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
-zerombr
-clearpart --all
-autopart --noboot --nohome --noswap --nolvm
+# Configure for gpt with bios+uefi
+clearpart --all --initlabel --disklabel=gpt
+part prepboot  --size=4    --fstype=prepboot
+part biosboot  --size=1    --fstype=biosboot
+part /boot/efi --size=100  --fstype=efi
+part /boot     --size=500  --fstype=ext4 --label=boot
+part btrfs.007 --size=2000 --fstype=btrfs --grow
+btrfs none --label=fedora btrfs.007
+btrfs /home --subvol --name=home LABEL=fedora
+btrfs /     --subvol --name=root LABEL=fedora
 
 %include fedora-repo.ks
 
@@ -76,13 +83,14 @@ qemu-guest-agent
 # No need for firewalld for now. We don't have a firewall on by default.
 -firewalld
 
-# noswap on Cloud for now
--zram-generator-defaults
-
 # Don't include the geolite2 databases, which end up with 66MiB
 # in /usr/share/GeoIP
 -geolite2-country
 -geolite2-city
+
+# Include dependencies for cloud-init on Azure.
+gdisk
+openssl
 %end
 ##### end package list ###############################################
 
@@ -90,6 +98,15 @@ qemu-guest-agent
 ##### begin kickstart post ###########################################
 %post --erroronfail
 
+if [ "$(arch)" = "x86_64" ]; then
+# Set up legacy BIOS boot if we booted from UEFI
+grub2-install --target=i386-pc /dev/vda
+fi
+
+# Blivet sets pmbr_boot flag erroneously and we need to purge it
+# otherwise it'll fail to boot
+parted /dev/vda disk_set pmbr_boot off
+
 # linux-firmware is installed by default and is quite large. As of mid 2020:
 #   Total download size: 97 M
 #   Installed size: 268 M
@@ -110,16 +127,27 @@ basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
 echo "Zeroing out empty space."
+# Create zeros file with nodatacow and no compression
+touch /var/tmp/zeros
+chattr +C /var/tmp/zeros
 # This forces the filesystem to reclaim space from deleted files
 dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"
+# Force sync to disk (Cf. https://pagure.io/cloud-sig/issue/340#comment-743430)
+btrfs filesystem sync /
+rm -f /var/tmp/zeros
+btrfs filesystem sync /
 
 # When we build the image a networking config file gets left behind.
 # Let's clean it up.
 echo "Cleanup leftover networking configuration"
 rm -f /etc/NetworkManager/system-connections/*.nmconnection
 
+# Truncate the /etc/resolv.conf left over from NetworkManager during the
+# kickstart. This causes delays in boot with cloud-init because the
+# 192.168.122.1 DNS server cannot be reached.
+truncate -s 0 /etc/resolv.conf
+
 # Clear machine-id on pre generated images
 truncate -s 0 /etc/machine-id
 

fedora-comp-neuro-common.ks

@@ -1,7 +1,7 @@
 # Description: Packages for the NeuroFedora computational neuroscience lab image.
-# 
+#
 # Maintained by the NeuroFedora SIG:
-# https://fedoraproject.org/wiki/SIGs/NeuroFedora
+# https://neuro.fedoraproject.org
 # mailto:neuro-sig@lists.fedoraproject.org
 
 %packages
@@ -9,41 +9,21 @@ fedora-release-compneuro
 # Includes numpy, scipy, jupyter, pandas, scikit, scipy, statsmodels, sympy, matplotlib
 @python-science
 
-# Add julia and R
-R
-julia
-
 #Computational neuroscience packages
 arbor
-auryn-mpich
-auryn-openmpi
-bionetgen
-calcium-calculator
-COPASI
-qalculate
-getdp
 genesis-simulator
-gnuplot
 moose
 nest
 neuron
-octave
-# paraview
+neuron-devel
 python3
 python3-brian2
-python-brian2-doc
 python3-ipython
+python3-lfpy
 python3-nest
 python3-netpyne
 python3-neuron
-python3-libNeuroML
-python3-neo
-# Currently broken in rawhide
-# python3-nineml
-# python-nineml-doc
-python3-PyLEMS
-python-PyLEMS-doc
+python3-pynn
 python3-steps
-smoldyn
 
 %end

fedora-container-base.ks

@@ -11,10 +11,8 @@ tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
 dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
-sssd-client
 sudo
 -glibc-langpack-en
--cracklib-dicts
 -langpacks-en
 %end
 

fedora-container-common.ks

@@ -18,7 +18,8 @@
 
 text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
 bootloader --disabled
-timezone --isUtc --nontp Etc/UTC
+timezone --isUtc Etc/UTC
+timesource --ntp-disable
 rootpw --lock --iscrypted locked
 keyboard us
 network --bootproto=dhcp --device=link --activate --onboot=on
@@ -35,8 +36,6 @@ bash
 coreutils
 glibc-minimal-langpack
 rpm
-shadow-utils
-sssd-client
 util-linux
 -kernel
 -dosfstools
@@ -49,6 +48,10 @@ util-linux
 -trousers
 -xkeyboard-config
 -grubby
+-langpacks-en_GB
+# https://bugzilla.redhat.com/show_bug.cgi?id=1951111
+-util-linux
+-sssd-client
 
 %end
 

fedora-design-suite-common.ks

@@ -4,8 +4,6 @@
 
 # Identify as Fedora Design Suite
 fedora-release-designsuite
-fedora-release-identity-designsuite
--fedora-release-workstation
 
 # Provides backup application
 deja-dup
@@ -15,7 +13,7 @@ deja-dup-nautilus
 gnome-books
 gnome-calendar
 gnome-photos
-gnome-shell-extension-pomodoro
+gnome-pomodoro
 gnome-todo
 
 # Add cosmetic for terminal

fedora-disk-base.ks

@@ -34,6 +34,8 @@ firstboot --reconfig
 @hardware-support
 
 kernel
+# on 32bit arm make sure we only install one kernel
+-kernel-lpae
 # remove this in %post
 dracut-config-generic
 -dracut-config-rescue
@@ -74,23 +76,20 @@ releasever=$(rpm --eval '%{fedora}')
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
 rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
 
 # remove random seed, the newly installed instance should make it's own
 rm -f /var/lib/systemd/random-seed
 
 # The enp1s0 interface is a left over from the imagefactory install, clean this up
-rm -f /etc/sysconfig/network-scripts/ifcfg-enp1s0
+rm -f /etc/NetworkManager/system-connections/*.nmconnection
 
 dnf -y remove dracut-config-generic
 
-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
 touch /etc/machine-id
 
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
 %end

fedora-disk-kde.ks

@@ -2,16 +2,4 @@
 %include fedora-disk-xbase.ks
 %include fedora-kde-common.ks
 
-bootloader --append="cma=256MB"
-
-services --enabled=sshd,NetworkManager,chronyd
-
 autopart --type=btrfs --noswap
-
-%packages
-
-%end
-
-%post
-
-%end

fedora-disk-python-classroom.ks

@@ -0,0 +1,20 @@
+# Maintained by the Fedora Python SIG:
+# http://fedoraproject.org/wiki/SIGs/Python
+# mailto:python-devel@lists.fedoraproject.org
+
+# The Workstion based Python Classroom Lab
+
+%include fedora-disk-base.ks
+%include fedora-disk-xbase.ks
+%include fedora-workstation-common.ks
+%include fedora-python-classroom-gnome-common.ks
+
+autopart --type=btrfs --noswap
+
+%packages
+-initial-setup
+-initial-setup-gui
+-libvirt*
+-gnome-boxes
+
+%end

fedora-disk-soas.ks

@@ -0,0 +1,5 @@
+%include fedora-disk-base.ks
+%include fedora-disk-xbase.ks
+%include fedora-soas-common.ks
+
+autopart --type=btrfs --noswap

fedora-disk-workstation.ks

@@ -2,10 +2,6 @@
 %include fedora-disk-xbase.ks
 %include fedora-workstation-common.ks
 
-bootloader --append="cma=256MB"
-
-services --enabled=sshd,NetworkManager,chronyd
-
 autopart --type=btrfs --noswap
 
 %packages
@@ -13,7 +9,3 @@ autopart --type=btrfs --noswap
 -initial-setup-gui
 
 %end
-
-%post
-
-%end

fedora-disk-xbase.ks

@@ -5,6 +5,7 @@
 @multimedia
 @printing
 -@guest-desktop-agents
+initial-setup-gui
 
 # Need aajohan-comfortaa-fonts for the SVG rnotes images
 aajohan-comfortaa-fonts

fedora-disk-xfce.ks

@@ -2,16 +2,4 @@
 %include fedora-disk-xbase.ks
 %include fedora-xfce-common.ks
 
-bootloader --append="cma=192MB"
-
-services --enabled=sshd,NetworkManager,chronyd
-
 autopart --type=btrfs --noswap
-
-%packages
-
-%end
-
-%post
-
-%end

fedora-eln-container-base.ks

@@ -45,7 +45,6 @@ yum  # DNF compatibility with yum
 sssd-client
 sudo
 -glibc-langpack-en
--cracklib-dicts
 -langpacks-en
 %end
 

fedora-eln-guest.ks

@@ -9,7 +9,6 @@ keyboard us
 timezone --utc America/New_York
 # add console and reorder in %post
 bootloader --timeout=1 --location=mbr --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0"
-auth --enableshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=ssh
 network --bootproto=dhcp --device=link --activate --onboot=on
@@ -162,18 +161,11 @@ echo -n "Getty fixes"
 sed -i '/^#NAutoVTs=.*/ a\
 NAutoVTs=0' /etc/systemd/logind.conf
 
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
 # For cloud images, 'eth0' _is_ the predictable device name, since
 # we don't want to be tied to specific virtual (!) hardware
 rm -f /etc/udev/rules.d/70*
 ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
-rm -f /etc/sysconfig/network-scripts/ifcfg-*
+rm -f /etc/NetworkManager/system-connections/*.nmconnection
 # simple eth0 config, again not hard-coded to the build hardware
 cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
 DEVICE="eth0"

fedora-i3-common.ks

@@ -0,0 +1,35 @@
+# fedora-livecd-i3.ks
+#
+# Description:
+# - Fedora Live Spin with the tiling window manager i3wm
+#
+# Maintainer(s):
+# - Nasir Hussain    <nasirhm@fedoraproject.org>
+# - Eduard Lucena    <x3mboy@fedoraproject.org>
+# - Justin W. Flory  <jwf@fedoraproject.org>
+# - Dan Cermak       <defolos@fedoraproject.org>
+
+
+%packages
+@^i3-desktop-environment
+feh
+dex-autostart
+thunar
+
+
+# unlock default keyring. FIXME: Should probably be done in comps
+gnome-keyring-pam
+# Admin tools are handy to have
+@admin-tools
+wget
+# Better more popular browser
+system-config-printer
+
+# save some space
+-autofs
+-acpid
+-gimp-help
+-desktop-backgrounds-basic
+-aspell-*                   # dictionaries are big
+
+%end

fedora-iot.ks

@@ -87,8 +87,7 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"
 
-# For trac ticket https://pagure.io/atomic-wg/issue/128
-rm -f /etc/sysconfig/network-scripts/ifcfg-*
+rm -f /etc/NetworkManager/system-connections/*.nmconnection
 
 # Anaconda is writing an /etc/resolv.conf from the install environment.
 # The system should start out with an empty file, otherwise cloud-init

fedora-kde-common.ks

@@ -6,7 +6,10 @@
 @firefox
 @kde-apps
 @kde-media
-@kde-office
+@libreoffice
+# add libreoffice-draw and libreoffice-math (pagureio:fedora-kde/SIG#103)
+libreoffice-draw
+libreoffice-math
 
 fedora-release-kde
 
@@ -14,9 +17,6 @@ fedora-release-kde
 
 ### The KDE-Desktop
 
-### Browser
-falkon
-
 ### fixes
 
 # use kde-print-manager instead of system-config-printer
@@ -34,15 +34,15 @@ kde-l10n
 # don't include these for now to fit on a cd
 -desktop-backgrounds-basic
 -kdeaccessibility*
-#-ktorrent			# kget has also basic torrent features (~3 megs)
+-ktorrent			# kget has also basic torrent features (~3 megs)
 -digikam			# digikam has duplicate functionality with gwenview (~28 megs)
-#-amarok 			# ~23 megs (mysql-embedded etc.)
 -kipi-plugins			# ~8 megs + drags in Marble
+-krusader			# ~4 megs
+-k3b				# ~15 megs
+
 #-kdeplasma-addons		# ~16 megs
-#-krusader			# ~4 megs
 
 # Additional packages that are not default in kde-* groups, but useful
-k3b				# ~15 megs
 #kdeartwork			# only include some parts of kdeartwork
 fuse
 mediawriter

fedora-live-astronomy_kde.ks

@@ -54,7 +54,7 @@ kstars
 # misc. astronomy
 #celestia
 stellarium
-virtualplanet
+#virtualplanet
 
 # Some astro environment stuff
 astronomy-menus
@@ -94,10 +94,8 @@ python3-photutils
 python3-pyvo
 python3-reproject
 python3-sep
-python3-wcsaxes
 
 # matplotlib backends
-python3-matplotlib-qt4
 python3-matplotlib-qt5
 python3-matplotlib-tk
 
@@ -110,9 +108,6 @@ boinc-client
 boinc-manager
 
 #Version control- a GUI for each as well
-
-# Installing rapidsvn will also install subversion package
-rapidsvn 
 git
 git-gui
 
@@ -125,14 +120,14 @@ kst-fits
 LabPlot
 
 #Misc. Utils
-# icedtea-web to have webstart useful for VO tools
-icedtea-web
 ImageMagick
 kate
 kate-plugins
 rlwrap
 screen
-plasma-applet-redshift-control
+
+# Java JRE for VO tools
+java
 
 # Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
 -kde-l10n-*

fedora-live-base.ks

@@ -187,9 +187,6 @@ systemctl --no-reload disable mdmonitor-takeover.service 2> /dev/null || :
 systemctl stop mdmonitor.service 2> /dev/null || :
 systemctl stop mdmonitor-takeover.service 2> /dev/null || :
 
-# don't enable the gnome-settings-daemon packagekit plugin
-gsettings set org.gnome.software download-updates 'false' || :
-
 # don't start cron/at as they tend to spawn things which are
 # disk intensive that are painful on a live image
 systemctl --no-reload disable crond.service 2> /dev/null || :

fedora-live-comp_neuro.ks

@@ -2,7 +2,7 @@
 # https://fedoraproject.org/wiki/Changes/Comp_Neuro_Lab
 #
 # Maintained by the NeuroFedora SIG:
-# https://fedoraproject.org/wiki/SIGs/NeuroFedora
+# https://neuro.fedoraproject.org
 # mailto:neuro-sig@lists.fedoraproject.org
 
 %include fedora-live-workstation.ks

fedora-live-design_suite.ks

@@ -12,9 +12,6 @@
 part / --size 14336
 
 %post
-#Override the favorite desktop application in Dash
-sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'pitivi.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']/" /etc/rc.d/init.d/livesys
-
 # Add link to lists of tutorials
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
@@ -68,4 +65,7 @@ FOE
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
+#Override the favorite desktop application in Dash
+sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'pitivi.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']/" /etc/rc.d/init.d/livesys
+
 %end

fedora-live-i3.ks

@@ -0,0 +1,59 @@
+# fedora-livecd-i3.ks
+#
+# Description:
+# - Fedora Live Spin with the tiling window manager i3
+#
+# Maintainer(s):
+# - Nasir Hussain    <nasirhm@fedoraproject.org>
+# - Eduard Lucena    <x3mboy@fedoraproject.org>
+# - Dan Cermak       <defolos@tummy.com>
+# - Justin W. Flory  <jwf@fedoraproject.org>
+
+%include fedora-live-base.ks
+%include fedora-live-minimization.ks
+%include fedora-i3-common.ks
+
+%post
+# xfce configuration
+
+# create /etc/sysconfig/desktop (needed for installation)
+
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/i3
+DISPLAYMANAGER=/usr/sbin/lightdm
+EOF
+
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+# deactivate xfconf-migration (#683161)
+rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
+
+# set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
+
+# set i3 as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=i3/' /etc/lightdm/lightdm.conf
+
+# Show harddisk install on the desktop
+sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+mkdir /home/liveuser/Desktop
+
+# this goes at the end after all other changes.
+chown -R liveuser:liveuser /home/liveuser
+restorecon -R /home/liveuser
+
+# setting the wallpaper
+echo "/usr/bin/feh --bg-scale /usr/share/backgrounds/default.png" >> /home/liveuser/.profile
+
+# echoing type liveinst to start the installer
+echo "echo 'Please type liveinst and press Enter to start the installer'" >> /home/liveuser/.bashrc
+
+# fixing the installer non opening bug
+echo "xhost si:localuser:root" >> /home/liveuser/.profile
+
+EOF
+
+%end
+

fedora-live-jam_kde.ks

@@ -7,7 +7,7 @@
 # Web: https://fedoraproject.org/wiki/Fedora_jam
 # Web: insert spinspacke when created
 
-# Maintainer: Erich Eickmeyer <erich@ericheickmeyer.com>
+# Maintainer: JT Pennington (q5sys) <jt@obs-sec.com>
 
 %include fedora-live-kde.ks
 

fedora-live-kde-base.ks

@@ -22,15 +22,22 @@ EOF
 # add initscript
 cat >> /etc/rc.d/init.d/livesys << EOF
 
+# are we *not* able to use wayland sessions?
+if strstr "\`cat /proc/cmdline\`" nomodeset ; then
+PLASMA_SESSION_FILE="plasmax11.desktop"
+else
+PLASMA_SESSION_FILE="plasma.desktop"
+fi
+
 # set up autologin for user liveuser
 if [ -f /etc/sddm.conf ]; then
 sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
-sed -i 's/^#Session=.*/Session=plasma.desktop/' /etc/sddm.conf
+sed -i "s/^#Session=.*/Session=\${PLASMA_SESSION_FILE}/" /etc/sddm.conf
 else
 cat > /etc/sddm.conf << SDDM_EOF
 [Autologin]
 User=liveuser
-Session=plasma.desktop
+Session=\${PLASMA_SESSION_FILE}
 SDDM_EOF
 fi
 
@@ -55,9 +62,10 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF
 
-# Disable plasma-pk-updates (bz #1436873 and 1206760)
-echo "Removing plasma-pk-updates package."
-rpm -e plasma-pk-updates
+# "Disable plasma-discover-notifier"
+mkdir -p /home/liveuser/.config/autostart
+cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/
+echo 'Hidden=true' >> /home/liveuser/.config/autostart/org.kde.discover.notifier.desktop
 
 # Disable baloo
 cat > /home/liveuser/.config/baloofilerc << BALOO_EOF

fedora-live-kde.ks

@@ -12,7 +12,7 @@
 %include fedora-kde-minimization.ks
 
 # DVD payload
-part / --size=7000
+part / --size=7200
 
 %post
 %end

fedora-live-robotics.ks

@@ -59,7 +59,6 @@ mercurial
 
 # Help and art can be big, too
 -gnome-user-docs
--gnome-getting-started-docs
 -evolution-help
 -desktop-backgrounds-basic
 -*backgrounds-extras

fedora-live-soas.ks

@@ -4,7 +4,8 @@
 # - A Sugar environment that you can carry in your pocket
 #
 # Maintainers:
-# - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Chihurumnaya Ibiam <ibiamchihurumnaya AT gmail DOT com>
+# - Alex Perez <aperez AT alexperez DOT com>
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks

fedora-live-workstation.ks

@@ -66,6 +66,11 @@ FOE
     cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
   fi
 
+  # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen
+  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+welcome-dialog-last-shown-version='4294967295'
+FOE
+
   # Copy Anaconda branding in place
   if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
     cp -a /usr/share/lorax/product/* /

fedora-neuro-gnome-common.ks

@@ -1,7 +1,7 @@
 # Description: Common gnome based configuration for NeuroFedora spin images.
 #
 # Maintained by the NeuroFedora SIG:
-# https://fedoraproject.org/wiki/SIGs/NeuroFedora
+# https://neuro.fedoraproject.org
 # mailto:neuro-sig@lists.fedoraproject.org
 
 # Please specify the individual package sets in their own ks files:

fedora-python-classroom-common.ks

@@ -27,6 +27,7 @@ wget
 -python3.6
 -python3.7
 -python3.8
+-python3.9
 -pypy
 
 # Remove LaTeX, see https://bugzilla.redhat.com/show_bug.cgi?id=1862450

fedora-python-classroom-gnome-common.ks

@@ -58,7 +58,6 @@ python3-pillow-tk
 
 # Help and art can be big, too
 -gnome-user-docs
--gnome-getting-started-docs
 -desktop-backgrounds-basic
 -*backgrounds-extras
 

fedora-scientific-common.ks

@@ -43,7 +43,7 @@ python3-networkx
 python3-pandas
 
 # matplotlib backends
-python3-matplotlib-qt4
+python3-matplotlib-qt5
 python3-matplotlib-tk
 
 # Include Java development tools
@@ -61,12 +61,6 @@ julia
 julia-doc
 julia-devel
 
-# IDEs for the IDE folks
-@eclipse
-
-# Workaround for https://pagure.io/releng/issue/7814
--eclipse-linuxtools-vagrant
-
 python3-spyder
 python3-spyder-kernels
 

fedora-soas-common.ks

@@ -4,7 +4,8 @@
 # - A Sugar environment that you can carry in your pocket
 #
 # Maintainers:
-# - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Chihurumnaya Ibiam <ibiamchihurumnaya AT gmail DOT com>
+# - Alex Perez <aperez AT alexperez DOT com>
 
 firewall --enabled --service=mdns,presence
 
@@ -104,6 +105,7 @@ show-logout=false
 [org.sugarlabs.power]
 automatic=true
 EOF
+
 /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 
 %end

maintainers.toml

@@ -28,11 +28,11 @@ fas = [ "cwickert", "mtasaka" ]
 maintainers = [ "Christoph Wickert", "Mamoru TASAKA" ]
 
 [spins.soas.x86_64]
-fas = [ "chimosky", "aperezbios", "pbrobinson" ]
-maintainers = [ "Chihurumnaya Ibiam", "Alex Perez", "Peter Robinson" ]
+fas = [ "chimosky", "aperezbios" ]
+maintainers = [ "Chihurumnaya Ibiam", "Alex Perez" ]
 [spins.soas.armhfp]
-fas = [ "chimosky", "aperezbios", "pbrobinson" ]
-maintainers = [ "Chihurumnaya Ibiam", "Alex Perez", "Peter Robinson" ]
+fas = [ "chimosky", "aperezbios", ]
+maintainers = [ "Chihurumnaya Ibiam", "Alex Perez", ]
 
 [labs.astronomy_kde.x86_64]
 fas = [ "lupinix" ]
@@ -55,8 +55,8 @@ fas = [ "dagostinelli" ]
 maintainers = [ "Darryl T. Agostinelli" ]
 
 [labs.jam_kde.x86_64]
-fas = [ "eeickmeyer" ]
-maintainers = [ "Erich Eickmeyer" ]
+fas = [ "q5sys" ]
+maintainers = [ "JT Pennington" ]
 
 [labs.python_classroom.x86_64]
 fas = [ "churchyard", "python-sig" ]
@@ -73,3 +73,7 @@ maintainers = [ "SciTech SIG" ]
 [labs.robotics.x86_64]
 fas = [ "rmattes", "robotics-sig" ]
 maintainers = [ "Rich Mattes", "Robotics SIG" ]
+
+[spins.i3.x86_64]
+fas = [ "jflory7", "defolos", "nasirhm", "odilhao", "x3mboy" ]
+maintainers = [ "Justin Flory", "Dan Čermák", "Nasir Hussain", "Odilon Junior", "Eduard Lucena" ]