diff --git a/iso/overrides/airootfs/etc/calamares/settings.conf b/iso/overrides/airootfs/etc/calamares/settings.conf new file mode 100644 index 0000000..2746c67 --- /dev/null +++ b/iso/overrides/airootfs/etc/calamares/settings.conf @@ -0,0 +1,54 @@ +# Calamares for TANINUX (camel). Model: clone the live system to the target with +# unpackfs, then configure bootloader (systemd-boot), services (greetd), set up +# snapper + Flathub, and strip the live-only installer bits. +--- +modules-search: [ local, /usr/lib/calamares/modules ] + +instances: +- id: snapper + module: shellprocess + config: shellprocess-snapper.conf +- id: flathub + module: shellprocess + config: shellprocess-flathub.conf +- id: striplive + module: shellprocess + config: shellprocess-striplive.conf + +sequence: +- show: + - welcome + - locale + - keyboard + - partition + - users + - summary +- exec: + - partition + - mount + - unpackfs + - machineid + - fstab + - locale + - keyboard + - localecfg + - luksbootkeyfile + - users + - networkcfg + - hwclock + - shellprocess@snapper + - shellprocess@flathub + - shellprocess@striplive + - packages # remove live-only packages (calamares, cage) + - services-systemd # enable greetd + NetworkManager on the target + - mkinitcpio # regenerate initramfs (plymouth hook) + - bootloader # systemd-boot, kernel cmdline 'quiet splash' + - umount +- show: + - finished + +branding: tanin +prompt-install: true +dont-chroot: false +oem-setup: false +disable-cancel: false diff --git a/iso/overrides/airootfs/etc/pacman.conf b/iso/overrides/airootfs/etc/pacman.conf new file mode 100644 index 0000000..691d50a --- /dev/null +++ b/iso/overrides/airootfs/etc/pacman.conf @@ -0,0 +1,25 @@ +# pacman.conf for the LIVE system and (via unpackfs) the installed target. +# [tanin]'s DB-signing key is imported into the keyring by customize_airootfs.sh, +# so Optional TrustAll verifies cleanly here (unlike the build conf which uses Never). +[options] +HoldPkg = pacman glibc +Architecture = auto +CheckSpace +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +ParallelDownloads = 5 +Color +ILoveCandy + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +[multilib] +Include = /etc/pacman.d/mirrorlist + +[tanin] +SigLevel = Optional TrustAll +Server = https://git.openbureau.ch/api/packages/karim/arch/tanin/$arch diff --git a/iso/overrides/airootfs/etc/pacman.d/tanin-repo.gpg b/iso/overrides/airootfs/etc/pacman.d/tanin-repo.gpg new file mode 100644 index 0000000..20b160c --- /dev/null +++ b/iso/overrides/airootfs/etc/pacman.d/tanin-repo.gpg @@ -0,0 +1,32 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +xsBNBGo1eZsBCADJBsWkBZL08x/4d/mftfd30rcRkQJVDX3eEMHaZWeUSLfGt5Hj +m7fYnwnBK29g04UTCjDKRGsvOqukAJQUXGLpLxSPJwsUH+kVKv+8/RCXtrQ6HTCN +auyZGQ3ST8kcAQ+7jntumTehBt+z4LRGMow71W2JL1oqkMK9hEgAA7dqwEWN4K0w +DMSd9iZOpN5PPdvVlTsvxU6JflfyLOS3W+geyL2+zFQWMmCcAqkPxTH6yNAfaoLI +OGR4Mg6MXXdAXbzQKI90445fWGsUX/Ch5ZSWJhJ3wqjUM3r99PErL+C/p0r5wTqv +LFkjZvauI+oLUZwXrP93qfzTG/iChBG+5sJLABEBAAHNDyhBcmNoIFJlZ2lzdHJ5 +KcLAuwQTAQgAbwWCajV5mwILBwkQtv3zViBq9PY1FAAAAAAAHAAQc2FsdEBub3Rh +dGlvbnMub3BlbnBncGpzLm9yZ/ekKg/zx/iqmv/2hOAR9m8CFQgCFgACGQECmwMC +HgEWIQRj8EFYeTI/a/4Pv7K2/fNWIGr09gAAdPIIAI4b/4C83biB4yD10w/u9Feb +s4fn0nauZ/ayZ1JJaq20Ss2pBZaqETxNdIi9sQpno9BXhBRaNdd6k7YIUK7XTylr +lk6V6Rhz6NIquGZHmfp1oszL4FjLUM9QoFWQaRY76psBNHWto/GgPpq8GFtVxmVj +NhOpm/7EcGhniBS+engub7vazVpEIqPycKBBbKSxTvo3hVqsSJpaR2vB1aiLedvY +luYfu/OIhT7SOOdjYTT18kMJxlwwSnhbl1cl47Jcd/1iQB5nwrWnZy28osfsIhEd +4lxppWcgQDXWbzBV57HiTbfnNCncmBIhoTmCKRxosWJPiligeqsqoty/B7lBx47O +wE0EajV5mwEIAO800GVtfe0ZWs+LljaKgkrwWi/u+dsVFgRNWdmqtOBWdszVdxyz +M0LsNMHHOxAWFfjFFbSO9D06aHgmvzLH0c+fgaJeliXFMYS9nOKS7Q6djnjoYtZc +CPxac0JlcLiysHyBdatjHHZr6KZvGaoSobzEfASpfYpScvEyGvi3KN2xD6ssw7AY +GiPof+vAmsfDn0OFo1WRk7eEnoT7JvUx3RrDatXLvBcQRf+49AJvf2lBv0c4tnc8 +9O71wleTHZjL8x0oc3tFDCMBfSGmLzpOaTtgwCPI99yzHeGJGP7JyjUWSAi6WkX4 +COLPhufJC/pJSrvoLa1MzUBU+jfTkJnn8ZkAEQEAAcLArAQYAQgAYAWCajV5mwkQ +tv3zViBq9PY1FAAAAAAAHAAQc2FsdEBub3RhdGlvbnMub3BlbnBncGpzLm9yZzPl +jzz26YEAPcqM+A/M9x8CmwwWIQRj8EFYeTI/a/4Pv7K2/fNWIGr09gAAtaMH/3hS +njGRszJFLsFNUYzgKdv1YYIENsFzSsu00CztKUrYVQxAEOK22mB3a9/3jPlJFSkS +WR8D2rbC2/HUKhRnHomb8Mri6HzVmGEORuE5kNnZd3ij+Dnv7EsNC7DXmuoCZaFI +FKYinsLEpo0bZOACaJpGTH4HqNM49Mrq2vREnuDtPdHGEYOs/+VqBt7tpmpIxGLd +TsJNtdroThqle9ghaCwcSqF4YatTGsNpQI68OmkmQc1ybxhzpRdwajrdTrio2pI9 +ZkfLRBu7pRjn5ekDX4JUNkC1VyO4BuZutjtFRh8YAB0TbFfPmdn3i4/gI2u5rSi1 +UT+fYccVqz5tKm/iXTY= +=6SFS +-----END PGP PUBLIC KEY BLOCK----- \ No newline at end of file diff --git a/iso/overrides/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/iso/overrides/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf new file mode 100644 index 0000000..280039b --- /dev/null +++ b/iso/overrides/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf @@ -0,0 +1,3 @@ +[Service] +ExecStart= +ExecStart=-/usr/bin/agetty --autologin root --noclear %I 38400 linux diff --git a/iso/overrides/airootfs/root/.bash_profile b/iso/overrides/airootfs/root/.bash_profile new file mode 100644 index 0000000..25e84cc --- /dev/null +++ b/iso/overrides/airootfs/root/.bash_profile @@ -0,0 +1,6 @@ +# Live ISO: on the first console (tty1), launch the TANINUX installer. +# (On an installed system this file isn't present — Calamares' shellprocess +# strips the live-only bits from the target.) +if [[ "$(tty)" == /dev/tty1 ]] && [[ -z "${WAYLAND_DISPLAY:-}" ]] && ! pgrep -x cage >/dev/null 2>&1; then + exec tanin-installer +fi diff --git a/iso/overrides/airootfs/root/customize_airootfs.sh b/iso/overrides/airootfs/root/customize_airootfs.sh new file mode 100644 index 0000000..0ddc3e5 --- /dev/null +++ b/iso/overrides/airootfs/root/customize_airootfs.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# Runs once inside the airootfs chroot during mkarchiso. +set -e -u + +# --- locale --- +sed -i 's/#\(en_US\.UTF-8 UTF-8\)/\1/' /etc/locale.gen +locale-gen + +# --- trust the [tanin] DB-signing key (so Optional TrustAll verifies) --- +pacman-key --init +pacman-key --populate archlinux +pacman-key --add /etc/pacman.d/tanin-repo.gpg +pacman-key --lsign-key 63F0415879323F6BFE0FBFB2B6FDF356206AF4F6 + +# --- services in the LIVE image --- +systemctl enable NetworkManager.service +# Live boots to a console on tty1 that auto-launches the installer (cage + +# calamares) via getty autologin + /root/.bash_profile. No display-manager. +systemctl set-default multi-user.target +# greetd is for the TARGET only (Calamares enables it post-install). +systemctl disable greetd.service 2>/dev/null || true + +# --- plymouth: add the hook so the target initramfs shows the splash --- +# (Calamares regenerates the initramfs on the target; this drop-in is carried +# over by unpackfs. 'quiet splash' goes on the kernel cmdline at install time.) +if ! grep -q plymouth /etc/mkinitcpio.conf 2>/dev/null; then + sed -i 's/^\(HOOKS=.*\)\(udev\)/\1\2 plymouth/' /etc/mkinitcpio.conf 2>/dev/null || true +fi diff --git a/iso/overrides/airootfs/usr/local/bin/tanin-installer b/iso/overrides/airootfs/usr/local/bin/tanin-installer new file mode 100644 index 0000000..53d29df --- /dev/null +++ b/iso/overrides/airootfs/usr/local/bin/tanin-installer @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# Launch the Calamares installer fullscreen in a cage kiosk compositor (Wayland, +# straight on DRM — no display-manager needed in the live session). +exec cage -s -- calamares diff --git a/iso/overrides/packages.x86_64 b/iso/overrides/packages.x86_64 new file mode 100644 index 0000000..2936ec6 --- /dev/null +++ b/iso/overrides/packages.x86_64 @@ -0,0 +1,55 @@ +# TANINUX additions — appended to releng's packages.x86_64 by bootstrap-profile.sh. +# (bootstrap also swaps the live kernel linux -> linux-zen.) +# The live ISO IS the installable system (Calamares clones it via unpackfs). + +# --- the whole TANINUX desktop (niri/eww/greeter/theme/apps from [tanin]) --- +tanin-desktop + +# --- kernel (zen) --- +linux-zen +linux-zen-headers + +# --- Btrfs + automatic snapshots (pre-update rollback via snapper) --- +btrfs-progs +snapper +snap-pac + +# --- boot splash --- +plymouth + +# --- live installer (removed from target by Calamares' packages module) --- +calamares +cage + +# --- target bootloader = systemd-boot (part of systemd) + UEFI var tool --- +efibootmgr + +# --- partitioning / filesystems --- +gptfdisk +dosfstools +e2fsprogs + +# --- preinstalled apps (decided) --- +firefox +thunderbird +kitty # extra terminal (foot stays the niri/eww default) +nautilus +flatpak # Flathub remote configured post-install +# paru # AUR helper — MUST be rebuilt into [tanin] first (else build fails) + +# --- media bundle --- +mpv +loupe +gst-plugins-good +gst-plugins-bad +gst-plugins-ugly +gst-libav +gstreamer-vaapi + +# --- fonts & emoji --- +noto-fonts +noto-fonts-emoji +noto-fonts-cjk + +# --- utilities --- +file-roller diff --git a/iso/overrides/pacman.conf b/iso/overrides/pacman.conf new file mode 100644 index 0000000..a608a54 --- /dev/null +++ b/iso/overrides/pacman.conf @@ -0,0 +1,25 @@ +# Build-time pacman.conf for mkarchiso (pulls live packages incl. tanin-desktop). +# Replaces releng's pacman.conf. [tanin] is added so the airootfs can include +# our packages. SigLevel=Never on [tanin] keeps the BUILD simple (no keyring +# bootstrap during mkarchiso); the LIVE/target keyring trusts the key properly +# (see airootfs/etc/pacman.conf + customize_airootfs.sh). +[options] +HoldPkg = pacman glibc +Architecture = auto +CheckSpace +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +ParallelDownloads = 5 + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +[multilib] +Include = /etc/pacman.d/mirrorlist + +[tanin] +SigLevel = Never +Server = https://git.openbureau.ch/api/packages/karim/arch/tanin/$arch diff --git a/iso/overrides/profiledef.sh b/iso/overrides/profiledef.sh new file mode 100644 index 0000000..cf0022e --- /dev/null +++ b/iso/overrides/profiledef.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# TANINUX (camel) archiso profile — overrides releng's profiledef.sh. +# shellcheck disable=SC2034 +iso_name="taninux" +iso_label="TANINUX_$(date +%Y%m)" +iso_publisher="TANINUX " +iso_application="TANINUX (camel) — niri/eww desktop · live + Calamares installer" +iso_version="$(date +%Y.%m.%d)" +install_dir="tanin" +buildmodes=('iso') +bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' + 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito') +arch="x86_64" +pacman_conf="pacman.conf" +airootfs_image_type="squashfs" +airootfs_image_tool_options=('-comp' 'zstd' '-Xcompression-level' '19' '-b' '1M') +bootstrap_tarball_compression=('zstd' '-c' '-T0' '--auto-threads=logical' '--long' '-19') +file_permissions=( + ["/etc/shadow"]="0:0:400" + ["/etc/gshadow"]="0:0:400" + ["/root"]="0:0:750" + ["/root/customize_airootfs.sh"]="0:0:755" + ["/usr/local/bin/tanin-installer"]="0:0:755" +) diff --git a/packaging/tanin-desktop/PKGBUILD b/packaging/tanin-desktop/PKGBUILD index 21a0c9d..f796582 100644 --- a/packaging/tanin-desktop/PKGBUILD +++ b/packaging/tanin-desktop/PKGBUILD @@ -7,7 +7,7 @@ # Calamares just installs this package at the end. pkgname=tanin-desktop pkgver=0.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="TANINUX desktop — metapackage pulling the full niri/eww environment" arch=('any') url="https://taninux.kgva.ch" @@ -52,7 +52,7 @@ depends=( # --- theming / fonts --- 'adw-gtk-theme' # GTK3 base theme tanin-libadwaita recolours 'adwaita-icon-theme' 'papirus-icon-theme' - 'inter-font' 'ttf-iosevka-nerd' # UI font + nf-md-* glyphs (verify pkg name) + 'inter-font' 'ttf-iosevka-nerd' 'ttc-iosevka-aile' 'ttf-nerd-fonts-symbols' # Inter UI · Iosevka Nerd/Aile · Symbols Nerd ) optdepends=( diff --git a/packaging/tanin-desktop/pkg/tanin-desktop/.BUILDINFO b/packaging/tanin-desktop/pkg/tanin-desktop/.BUILDINFO index 14c3f62..08361d1 100644 --- a/packaging/tanin-desktop/pkg/tanin-desktop/.BUILDINFO +++ b/packaging/tanin-desktop/pkg/tanin-desktop/.BUILDINFO @@ -1,11 +1,11 @@ format = 2 pkgname = tanin-desktop pkgbase = tanin-desktop -pkgver = 0.2.0-2 +pkgver = 0.2.0-3 pkgarch = any -pkgbuild_sha256sum = 2776433e02e1f8e3c688ba0b4bc9a691b9f2a6399dca6b76638b8e331f8182a2 +pkgbuild_sha256sum = 2111da02423cf553747eb559f2d0e9964cd811b87c21d870762f2d1505880a08 packager = Unknown Packager -builddate = 1781889932 +builddate = 1781891463 builddir = /home/karim/projects/taninux/packaging/tanin-desktop startdir = /home/karim/projects/taninux/packaging/tanin-desktop buildtool = makepkg @@ -48,7 +48,9 @@ installed = antimicrox-3.6.1-1-x86_64 installed = aom-3.14.1-1-x86_64 installed = appstream-1.1.3-1-x86_64 installed = aquamarine-0.12.1-1-x86_64 +installed = arch-install-scripts-31-1-any installed = arch-update-3.20.2-1-any +installed = archiso-88-1-any installed = archlinux-contrib-20260611-1-any installed = archlinux-keyring-20260612-1-any installed = argon2-20190702-6-x86_64 @@ -75,6 +77,7 @@ installed = bluez-libs-5.86-6-x86_64 installed = bluez-utils-5.86-6-x86_64 installed = boost-libs-1.91.0-1-x86_64 installed = botan-3.12.0-1-x86_64 +installed = brightnessctl-0.5.1-3-x86_64 installed = brotli-1.2.0-1-x86_64 installed = btrfs-progs-7.0-1-x86_64 installed = bubblewrap-0.11.2-1-x86_64 @@ -147,12 +150,14 @@ installed = elfutils-0.195-1-x86_64 installed = embree-4.4.1-1-x86_64 installed = enchant-2.8.15-2-x86_64 installed = epson-inkjet-printer-escpr2-1.2.39-1-x86_64 +installed = erofs-utils-1.9.1-1-x86_64 installed = eww-git-0.6.0.r89.g865cf63-1-x86_64 installed = exempi-2.6.6-3-x86_64 installed = exiv2-0.28.8-2-x86_64 installed = expat-2.8.1-1-x86_64 installed = extra-cmake-modules-6.27.0-1-any installed = fakeroot-1:1.37.2-2-x86_64 +installed = fcft-3.3.3-1-x86_64 installed = fd-10.4.2-2-x86_64 installed = ffmpeg-2:8.1.2-1-x86_64 installed = fftw-3.3.11-1-x86_64 @@ -165,6 +170,7 @@ installed = flex-2.6.4-6-x86_64 installed = fmt-12.2.0-1-x86_64 installed = font-manager-0.9.4-3-x86_64 installed = fontconfig-2:2.18.1-1-x86_64 +installed = foot-1.27.0-1-x86_64 installed = freeglut-3.8.0-1-x86_64 installed = freetype2-2.14.3-1-x86_64 installed = fribidi-1.0.16-2-x86_64 @@ -652,6 +658,7 @@ installed = libunwind-1.8.2-1-x86_64 installed = liburing-2.14-1-x86_64 installed = libusb-1.0.30-1-x86_64 installed = libusbmuxd-2.1.1-2-x86_64 +installed = libutf8proc-2.11.3-1-x86_64 installed = libuv-1.52.1-1-x86_64 installed = libva-2.23.0-1-x86_64 installed = libvdpau-1.5-4-x86_64 @@ -1036,6 +1043,7 @@ installed = spice-gtk-0.42-5-x86_64 installed = spice-protocol-0.14.5-1-any installed = spirv-tools-1:1.4.350.0-1-x86_64 installed = sqlite-3.53.2-1-x86_64 +installed = squashfs-tools-4.7.5-1-x86_64 installed = sratom-0.6.22-1-x86_64 installed = srt-1.5.5-1-x86_64 installed = startup-notification-0.12-9-x86_64 @@ -1053,6 +1061,12 @@ installed = systemd-libs-260.2-2-x86_64 installed = systemd-sysvcompat-260.2-2-x86_64 installed = taglib-2.3-1-x86_64 installed = talloc-2.4.4-1-x86_64 +installed = tanin-desktop-0.2.0-2-any +installed = tanin-eww-0.1.0-2-any +installed = tanin-greet-0.1.0-2-any +installed = tanin-libadwaita-0.1.0-2-any +installed = tanin-setup-0.1.0-1-any +installed = taninux-0.2.0-1-any installed = tar-1.35-2-x86_64 installed = tdb-1.4.15-1-x86_64 installed = tevent-1:0.17.1-2-x86_64 @@ -1064,6 +1078,7 @@ installed = thunderbird-ublock-origin-1.70.0-1-any installed = timeshift-25.12.4-1-x86_64 installed = timeshift-autosnap-0.10.0-1-any installed = tinysparql-3.11.1-1-x86_64 +installed = tiramisu-git-r168.5dddd83-1-x86_64 installed = tomlplusplus-3.4.0-2-x86_64 installed = totem-pl-parser-3.26.7-1-x86_64 installed = tpm2-tss-4.1.3-1-x86_64 @@ -1147,6 +1162,7 @@ installed = xcb-util-wm-0.4.2-2-x86_64 installed = xcur2png-0.7.1-9-x86_64 installed = xdg-dbus-proxy-0.1.7-1-x86_64 installed = xdg-desktop-portal-1.22.1-1-x86_64 +installed = xdg-desktop-portal-gnome-50.0-1-x86_64 installed = xdg-desktop-portal-gtk-1.15.3-1-x86_64 installed = xdg-desktop-portal-hyprland-1.3.12-2-x86_64 installed = xdg-terminal-exec-0.14.0-1-any diff --git a/packaging/tanin-desktop/pkg/tanin-desktop/.MTREE b/packaging/tanin-desktop/pkg/tanin-desktop/.MTREE index 1742f47..897b7b1 100644 Binary files a/packaging/tanin-desktop/pkg/tanin-desktop/.MTREE and b/packaging/tanin-desktop/pkg/tanin-desktop/.MTREE differ diff --git a/packaging/tanin-desktop/pkg/tanin-desktop/.PKGINFO b/packaging/tanin-desktop/pkg/tanin-desktop/.PKGINFO index 8b8823f..7ac24f0 100644 --- a/packaging/tanin-desktop/pkg/tanin-desktop/.PKGINFO +++ b/packaging/tanin-desktop/pkg/tanin-desktop/.PKGINFO @@ -3,10 +3,10 @@ pkgname = tanin-desktop pkgbase = tanin-desktop xdata = pkgtype=pkg -pkgver = 0.2.0-2 +pkgver = 0.2.0-3 pkgdesc = TANINUX desktop — metapackage pulling the full niri/eww environment url = https://taninux.kgva.ch -builddate = 1781889932 +builddate = 1781891463 packager = Unknown Packager size = 0 arch = any @@ -48,6 +48,8 @@ depend = adwaita-icon-theme depend = papirus-icon-theme depend = inter-font depend = ttf-iosevka-nerd +depend = ttc-iosevka-aile +depend = ttf-nerd-fonts-symbols optdepend = paru: AUR support in the Software Hub (opt-in) optdepend = wlsunset: night light optdepend = cups: printer management diff --git a/packaging/tanin-desktop/tanin-desktop-0.2.0-3-any.pkg.tar.zst b/packaging/tanin-desktop/tanin-desktop-0.2.0-3-any.pkg.tar.zst new file mode 100644 index 0000000..b28f407 Binary files /dev/null and b/packaging/tanin-desktop/tanin-desktop-0.2.0-3-any.pkg.tar.zst differ diff --git a/packaging/tanin-eww/PKGBUILD b/packaging/tanin-eww/PKGBUILD index e813373..7bbd7a9 100644 --- a/packaging/tanin-eww/PKGBUILD +++ b/packaging/tanin-eww/PKGBUILD @@ -8,7 +8,7 @@ # EWW_SRC=...). For publish, point `source` at the eww config git repo instead. pkgname=tanin-eww pkgver=0.1.0 -pkgrel=2 +pkgrel=4 pkgdesc="TANINUX desktop shell — eww bar/dock/panels/spotlight + niri config (skel)" arch=('any') url="https://taninux.kgva.ch" @@ -20,7 +20,7 @@ depends=( 'brightnessctl' 'playerctl' 'libqalculate' # backlight · media · calc (qalc) 'grim' 'slurp' # screenshots 'networkmanager' 'bluez-utils' 'wireplumber' # net/bt/audio module backends - 'ttf-iosevka-nerd' 'inter-font' 'papirus-icon-theme' # glyphs · UI font · dock icons + 'ttf-iosevka-nerd' 'ttc-iosevka-aile' 'ttf-nerd-fonts-symbols' 'inter-font' 'papirus-icon-theme' # bar uses Iosevka Aile + Symbols Nerd; kitty uses Iosevka Nerd ) optdepends=( 'wlsunset: night light (niri autostart)' @@ -50,4 +50,7 @@ package() { # --- niri compositor config (vendored, eww paths already fixed) --- install -Dm644 "$startdir/niri-config.kdl" "$skel/niri/config.kdl" + + # --- kitty: Fuji-matching terminal config (vendored) --- + install -Dm644 "$startdir/kitty/kitty.conf" "$skel/kitty/kitty.conf" } diff --git a/packaging/tanin-eww/kitty/kitty.conf b/packaging/tanin-eww/kitty/kitty.conf new file mode 100755 index 0000000..ab513b4 --- /dev/null +++ b/packaging/tanin-eww/kitty/kitty.conf @@ -0,0 +1,68 @@ +font_family Iosevka Nerd Font + +font_size 11 +# adjust_column_width 1 + +disable_ligatures cursor + +cursor #f0f0f0 +cursor_text_color #ffffff +cursor_shape block + +cursor_blink_interval 0.5 +cursor_stop_blinking_after 0 + +scrollback_lines 5000 + +url_color #0f0f0f +url_style single + +repaint_delay 10 +input_delay 3 + +sync_to_monitor yes + +enable_audio_bell no + +remember_window_size no + +window_padding_width 10.0 + +foreground #f0f0f0 +background #0f0f0f +selection_foreground #262626 +selection_background #f0f0f0 +url_color #c6a679 +background_opacity 1 + +# black +color8 #262626 +color0 #4c4c4c + +# red +color1 #ac8a8c +color9 #c49ea0 + +# green +color2 #8aac8b +color10 #9ec49f + +# yellow +color3 #aca98a +color11 #c4c19e + +# blue +color4 #8f8aac +color12 #a39ec4 + +# magenta +color5 #ac8aac +color13 #c49ec4 + +# cyan +color6 #8aacab +color14 #9ec3c4 + +# white +color15 #e7e7e7 +color7 #f0f0f0 diff --git a/packaging/tanin-eww/pkg/tanin-eww/.BUILDINFO b/packaging/tanin-eww/pkg/tanin-eww/.BUILDINFO index e6cbfc6..07e837c 100644 --- a/packaging/tanin-eww/pkg/tanin-eww/.BUILDINFO +++ b/packaging/tanin-eww/pkg/tanin-eww/.BUILDINFO @@ -1,11 +1,11 @@ format = 2 pkgname = tanin-eww pkgbase = tanin-eww -pkgver = 0.1.0-2 +pkgver = 0.1.0-4 pkgarch = any -pkgbuild_sha256sum = 7c76f579c34cb90f55fdd0a64139e43b285d275d71eddbac74877d21ff63d41c +pkgbuild_sha256sum = 29863264653e14beede0d5e17c06b38cfa0dbb6f0e46934b41d48e3b80ea52cc packager = Unknown Packager -builddate = 1781889930 +builddate = 1781891462 builddir = /home/karim/projects/taninux/packaging/tanin-eww startdir = /home/karim/projects/taninux/packaging/tanin-eww buildtool = makepkg @@ -48,7 +48,9 @@ installed = antimicrox-3.6.1-1-x86_64 installed = aom-3.14.1-1-x86_64 installed = appstream-1.1.3-1-x86_64 installed = aquamarine-0.12.1-1-x86_64 +installed = arch-install-scripts-31-1-any installed = arch-update-3.20.2-1-any +installed = archiso-88-1-any installed = archlinux-contrib-20260611-1-any installed = archlinux-keyring-20260612-1-any installed = argon2-20190702-6-x86_64 @@ -75,6 +77,7 @@ installed = bluez-libs-5.86-6-x86_64 installed = bluez-utils-5.86-6-x86_64 installed = boost-libs-1.91.0-1-x86_64 installed = botan-3.12.0-1-x86_64 +installed = brightnessctl-0.5.1-3-x86_64 installed = brotli-1.2.0-1-x86_64 installed = btrfs-progs-7.0-1-x86_64 installed = bubblewrap-0.11.2-1-x86_64 @@ -147,12 +150,14 @@ installed = elfutils-0.195-1-x86_64 installed = embree-4.4.1-1-x86_64 installed = enchant-2.8.15-2-x86_64 installed = epson-inkjet-printer-escpr2-1.2.39-1-x86_64 +installed = erofs-utils-1.9.1-1-x86_64 installed = eww-git-0.6.0.r89.g865cf63-1-x86_64 installed = exempi-2.6.6-3-x86_64 installed = exiv2-0.28.8-2-x86_64 installed = expat-2.8.1-1-x86_64 installed = extra-cmake-modules-6.27.0-1-any installed = fakeroot-1:1.37.2-2-x86_64 +installed = fcft-3.3.3-1-x86_64 installed = fd-10.4.2-2-x86_64 installed = ffmpeg-2:8.1.2-1-x86_64 installed = fftw-3.3.11-1-x86_64 @@ -165,6 +170,7 @@ installed = flex-2.6.4-6-x86_64 installed = fmt-12.2.0-1-x86_64 installed = font-manager-0.9.4-3-x86_64 installed = fontconfig-2:2.18.1-1-x86_64 +installed = foot-1.27.0-1-x86_64 installed = freeglut-3.8.0-1-x86_64 installed = freetype2-2.14.3-1-x86_64 installed = fribidi-1.0.16-2-x86_64 @@ -652,6 +658,7 @@ installed = libunwind-1.8.2-1-x86_64 installed = liburing-2.14-1-x86_64 installed = libusb-1.0.30-1-x86_64 installed = libusbmuxd-2.1.1-2-x86_64 +installed = libutf8proc-2.11.3-1-x86_64 installed = libuv-1.52.1-1-x86_64 installed = libva-2.23.0-1-x86_64 installed = libvdpau-1.5-4-x86_64 @@ -1036,6 +1043,7 @@ installed = spice-gtk-0.42-5-x86_64 installed = spice-protocol-0.14.5-1-any installed = spirv-tools-1:1.4.350.0-1-x86_64 installed = sqlite-3.53.2-1-x86_64 +installed = squashfs-tools-4.7.5-1-x86_64 installed = sratom-0.6.22-1-x86_64 installed = srt-1.5.5-1-x86_64 installed = startup-notification-0.12-9-x86_64 @@ -1053,6 +1061,12 @@ installed = systemd-libs-260.2-2-x86_64 installed = systemd-sysvcompat-260.2-2-x86_64 installed = taglib-2.3-1-x86_64 installed = talloc-2.4.4-1-x86_64 +installed = tanin-desktop-0.2.0-2-any +installed = tanin-eww-0.1.0-2-any +installed = tanin-greet-0.1.0-2-any +installed = tanin-libadwaita-0.1.0-2-any +installed = tanin-setup-0.1.0-1-any +installed = taninux-0.2.0-1-any installed = tar-1.35-2-x86_64 installed = tdb-1.4.15-1-x86_64 installed = tevent-1:0.17.1-2-x86_64 @@ -1064,6 +1078,7 @@ installed = thunderbird-ublock-origin-1.70.0-1-any installed = timeshift-25.12.4-1-x86_64 installed = timeshift-autosnap-0.10.0-1-any installed = tinysparql-3.11.1-1-x86_64 +installed = tiramisu-git-r168.5dddd83-1-x86_64 installed = tomlplusplus-3.4.0-2-x86_64 installed = totem-pl-parser-3.26.7-1-x86_64 installed = tpm2-tss-4.1.3-1-x86_64 @@ -1147,6 +1162,7 @@ installed = xcb-util-wm-0.4.2-2-x86_64 installed = xcur2png-0.7.1-9-x86_64 installed = xdg-dbus-proxy-0.1.7-1-x86_64 installed = xdg-desktop-portal-1.22.1-1-x86_64 +installed = xdg-desktop-portal-gnome-50.0-1-x86_64 installed = xdg-desktop-portal-gtk-1.15.3-1-x86_64 installed = xdg-desktop-portal-hyprland-1.3.12-2-x86_64 installed = xdg-terminal-exec-0.14.0-1-any diff --git a/packaging/tanin-eww/pkg/tanin-eww/.MTREE b/packaging/tanin-eww/pkg/tanin-eww/.MTREE index 6514455..2d17a5d 100644 Binary files a/packaging/tanin-eww/pkg/tanin-eww/.MTREE and b/packaging/tanin-eww/pkg/tanin-eww/.MTREE differ diff --git a/packaging/tanin-eww/pkg/tanin-eww/.PKGINFO b/packaging/tanin-eww/pkg/tanin-eww/.PKGINFO index 7eba3de..d09f106 100644 --- a/packaging/tanin-eww/pkg/tanin-eww/.PKGINFO +++ b/packaging/tanin-eww/pkg/tanin-eww/.PKGINFO @@ -3,12 +3,12 @@ pkgname = tanin-eww pkgbase = tanin-eww xdata = pkgtype=pkg -pkgver = 0.1.0-2 +pkgver = 0.1.0-4 pkgdesc = TANINUX desktop shell — eww bar/dock/panels/spotlight + niri config (skel) url = https://taninux.kgva.ch -builddate = 1781889930 +builddate = 1781891462 packager = Unknown Packager -size = 188936 +size = 189847 arch = any license = GPL-3.0-or-later depend = niri @@ -27,6 +27,8 @@ depend = networkmanager depend = bluez-utils depend = wireplumber depend = ttf-iosevka-nerd +depend = ttc-iosevka-aile +depend = ttf-nerd-fonts-symbols depend = inter-font depend = papirus-icon-theme optdepend = wlsunset: night light (niri autostart) diff --git a/packaging/tanin-eww/pkg/tanin-eww/usr/share/tanin/skel/.config/kitty/kitty.conf b/packaging/tanin-eww/pkg/tanin-eww/usr/share/tanin/skel/.config/kitty/kitty.conf new file mode 100644 index 0000000..ab513b4 --- /dev/null +++ b/packaging/tanin-eww/pkg/tanin-eww/usr/share/tanin/skel/.config/kitty/kitty.conf @@ -0,0 +1,68 @@ +font_family Iosevka Nerd Font + +font_size 11 +# adjust_column_width 1 + +disable_ligatures cursor + +cursor #f0f0f0 +cursor_text_color #ffffff +cursor_shape block + +cursor_blink_interval 0.5 +cursor_stop_blinking_after 0 + +scrollback_lines 5000 + +url_color #0f0f0f +url_style single + +repaint_delay 10 +input_delay 3 + +sync_to_monitor yes + +enable_audio_bell no + +remember_window_size no + +window_padding_width 10.0 + +foreground #f0f0f0 +background #0f0f0f +selection_foreground #262626 +selection_background #f0f0f0 +url_color #c6a679 +background_opacity 1 + +# black +color8 #262626 +color0 #4c4c4c + +# red +color1 #ac8a8c +color9 #c49ea0 + +# green +color2 #8aac8b +color10 #9ec49f + +# yellow +color3 #aca98a +color11 #c4c19e + +# blue +color4 #8f8aac +color12 #a39ec4 + +# magenta +color5 #ac8aac +color13 #c49ec4 + +# cyan +color6 #8aacab +color14 #9ec3c4 + +# white +color15 #e7e7e7 +color7 #f0f0f0 diff --git a/packaging/tanin-eww/tanin-eww-0.1.0-3-any.pkg.tar.zst b/packaging/tanin-eww/tanin-eww-0.1.0-3-any.pkg.tar.zst new file mode 100644 index 0000000..d601394 Binary files /dev/null and b/packaging/tanin-eww/tanin-eww-0.1.0-3-any.pkg.tar.zst differ diff --git a/packaging/tanin-eww/tanin-eww-0.1.0-4-any.pkg.tar.zst b/packaging/tanin-eww/tanin-eww-0.1.0-4-any.pkg.tar.zst new file mode 100644 index 0000000..a7a9e4b Binary files /dev/null and b/packaging/tanin-eww/tanin-eww-0.1.0-4-any.pkg.tar.zst differ