diff --git a/build-pkg-docker.sh b/build-pkg-docker.sh index 1e6e4ce..4cb4ef5 100755 --- a/build-pkg-docker.sh +++ b/build-pkg-docker.sh @@ -52,7 +52,7 @@ function main() { # done # Stage1 - build-and-push xorg-meta de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo || return $? + build-and-push xorg-meta de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-sddm-autologin-placeholder de-p1st-sddm-autologin-yoda de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo || return $? # Stage2 build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns || return $? # Stage3 diff --git a/build-pkg.sh b/build-pkg.sh index 3bbf04d..12bb063 100755 --- a/build-pkg.sh +++ b/build-pkg.sh @@ -82,7 +82,7 @@ function main() { done else # Stage1 - build-and-push xorg-meta de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo || return $? + build-and-push xorg-meta de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-sddm-autologin-placeholder de-p1st-sddm-autologin-yoda de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo || return $? # Stage2 build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns || return $? # Stage3 diff --git a/pkg/de-p1st-installer/PKGBUILD b/pkg/de-p1st-installer/PKGBUILD index 7eed206..80191fb 100644 --- a/pkg/de-p1st-installer/PKGBUILD +++ b/pkg/de-p1st-installer/PKGBUILD @@ -3,7 +3,7 @@ _pkgname=installer _reponame=arch pkgname="de-p1st-$_pkgname" pkgver=0.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Bash script to install Arch Linux" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" diff --git a/pkg/de-p1st-installer/installer.cfg b/pkg/de-p1st-installer/installer.cfg index 35f0ff2..b608152 100644 --- a/pkg/de-p1st-installer/installer.cfg +++ b/pkg/de-p1st-installer/installer.cfg @@ -4,7 +4,7 @@ # STATIC_IP=123.456.789.012 # IPV6_CAPABLE=1 HOSTNAME=yodaTest -USERNAME=arch +USERNAME=yoda # one should rather enter these interactively than saving in this cfg USER_PWD=test diff --git a/pkg/de-p1st-sddm-autologin-placeholder/PKGBUILD b/pkg/de-p1st-sddm-autologin-placeholder/PKGBUILD new file mode 100644 index 0000000..f8b0f09 --- /dev/null +++ b/pkg/de-p1st-sddm-autologin-placeholder/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Daniel Langbein +_pkgname=sddm-autologin-placeholder +_reponame=arch +pkgname="de-p1st-$_pkgname" +pkgver=0.0.1 +pkgrel=1 +pkgdesc="sddm autologin configuration example" +arch=('any') +url="https://codeberg.org/privacy1st/${_reponame}" +license=('MIT') +depends=('sddm') +makedepends=('git') +install='.install' +source=("git+${url}.git") +sha256sums=('SKIP') +provides=('de-p1st-sddm-autologin') +conflicts=('de-p1st-sddm-autologin') + +package() { + cd "${_reponame}/pkg/${pkgname}" + + install -Dm0644 p1st-autologin.conf "$pkgdir"/etc/sddm.conf.d/p1st-autologin.conf +} diff --git a/pkg/de-p1st-sddm-autologin-placeholder/p1st-autologin.conf b/pkg/de-p1st-sddm-autologin-placeholder/p1st-autologin.conf new file mode 100644 index 0000000..618b6e0 --- /dev/null +++ b/pkg/de-p1st-sddm-autologin-placeholder/p1st-autologin.conf @@ -0,0 +1,7 @@ +[Autologin] +# Relogin=false +## The desktop session: For example "xfce" or "plasma" +## -> ls /usr/share/xsessions/ /usr/share/wayland-sessions/ | sed 's|.desktop$||' +# Session=xfce +## Your username +# User=yoda diff --git a/pkg/de-p1st-sddm-autologin-yoda/PKGBUILD b/pkg/de-p1st-sddm-autologin-yoda/PKGBUILD new file mode 100644 index 0000000..f0342a9 --- /dev/null +++ b/pkg/de-p1st-sddm-autologin-yoda/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Daniel Langbein +_pkgname=sddm-autologin-yoda +_reponame=arch +pkgname="de-p1st-$_pkgname" +pkgver=0.0.1 +pkgrel=1 +pkgdesc="sddm autologin for user yoda" +arch=('any') +url="https://codeberg.org/privacy1st/${_reponame}" +license=('MIT') +depends=('sddm') +makedepends=('git') +install='.install' +source=("git+${url}.git") +sha256sums=('SKIP') +provides=('de-p1st-sddm-autologin') +conflicts=('de-p1st-sddm-autologin') + +package() { + cd "${_reponame}/pkg/${pkgname}" + + install -Dm0644 p1st-autologin.conf "$pkgdir"/etc/sddm.conf.d/p1st-autologin.conf +} diff --git a/pkg/de-p1st-sddm-autologin-yoda/p1st-autologin.conf b/pkg/de-p1st-sddm-autologin-yoda/p1st-autologin.conf new file mode 100644 index 0000000..9dd5cd6 --- /dev/null +++ b/pkg/de-p1st-sddm-autologin-yoda/p1st-autologin.conf @@ -0,0 +1,7 @@ +[Autologin] +Relogin=false +# The desktop session: For example "xfce" or "plasma" +# -> ls /usr/share/xsessions/ /usr/share/wayland-sessions/ | sed 's|.desktop$||' +Session=xfce +# Your username +User=yoda diff --git a/pkg/de-p1st-xfce4/PKGBUILD b/pkg/de-p1st-xfce4/PKGBUILD index 29979e7..2d8f919 100644 --- a/pkg/de-p1st-xfce4/PKGBUILD +++ b/pkg/de-p1st-xfce4/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=xfce4 _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.0.5 +pkgver=0.0.6 pkgrel=1 pkgdesc="XFCE4 with configuration" arch=('any') @@ -46,7 +46,7 @@ depends+=(gnome-keyring libsecret) depends+=(de-p1st-redshift) # ============== display manager ============== -depends+=(sddm) +depends+=(de-p1st-sddm-autologin) # ============== network, theme, keyboard ============== # @@ -73,5 +73,5 @@ package() { # === display manager === install -Dm0644 systemd.preset "$pkgdir"/usr/lib/systemd/system-preset/20-"$pkgname".preset - install -Dm0644 autologin.conf "$pkgdir"/etc/sddm.conf.d/autologin.conf + install -Dm0644 p1st-settings.conf "$pkgdir"/etc/sddm.conf.d/p1st-settings.conf } diff --git a/pkg/de-p1st-xfce4/autologin.conf b/pkg/de-p1st-xfce4/p1st-settings.conf similarity index 53% rename from pkg/de-p1st-xfce4/autologin.conf rename to pkg/de-p1st-xfce4/p1st-settings.conf index b55bb77..3622c0e 100644 --- a/pkg/de-p1st-xfce4/autologin.conf +++ b/pkg/de-p1st-xfce4/p1st-settings.conf @@ -1,16 +1,10 @@ -[Autologin] -Relogin=false -Session=xfce -# Session=plasma -User=yoda - [General] HaltCommand=/usr/bin/systemctl poweroff RebootCommand=/usr/bin/systemctl reboot # [Theme] -# # ls /usr/share/sddm/themes -# # "breeze" is part of plasma-workspace +## ls /usr/share/sddm/themes +## "breeze" is part of plasma-workspace # Current=breeze [Users]