From 6b8d715036e2b90b165576cc7f68e72eb89659bb Mon Sep 17 00:00:00 2001 From: babywolf Date: Tue, 3 Feb 2026 15:55:40 +0000 Subject: [PATCH 1/2] - fixing localrepo --- .gitignore | 12 +++--------- .vscode/extensions.json | 1 - Dockerfile | 3 ++- airootfs/etc/shadow | 2 +- airootfs/etc/skel/.config/sway/config | 5 +++++ airootfs/etc/skel/.config/waybar/config | 9 +++++++-- build.sh | 0 entrypoint.sh | 1 + mkpkgs.sh | 13 +++++-------- packages.x86_64 | 2 ++ packages/.gitkeep | 0 pacman.conf | 12 ------------ pullpkgs.sh | 4 ++++ run-qemu.sh | 0 14 files changed, 30 insertions(+), 34 deletions(-) mode change 100644 => 100755 build.sh create mode 100644 packages/.gitkeep create mode 100755 pullpkgs.sh mode change 100644 => 100755 run-qemu.sh diff --git a/.gitignore b/.gitignore index 6dbc520..2e203c1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,12 +6,6 @@ out/ # PACKAGES # local repository files localrepo/* -localrepo/localrepo.db -localrepo/localrepo.files -# wlogout package files -localrepo/wlogout-1.2.2-0-x86_64.pkg.tar.zst -localrepo/wlogout-debug-1.2.2-0-x86_64.pkg.tar.zst -packages/wlogout/pkg -packages/wlogout/src -packages/wlogout/wlogout-1.2.2.tar.gz -packages/wlogout/wlogout-1.2.2.tar.gz.sig \ No newline at end of file + +packages/wlogout +packages/kando \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json index b9f12ab..cb99a89 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,6 +1,5 @@ { "recommendations": [ - "earthly.earthfile-syntax-highlighting", "ms-azuretools.vscode-docker" ] } \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index db93058..6b48ae0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM archlinux:latest -RUN pacman -Syu --noconfirm gnupg base-devel meson git scdoc gtk3 gobject-introspection gtk-layer-shell archiso mkinitcpio-archiso grub bash-completion +RUN pacman -Syu --noconfirm curl gnupg base-devel meson git scdoc gtk3 gobject-introspection gtk-layer-shell archiso mkinitcpio-archiso grub bash-completion RUN useradd -m builder && echo "builder ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/builder @@ -8,6 +8,7 @@ WORKDIR /profile COPY . /profile COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh +RUN chmod +x /profile/pullpkgs.sh RUN chmod +x /profile/mkpkgs.sh RUN chmod +x /profile/mkiso.sh RUN chown -R builder:builder /profile diff --git a/airootfs/etc/shadow b/airootfs/etc/shadow index a46a45d..8829dd6 100644 --- a/airootfs/etc/shadow +++ b/airootfs/etc/shadow @@ -1,2 +1,2 @@ root::14871:::::: -wolf:$6$w5Iyo742s8KZEGkW$NlBxM8ruEoQ8JK6DvbyhA4n4NcDmZhE89yvA3KViVFe8HIvniLuYA3WEvQKysP6oSx1VqZBCEv00vihAJHPhF0:18710:::::: +wolf:$6$jo/uVfEKH71TD7ZJ$L9ZwEZyxt81IQkVmCnDv.DmLJ1o/P936y0WVVB.i1ydl8E6ANNzUE2C1.Y/DD4DguNOW8twniQ8SXWhAq2yRE1:18710:::::: diff --git a/airootfs/etc/skel/.config/sway/config b/airootfs/etc/skel/.config/sway/config index 89f2d43..58d68ba 100644 --- a/airootfs/etc/skel/.config/sway/config +++ b/airootfs/etc/skel/.config/sway/config @@ -17,3 +17,8 @@ bindsym $mod+Shift+w exec wlogout # layout bindsym $mod+f fullscreen toggle + +# Volume control +bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% +bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% +bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle diff --git a/airootfs/etc/skel/.config/waybar/config b/airootfs/etc/skel/.config/waybar/config index 2a5b77f..a4cdc21 100644 --- a/airootfs/etc/skel/.config/waybar/config +++ b/airootfs/etc/skel/.config/waybar/config @@ -29,10 +29,14 @@ "car": "", "default": ["", ""] }, - "on-click": "pavucontrol" + "on-click": "pavucontrol", + "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +5%", + "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -5%", + "scroll-step": 5, + "max-volume": 100 }, "cpu": { - "interval": 10, + "interval": 30, "format": "CPU: {usage}%" }, "memory": { @@ -51,6 +55,7 @@ }, "network": { "format-wifi": "　{signalStrength}%", + "tooltip-format-wifi": "{essid} ({signalStrength}%) - {ipaddr}", "format-ethernet": "{ifname}: {ipaddr}", "format-disconnected": "⚠" }, diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 diff --git a/entrypoint.sh b/entrypoint.sh index b3134bf..992dc7e 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,5 +1,6 @@ #!/bin/sh cd /profile +./pullpkgs.sh && \ ./mkpkgs.sh && \ ./mkiso.sh \ No newline at end of file diff --git a/mkpkgs.sh b/mkpkgs.sh index b9d4f75..e4000fd 100755 --- a/mkpkgs.sh +++ b/mkpkgs.sh @@ -1,15 +1,12 @@ #!/bin/sh su builder << 'EOF' -gpg --keyserver keyserver.ubuntu.com --recv-keys F4FDB18A9937358364B276E9E25D679AF73C6D2F -export PKGDEST=/profile/localrepo -mkdir -p "$PKGDEST" && chmod -R 777 "$PKGDEST" +gpg --recv-keys E25D679AF73C6D2F +mkdir -p "/profile/localrepo" && chmod -R 777 "/profile/localrepo" cd /profile/packages/wlogout makepkg -s -f --noconfirm +cp *.pkg.tar.zst /profile/localrepo/ EOF -cd /profile -repo-add /profile/localrepo/localrepo.db.tar.gz /profile/localrepo/*.pkg.tar.zst -mv /profile/localrepo/localrepo.db.tar.gz /profile/localrepo/localrepo.db -mv /profile/localrepo/localrepo.files.tar.gz /profile/localrepo/localrepo.files -echo -e "\n[localrepo]\nSigLevel = Optional TrustAll\nServer = file:///profile/localrepo" >> /profile/pacman.conf +cd /profile/localrepo +repo-add localrepo.db.tar.gz *.pkg.tar.zst diff --git a/packages.x86_64 b/packages.x86_64 index 8f59b67..61852a0 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -140,3 +140,5 @@ wofi mesa foot wlogout + +kando \ No newline at end of file diff --git a/packages/.gitkeep b/packages/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/pacman.conf b/pacman.conf index 551b38f..74a3b99 100644 --- a/pacman.conf +++ b/pacman.conf @@ -102,15 +102,3 @@ Include = /etc/pacman.d/mirrorlist [localrepo] SigLevel = Optional TrustAll Server = file:///profile/localrepo - -[localrepo] -SigLevel = Optional TrustAll -Server = file:///profile/localrepo - -[localrepo] -SigLevel = Optional TrustAll -Server = file:///profile/localrepo - -[localrepo] -SigLevel = Optional TrustAll -Server = file:///profile/localrepo diff --git a/pullpkgs.sh b/pullpkgs.sh new file mode 100755 index 0000000..13f95df --- /dev/null +++ b/pullpkgs.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +curl -o packages/wlogout/PKGBUILD https://gitlab.com/chaotic-aur/pkgbuilds/-/raw/main/wlogout/PKGBUILD +curl -o packages/kando/PKGBUILD https://gitlab.com/chaotic-aur/pkgbuilds/-/raw/main/kando-git/PKGBUILD \ No newline at end of file diff --git a/run-qemu.sh b/run-qemu.sh old mode 100644 new mode 100755 From 470938f6b3d6998acd78fa88a97009fc8c7efa55 Mon Sep 17 00:00:00 2001 From: babywolf Date: Wed, 4 Feb 2026 18:32:35 +0000 Subject: [PATCH 2/2] - improving mkpkgs.sh - adding kando --- mkpkgs.sh | 7 +++++-- packages.x86_64 | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mkpkgs.sh b/mkpkgs.sh index e4000fd..c3bbdf7 100755 --- a/mkpkgs.sh +++ b/mkpkgs.sh @@ -3,9 +3,12 @@ su builder << 'EOF' gpg --recv-keys E25D679AF73C6D2F mkdir -p "/profile/localrepo" && chmod -R 777 "/profile/localrepo" -cd /profile/packages/wlogout -makepkg -s -f --noconfirm +find /profile/packages -mindepth 1 -maxdepth 1 -type d | while read folder; do + echo "Processing folder: $folder" + cd "$folder" + makepkg -s -f --noconfirm cp *.pkg.tar.zst /profile/localrepo/ +done EOF cd /profile/localrepo diff --git a/packages.x86_64 b/packages.x86_64 index 61852a0..d597904 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -141,4 +141,4 @@ mesa foot wlogout -kando \ No newline at end of file +kando-git \ No newline at end of file