Add cryptsetup-runit

This reverts commit d94172218e.

Makefile

@@ -1,89 +0,0 @@
-VERSION=0.8
-
-PKG = iso-profiles
-TOOLS = artools
-ifdef PREFIX
-PREFIX = /usr/local
-endif
-SYSCONFDIR = /etc
-PROFDIR = $(PREFIX)/share/$(TOOLS)/$(PKG)
-
-BASEDIR = $(PROFDIR)/base
-OVERLAYDIR = $(BASEDIR)/live-overlay$(SYSCONFDIR)
-LXQTDIR = $(PROFDIR)/lxqt
-LXDEDOR = $(PROFDIR)/lxde
-
-DMODE = -dm0755
-FMODE = -m0644
-RM = rm -f
-RMD = rm -fr --one-file-system
-
-BASE = \
-	$(wildcard base/Packages-*) \
-	base/profile.conf
-
-LIVE = \
-	base/live-overlay/etc/fstab \
-	base/live-overlay/etc/issue
-
-LIVE_DEFAULT = \
-	$(wildcard base/live-overlay/etc/default/*)
-
-LIVE_PAM = \
-	$(wildcard base/live-overlay/etc/pam.d/*)
-
-LIVE_SUDOERS = \
-	$(wildcard base/live-overlay/etc/sudoers.d/*)
-
-LXQT = \
-	$(wildcard lxqt/Packages-*) \
-	lxqt/profile.conf
-
-LXQT_DM = \
-	lxqt/desktop-overlay/etc/sddm.conf
-
-install-base:
-	install $(DMODE) $(DESTDIR)$(BASEDIR)
-	install $(FMODE) $(BASE) $(DESTDIR)$(BASEDIR)
-
-	install $(DMODE) $(DESTDIR)$(OVERLAYDIR)
-	install $(FMODE) $(LIVE) $(DESTDIR)$(OVERLAYDIR)
-
-	install $(DMODE) $(DESTDIR)$(OVERLAYDIR)/default
-	install $(FMODE) $(LIVE_DEFAULT) $(DESTDIR)$(OVERLAYDIR)/default
-
-	install $(DMODE) $(DESTDIR)$(OVERLAYDIR)/pam.d
-	install $(FMODE) $(LIVE_PAM) $(DESTDIR)$(OVERLAYDIR)/pam.d
-
-	install $(DMODE) $(DESTDIR)$(OVERLAYDIR)/sudoers.d
-	install $(FMODE) $(LIVE_SUDOERS) $(DESTDIR)$(OVERLAYDIR)/sudoers.d
-
-install-lxqt:
-	install $(DMODE) $(DESTDIR)$(LXQTDIR)
-	install $(FMODE) $(LXQT) $(DESTDIR)$(LXQTDIR)
-	install $(DMODE)  $(DESTDIR)$(LXQTDIR)$(SYSCONFDIR)
-	install $(FMODE) $(LXQT_DM) $(DESTDIR)$(LXQTDIR)$(SYSCONFDIR)
-
-uninstall-base:
-	for f in $(notdir $(BASE)); do $(RM) $(DESTDIR)$(BASEDIR)/$$f; done
-	for f in $(notdir $(LIVE)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/$$f; done
-	for f in $(notdir $(LIVE_DEFAULT)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/default/$$f; done
-	for f in $(notdir $(LIVE_PAM)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/pam.d/$$f; done
-	for f in $(notdir $(LIVE_SUDOERS)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/sudoers.d/$$f; done
-	$(RMD) $(DESTDIR)$(BASEDIR)
-
-uninstall-lxqt:
-	for f in $(notdir $(LXQT)); do $(RM) $(DESTDIR)$(LXQTDIR)/$$f; done
-	for f in $(notdir $(LXQT_DM)); do $(RM) $(DESTDIR)$(LXQTDIR)$(SYSCONFDIR)/$$f; done
-	$(RMD) $(DESTDIR)$(LXQTDIR)
-
-install: install-lxqt install-base
-
-uninstall: uninstall-lxqt uninstall-base
-
-dist:
-	git archive --format=tar --prefix=$(PKG)-$(VERSION)/ $(VERSION) | gzip -9 > $(PKG)-$(VERSION).tar.gz
-	gpg --detach-sign --use-agent $(PKG)-$(VERSION).tar.gz
-
-.PHONY: install uninstall dist install-lxqt install-base uninstall-lxqt uninstall-base
-

base/Packages-Live

@@ -2,6 +2,17 @@ mkinitcpio-nfs-utils
 squashfs-tools
 nbd
 
->openrc artix-live-openrc
+@openrc artix-live-openrc
->runit artix-live-runit
+@runit artix-live-runit
 artix-live-portable-efi
+
+@openrc networkmanager-openrc
+@openrc ntp-openrc
+@openrc bluez-openrc
+
+@runit networkmanager-runit
+@runit ntp-runit
+@runit bluez-runit
+
+intel-ucode
+amd-ucode

base/Packages-Root

@@ -24,8 +24,8 @@ glibc
 grep
 grub
 gzip
+htop
 inetutils
-#intel-ucode
 iproute2
 iptables
 iputils
@@ -45,30 +45,34 @@ mkinitcpio-openswap
 nano
 net-tools
 ntfs-3g
->openrc acpid-openrc
+@openrc acpid-openrc
->openrc cronie-openrc
+@openrc cronie-openrc
->openrc cryptsetup-openrc
+@openrc cryptsetup-openrc
->openrc dhcpcd-openrc
+@openrc dhcpcd-openrc
->openrc haveged-openrc
+@openrc haveged-openrc
->openrc lvm2-openrc
+@openrc lvm2-openrc
->openrc mdadm-openrc
+@openrc mdadm-openrc
->openrc nfs-utils-openrc
+@openrc nfs-utils-openrc
->openrc rsync-openrc
+@openrc rsync-openrc
->openrc wpa_supplicant-openrc
+@openrc openssh-openrc
->runit acpid-runit
+@openrc wpa_supplicant-openrc
->runit cronie-runit
+@openrc syslog-ng-openrc
->runit dhcpcd-runit
+@runit acpid-runit
->runit haveged-runit
+@runit cronie-runit
->runit lvm2-runit
+@runit cryptsetup-runit
->runit mdadm-runit
+@runit dhcpcd-runit
->runit nfs-utils-runit
+@runit haveged-runit
->runit rsync-runit
+@runit lvm2-runit
->runit wpa_supplicant-runit
+@runit mdadm-runit
+@runit nfs-utils-runit
+@runit rsync-runit
+@runit openssh-runit
+@runit wpa_supplicant-runit
+@runit syslog-ng-runit
 artix-sysvcompat
 os-prober
 pacman
 pciutils
-pcmciautils
 perl
 procps-ng
 psmisc
@@ -85,5 +89,4 @@ util-linux
 which
 efibootmgr
 xfsprogs
-zd1211-firmware
 zsh

base/live-overlay/etc/polkit-1/rules.d/90-live.rules

@@ -0,0 +1,8 @@
+/* Allow members of the wheel group to execute any actions
+ * without password authentication, similar to "sudo NOPASSWD:"
+ */
+polkit.addRule(function(action, subject) {
+    if (subject.isInGroup("wheel")) {
+        return polkit.Result.YES;
+    }
+});

base/live-overlay/etc/sudoers.d/u_root

@@ -0,0 +1 @@
+root ALL=(ALL) ALL

base/profile.conf

@@ -2,24 +2,24 @@
 
 # default displaymanager: none
 # supported: lightdm, sddm, gdm, lxdm, mdm
-# displaymanager="none"
+# DISPLAYMANAGER="none"
 
 # Set to false to disable autologin in the livecd
-autologin="false"
+AUTOLOGIN="false"
 
 # start services
-# services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
+# SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
 
 # default group membership
-# addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,log"
+# ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"
 
 ################# live-session #################
 
 # default value
-# hostname="artix"
+# HOST_NANE="artix"
 
 # default value
-# username="artix"
+# USER_NAME="artix"
 
 # default value
-# password="artix"
+# PASSWORD="artix"

lxqt/Packages-Desktop

@@ -9,35 +9,29 @@ modemmanager
 network-manager-applet
 nss-mdns
 
->openrc alsa-utils-openrc
+@openrc alsa-utils-openrc
->openrc avahi-openrc
+@openrc avahi-openrc
->openrc displaymanager-openrc
+@openrc displaymanager-openrc
->openrc json-c
+@openrc json-c
->openrc networkmanager-openrc
+@openrc networkmanager-openrc
->openrc ntp-openrc
+@openrc ntp-openrc
->openrc openrc-settingsd
+@openrc openrc-settingsd
->openrc openssh-openrc
+@openrc bluez-openrc
->openrc syslog-ng-openrc
->openrc bluez-openrc
 
->runit alsa-utils-runit
+@runit alsa-utils-runit
->runit avahi-runit
+@runit avahi-runit
->runit sddm-runit
+@runit sddm-runit
->runit json-c
+@runit json-c
->runit networkmanager-runit
+@runit networkmanager-runit
->runit ntp-runit
+@runit ntp-runit
->runit openssh-runit
+@runit bluez-runit
->runit syslog-ng-runit
->runit bluez-runit
 
 librabbitmq-c
 libmongoc
-#python
 
 lxqt
 
 compton
-#compton-conf
 lximage-qt
 qpdfview
 gvfs
@@ -47,6 +41,8 @@ pcmanfm-qt
 falkon
 xarchiver
 
+vlc
+
 terminus-font
 ttf-bitstream-vera
 ttf-dejavu

lxqt/Packages-Live

@@ -2,8 +2,8 @@ mkinitcpio-nfs-utils
 squashfs-tools
 nbd
 
->openrc artix-live-openrc
+@openrc artix-live-openrc
->runit artix-live-runit
+@runit artix-live-runit
 artix-live-portable-efi
 
 calamares-branding
@@ -12,5 +12,10 @@ partitionmanager
 
 virtualbox-guest-modules-artix
 virtualbox-guest-utils
-open-vm-tools
+#open-vm-tools
 broadcom-wl
+
+intel-ucode
+amd-ucode
+artix-docs
+konversation

lxqt/live-overlay/etc/default

@@ -0,0 +1 @@
+../../../base/live-overlay/etc/default

lxqt/live-overlay/etc/fstab

@@ -0,0 +1 @@
+../../../base/live-overlay/etc/fstab

lxqt/live-overlay/etc/issue

@@ -0,0 +1 @@
+../../../base/live-overlay/etc/issue

lxqt/live-overlay/etc/pam.d

@@ -0,0 +1 @@
+../../../base/live-overlay/etc/pam.d

lxqt/live-overlay/etc/polkit-1

@@ -0,0 +1 @@
+../../../base/live-overlay/etc/polkit-1

lxqt/live-overlay/etc/skel/.config/konversationrc

@@ -0,0 +1,131 @@
+[Aliases]
+AliasList=cmd /exec cmd,sysinfo /exec sysinfo,tinyurl /exec tinyurl,uptime /exec uptime,media /exec media,audio /exec media audio,video /exec media video,gauge /exec gauge,mail /exec mail,fortune /exec fortune,bug /exec bug,sayclip /exec sayclip
+
+[Appearance]
+ChannelSplitterSizes=376,156
+TopicSplitterSizes=28,585
+TreeSplitterSizes=145,756
+
+[Autoreplace List]
+Direction0=o
+Direction1=o
+Pattern0=\\[\\[([^\\s]+)\\]\\]#
+Pattern1=(BUG:|bug:)([0-9]+)#
+Regex0=1
+Regex1=1
+Replace0=http://en.wikipedia.org/wiki/Special:Search?go=Go&search=%1#
+Replace1=https://bugs.kde.org/show_bug.cgi?id=%2#
+
+[BanList ViewSettings]
+ColumnSortDescending=false
+ColumnSorted=0
+ColumnWidths=100,100,100
+
+[Button List]
+Button0=Op,/OP %u%n
+Button1=DeOp,/DEOP %u%n
+Button2=WhoIs,/WHOIS %s,%%u%n
+Button3=Version,/CTCP %s,%%u VERSION%n
+Button4=Kick,/KICK %u%n
+Button5=Ban,/BAN %u%n
+Button6=Part,/PART %c Leaving...%n
+Button7=Quit,/QUIT Leaving...%n
+
+[Channel 0]
+EnableNotifications=true
+Name=#artix
+Password=
+
+[ChannelOptionsDialog]
+Size=724,536
+SplitterSizes=230,192
+
+[DCC Settings]
+ColumnWidths=49,90,103,173,70,87,157,87,96,165
+IPv4FallbackIface=0
+PanelSplitter=AAAA/wAAAAEAAAACAAAAVAAAAPMB/////wEAAAACAA==
+
+[Flags]
+EncryptionType=1
+
+[General Options]
+ShowTrayIcon=true
+TrayNotify=true
+
+[Highlight List]
+HighlightSoundsEnabled=true
+
+[Identity 0]
+AuthType=nickserv
+AutomaticAway=false
+AutomaticUnaway=false
+AwayInactivity=10
+AwayMessage=
+AwayNick=
+AwayReason=Gone away for now
+Bot=nickserv
+Codec=UTF-8
+Ident=artix-live
+InsertRememberLineOnAway=false
+KickReason=User terminated!
+Nicknames=artix-live-01,artix-live-02,artix-live-03,artix-live-04,artix-live-05,artix-live-06,artix-live-07,artix-live-08,artix-live-09,artix-live-10,artix-live-11,artix-live-12,artix-live-13,artix-live-14,artix-live-15,artix-live-16,artix-live-17,artix-live-18,artix-live-19,artix-live-20,artix-live-21,artix-live-22,artix-live-23,artix-live-24,artix-live-25,artix-live-26,artix-live-27,artix-live-28,artix-live-29,artix-live-30,artix-live-31,artix-live-32,artix-live-33,artix-live-34,artix-live-35,artix-live-36,artix-live-37,artix-live-38,artix-live-39,artix-live-40,artix-live-41,artix-live-42,artix-live-43,artix-live-44,artix-live-45,artix-live-46,artix-live-47,artix-live-48,artix-live-49,artix-live-50
+NickservCommand=identify
+PartReason=Konversation terminated!
+Password=
+PemClientCertFile=
+PreShellCommand=
+QuitReason=Konversation terminated!
+Realname=artix-live
+ReturnMessage=
+SaslAccount=
+ShowAwayMessage=false
+
+[MainWindow]
+Height 768=705
+State=AAAA/wAAAAD9AAAAAAAAAqcAAAKMAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgAAAAAA/////wAAAAAAAAAA
+ToolBarsMovable=Disabled
+Width 1366=679
+
+[Notification Messages]
+ChannelListNoServerSelected=1
+ChannelListWarning=1
+ClearLogfileQuestion=1
+CloseQueryAfterIgnore=1
+HideMenuBarWarning=1
+HideOnCloseInfo=0
+IgnoreNick=1
+Invitation=0
+QuitChannelTab=1
+QuitDCCChatTab=1
+QuitQueryTab=1
+QuitServerTab=1
+QuitWithActiveDccTransfers=1
+ReconnectWithDifferentServer=1
+ReuseExistingConnection=1
+SaveLogfileNote=1
+UnignoreNick=1
+WarnEncodingConflict=1
+systemtrayquitKonversation=1
+
+[Server 0]
+BypassProxy=true
+Password=
+Port=7000
+SSLEnabled=true
+Server=chat.freenode.net
+
+[ServerGroup 0]
+AutoConnect=true
+AutoJoinChannels=Channel 0
+ChannelHistory=Channel 1,Channel 2,Channel 3,Channel 4,Channel 5
+ConnectCommands=
+EnableNotifications=true
+Expanded=true
+Identity=Standardidentität
+Name=freenode
+NotifyList=
+ServerList=Server 0
+
+[ServerListDialog]
+ServerListHeaderState=\x00\x00\x00<30>\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01<30>\x00\x00\x00\x03\x00\x01\x00\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00<30><30><EFBFBD><EFBFBD><EFBFBD>\x00\x00\x00<30>\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00d\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00<30>\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00<30>\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x03<30>\x01\x00\x00\x00<30>
+Size=533,274

lxqt/live-overlay/etc/skel/.local/share/konversation/bookmarks.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xbel>
+<xbel xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks" xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info" xmlns:kdepriv="http://www.kde.org/kdepriv" dbusName="konversation">
+ <bookmark href="irc://freenode/">
+  <title>freenode</title>
+  <info>
+   <metadata owner="http://freedesktop.org">
+    <bookmark:icon name=""/>
+   </metadata>
+  </info>
+ </bookmark>
+ <bookmark href="ircs://freenode/artix">
+  <title>#artix-unregistered (freenode)</title>
+  <info>
+   <metadata owner="http://freedesktop.org">
+    <bookmark:icon name=""/>
+   </metadata>
+  </info>
+ </bookmark>
+</xbel>

lxqt/live-overlay/etc/sudoers.d

@@ -0,0 +1 @@
+../../../base/live-overlay/etc/sudoers.d

lxqt/profile.conf

@@ -2,27 +2,24 @@
 
 # default displaymanager: none
 # supported: lightdm, sddm, gdm, lxdm, mdm
-displaymanager="sddm"
+DISPLAYMANAGER="sddm"
 
 # Set to false to disable autologin in the livecd
-# autologin="true"
+# AUTOLOGIN="true"
 
 # start services
-# services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
+# SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
 
 # default group membership
-# addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,log"
+# ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"
-
-# calamares netgroups
-# netgroups_url="https://raw.githubusercontent.com/artix-linux/netgroups/master"
 
 ################# live-session #################
 
 # unset defaults to given value
-# hostname="artix"
+# HOST_NAME="artix"
 
 # unset defaults to given value
-# username="artix"
+# USER_NAME="artix"
 
 # unset defaults to given value
-# password="artix"
+# PASSWORD="artix"