Merge pull request #10 from artix-linux/devel

Devel

Makefile

@@ -0,0 +1,87 @@
+Version=0.4
+
+PREFIX = /usr/local
+SYSCONFDIR = /etc
+
+SHARED = \
+	$(wildcard base/Packages-*) \
+	$(wildcard base/*.example)
+
+INFO = \
+	repo_info
+
+LIVE_ETC = \
+	base/live-overlay/etc/issue \
+	base/live-overlay/etc/fstab
+
+LIVE_ETC_DEFAULT = \
+	$(wildcard base/live-overlay/etc/default/*)
+
+LIVE_ETC_PAM = \
+	$(wildcard base/live-overlay/etc/pam.d/*)
+
+LIVE_ETC_SUDOERS = \
+	$(wildcard base/live-overlay/etc/sudoers.d/*)
+
+LXQT = \
+	$(wildcard lxqt/Packages-*) \
+	lxqt/profile.conf
+
+CINNAMON = \
+	$(wildcard cinnamon/Packages-*) \
+	cinnamon/profile.conf
+
+CINNAMON_LIGHTDM = \
+	$(wildcard cinnamon/desktop-overlay/etc/lightdm/*.conf)
+
+install_base:
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles
+	install -m0644 ${INFO} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles
+
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
+	install -m0644 ${SHARED} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
+
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc
+	install -m0644 ${LIVE_ETC} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc
+
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default
+	install -m0644 ${LIVE_ETC_DEFAULT} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default
+
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/pam.d
+	install -m0644 ${LIVE_ETC_PAM} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/pam.d
+
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/sudoers.d
+	install -m0644 ${LIVE_ETC_SUDOERS} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/sudoers.d
+
+install_profiles:
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/lxqt
+	install -m0644 ${LXQT} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/lxqt
+
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/cinnamon
+	install -m0644 ${CINNAMON} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/cinnamon
+
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/cinnamon/desktop-overlay/etc/lightdm
+	install -m0644 ${CINNAMON_LIGHTDM} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/cinnamon/desktop-overlay/etc/lightdm
+
+uninstall_base:
+	for f in ${INFO}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/$$f; done
+	for f in ${SHARED}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/$$f; done
+	for f in ${LIVE_ETC}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/$$f; done
+	for f in ${LIVE_ETC_DEFAULT}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default/$$f; done
+	for f in ${LIVE_ETC_PAM}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/pam.d/$$f; done
+	for f in ${LIVE_ETC_SUDOERS}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/sudoers.d/$$f; done
+
+uninstall_profiles:
+	for f in ${LXQT}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/lxqt/$$f; done
+	for f in ${CINNAMON}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/cinnamon/$$f; done
+	for f in ${CINNAMON_LIGHTDM}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/cinnamon/desktop-overlay/etc/lightdm/$$f; done
+
+install: install_base install_profiles
+
+uninstall: uninstall_base uninstall_profiles
+
+dist:
+	git archive --format=tar --prefix=iso-profiles-$(Version)/ $(Version) | gzip -9 > iso-profiles-$(Version).tar.gz
+	gpg --detach-sign --use-agent iso-profiles-$(Version).tar.gz
+
+.PHONY: install uninstall dist

base/Packages-Live

@@ -1,3 +1,10 @@
+calamares
+mkinitcpio-nfs-utils
+nbd
+>openrc artix-live-openrc
+squashfs-tools
+artix-live-portable-efi
+partitionmanager
 virtualbox-guest-modules-artix
 virtualbox-guest-utils
 open-vm-tools

base/Packages-Root

@@ -42,7 +42,6 @@ man-db
 man-pages
 memtest86+
 mkinitcpio
->multilib gcc-libs-multilib
 nano
 ntfs-3g
 >openrc acpid-openrc

base/netgroups/netgroups-openrc.yaml

@@ -147,7 +147,7 @@
         - dmraid
   - name: "apps"
     description: "Utilities packages"
-    selected: true
+    selected: false
     hidden: false
     critical: false
     packages:
@@ -203,8 +203,8 @@
     packages:
         - displaymanager-openrc
         - artix-sddm-theme
-  - name: 'lxqt-basic'
-    description: 'lxqt basic'
+  - name: 'lxqt'
+    description: 'lxqt desktop'
     selected: false
     hidden: false
     critical: false
@@ -234,26 +234,57 @@
         - qps
         - qupzilla
         - network-manager-applet
-        - artix-lxqt-basic-presets
+        - artix-lxqt-presets
         - xdg-user-dirs
         - xdg-utils
-  - name: 'lxqt-extra'
-    description: 'lxqt extra'
-    selected: false
-    hidden: false
-    critical: false
-    packages:
         - lximage-qt
         - vlc
-        - qpdfview
-        - artix-lxqt-extra-presets
         - gvfs-afc
         - gvfs-gphoto2
         - gvfs-mtp
         - gvfs-nfs
         - gvfs-smb
-        - qt5-styleplugins
         - lxappearance
+  - name: 'cinnamon'
+    description: 'cinnamon desktop'
+    selected: false
+    hidden: false
+    critical: false
+    packages:
+        - accountsservice
+        - caribou
+        - cinnamon-settings-daemon
+        - cinnamon-session
+        - cinnamon-translations
+        - cjs
+        - clutter-gtk
+        - gnome-backgrounds
+        - gnome-themes-standard
+        - gstreamer
+        - libgnome-keyring
+        - libkeybinder3
+        - librsvg
+        - muffin
+        - python2-cairo
+        - python-dbus
+        - python2-dbus
+        - python2-pillow
+        - python2-pam
+        - python2-pexpect
+        - python2-pyinotify
+        - python2-lxml
+        - cinnamon-control-center
+        - cinnamon-screensaver
+        - cinnamon-menus
+        - libgnomekbd
+        - network-manager-applet
+        - nemo
+        - polkit-gnome
+        - xapps
+        - python2-gobject
+        - gedit
+        - gnome-terminal
+        - blueberry
 
 - name: 'fonts'
   description: 'Fonts'
@@ -291,3 +322,4 @@
         - cups-openrc
         - cups-filters
         - cups-pdf
+        - system-config-printer

base/profile.conf.example

@@ -2,12 +2,6 @@
 ###### use this file in the profile ######
 ##########################################
 
-# use multilib packages; x86_64 only
-# multilib="true"
-
-# use extra packages as defined in pkglist to activate a full profile
-# extra="false"
-
 ################ install ################
 
 # default displaymanager: none
@@ -17,12 +11,6 @@
 # Set to false to disable autologin in the livecd
 # autologin="true"
 
-# configure calamares for netinstall
-# netinstall="false"
-
-# configure calamares to use chrootcfg instead of unpackfs; default: unpackfs
-# chrootcfg="false"
-
 # service runlevels
 # openrc_boot=('elogind')
 # openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')

cinnamon/Packages-Desktop

@@ -0,0 +1,30 @@
+alsa-firmware
+artix-cinnamon-presets
+dmidecode
+inxi
+cinnamon
+media-player-info
+modemmanager
+nss-mdns
+>openrc alsa-utils-openrc
+>openrc avahi-openrc
+>openrc displaymanager-openrc
+>openrc json-c
+>openrc networkmanager-openrc
+>openrc ntp-openrc
+>openrc openrc-settingsd
+>openrc openssh-openrc
+>openrc syslog-ng-openrc
+powertop
+terminus-font
+ttf-bitstream-vera
+ttf-dejavu
+ttf-droid
+ttf-inconsolata
+ttf-indic-otf
+ttf-liberation
+xdg-user-dirs
+xdg-utils
+xorg-server
+xorg-twm
+xorg-xinit

cinnamon/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf

@@ -0,0 +1,12 @@
+[greeter]
+background = /usr/share/backgrounds/artix.jpg
+font-name = Cantarell 11
+xft-antialias = true
+icon-theme-name = Adwaita
+theme-name = Adwaita
+cursor-theme-name = Adwaita
+show-clock = true
+default-user-image = /usr/share/icons/foo.png
+xft-hintstyle = hintfull
+position = 50%,center 50%,center
+panel-position = top

cinnamon/profile.conf

@@ -0,0 +1,26 @@
+################ install ################
+
+# default displaymanager: none
+# supported; lightdm, sddm, gdm, lxdm, mdm
+displaymanager="lightdm"
+
+# Set to false to disable autologin in the livecd
+# autologin="true"
+
+# service runlevels
+# openrc_boot=('elogind')
+# openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
+
+# unset defaults to given values
+# addgroups="video,power,storage,optical,network,lp,scanner,wheel,users"
+
+################# live-session #################
+
+# unset defaults to given value
+# hostname="artix"
+
+# unset defaults to given value
+# username="artix"
+
+# unset defaults to given value
+# password="artix"

lxqt/Packages-Desktop

@@ -1,14 +1,13 @@
 alsa-firmware
 artix-sddm-theme
->basic artix-lxqt-basic-presets
+artix-lxqt-presets
 compton
 #compton-conf
 dmidecode
->extra artix-lxqt-extra-presets
->extra lximage-qt
->extra qpdfview
->extra qupzilla
->extra vlc
+#lximage-qt
+#qpdfview
+#qupzilla
+#vlc
 gvfs
 inxi
 #juffed-qt5

lxqt/desktop-overlay/etc/sddm.conf

@@ -1,39 +0,0 @@
-[Autologin]
-Relogin=false
-Session=
-User=
-
-[General]
-HaltCommand=/usr/bin/loginctl poweroff
-Numlock=none
-RebootCommand=/usr/bin/loginctl reboot
-
-[Theme]
-Current=artix
-CursorTheme=breeze_cursors
-FacesDir=/usr/share/sddm/faces
-ThemeDir=/usr/share/sddm/themes
-
-[Users]
-DefaultPath=/bin:/usr/bin:/usr/local/bin
-HideShells=
-HideUsers=
-MaximumUid=60000
-MinimumUid=1000
-RememberLastSession=true
-RememberLastUser=true
-
-[WaylandDisplay]
-SessionCommand=/usr/share/sddm/scripts/wayland-session
-SessionDir=/usr/share/wayland-sessions
-
-[XDisplay]
-DisplayCommand=/usr/share/sddm/scripts/Xsetup
-DisplayStopCommand=/usr/share/sddm/scripts/Xstop
-MinimumVT=7
-ServerArguments=-nolisten tcp
-ServerPath=/usr/bin/X
-SessionCommand=/usr/share/sddm/scripts/Xsession
-SessionDir=/usr/share/xsessions
-XauthPath=/usr/bin/xauth
-XephyrPath=/usr/bin/Xephyr

lxqt/profile.conf

@@ -1,13 +1,3 @@
-##########################################
-###### use this file in the profile ######
-##########################################
-
-# use multilib packages; x86_64 only
-multilib="false"
-
-# use extra packages as defined in pkglist to activate a full profile
-# extra="true"
-
 ################ install ################
 
 # default displaymanager: none
@@ -17,12 +7,6 @@ displaymanager="sddm"
 # Set to false to disable autologin in the livecd
 # autologin="true"
 
-# configure calamares for netinstall
-netinstall="true"
-
-# configure calamares to use chrootcfg instead of unpackfs
-chrootcfg="true"
-
 # service runlevels
 # openrc_boot=('elogind')
 # openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')

shared/Packages-Live

@@ -1,6 +0,0 @@
-calamares
-mkinitcpio-nfs-utils
-nbd
->openrc artix-live-openrc
-squashfs-tools
-artix-live-portable-efi