Skip to content

Commit e81664a

Browse files
author
MochiOS Team
committed
fix repo workflow + add hyprland rice + greeter configs
- repo.yml: build all 10 packages (mochi, mochiinstall, mochiboot, mochi-abroot, mochi-splash, mochios-branding, mochios-branding-nightly, mochios-defaults, sober, zen-browser) - repo.yml: path triggers now include all pkgbuilds/** - repo.yml: add gnu-efi makedepend for mochi-splash - mochios-defaults: add waybar config + style (mochios purple theme) - mochios-defaults: add dunst config (mochios purple theme) - mochios-defaults: add wofi config + style (mochios purple theme) - mochios-defaults: add hyprpaper.conf (loads mochios wallpaper) - mochios-defaults: add greetd config (tuigreet with --remember) - mochios-defaults: add ly config.ini - mochios-defaults: bump pkgrel to 5, add optdepends for greetd/ly
1 parent 8d50dc2 commit e81664a

10 files changed

Lines changed: 415 additions & 9 deletions

File tree

‎.github/workflows/repo.yml‎

Lines changed: 55 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ name: Public Repo
33
on:
44
push:
55
paths:
6-
- "pkgbuilds/mochi/**"
6+
- "pkgbuilds/**"
77
- "mochi/**"
8-
- "pkgbuilds/mochiinstall/**"
9-
- "pkgbuilds/mochiboot/**"
108
- "mochiinstall_wrapper"
119
- "installer.py"
1210
- "mochiinstall_app.py"
@@ -35,7 +33,7 @@ jobs:
3533
run: |
3634
pacman-key --init
3735
pacman-key --populate archlinux
38-
pacman -Sy --noconfirm base-devel go python python-textual zstd git fakeroot nasm autoconf automake mtools clang lld llvm
36+
pacman -Sy --noconfirm base-devel go python python-textual zstd git fakeroot nasm autoconf automake mtools clang lld llvm gnu-efi
3937
4038
- name: Create builder
4139
run: |
@@ -75,12 +73,62 @@ jobs:
7573
tar czf "mochiboot-$pkgver.tar.gz" --exclude="mochiboot-$pkgver.tar.gz" --exclude='pkg' --exclude='src' *
7674
CC_FOR_TARGET=gcc LD_FOR_TARGET=ld.lld OBJCOPY_FOR_TARGET=llvm-objcopy sudo -u builder makepkg -cf --noconfirm --nodeps
7775
76+
- name: Build mochi-abroot
77+
run: |
78+
cd pkgbuilds/mochi-abroot
79+
pkgver=$(grep -oP '^pkgver=\K.*' PKGBUILD | head -1)
80+
tar czf "mochi-abroot-$pkgver.tar.gz" -C "$PWD" abroot.sh abroot.conf
81+
sudo -u builder makepkg -cf --noconfirm --nodeps
82+
83+
- name: Build mochi-splash
84+
run: |
85+
cd pkgbuilds/mochi-splash
86+
pkgver=$(grep -oP '^pkgver=\K.*' PKGBUILD | head -1)
87+
tar czf "mochi-splash-$pkgver.tar.gz" -C "$PWD" splash.c Makefile
88+
sudo -u builder makepkg -cf --noconfirm --nodeps
89+
90+
- name: Build mochios-branding
91+
run: |
92+
cd pkgbuilds/mochios-branding
93+
pkgver=$(grep -oP '^pkgver=\K.*' PKGBUILD | head -1)
94+
tar czf "mochios-branding-$pkgver.tar.gz" -C "$PWD" usr
95+
sudo -u builder makepkg -cf --noconfirm --nodeps
96+
97+
- name: Build mochios-branding-nightly
98+
run: |
99+
cd pkgbuilds/mochios-branding-nightly
100+
pkgver=$(grep -oP '^pkgver=\K.*' PKGBUILD | head -1)
101+
tar czf "mochios-branding-nightly-$pkgver.tar.gz" -C "$PWD" etc usr
102+
sudo -u builder makepkg -cf --noconfirm --nodeps
103+
104+
- name: Build mochios-defaults
105+
run: |
106+
cd pkgbuilds/mochios-defaults
107+
pkgver=$(grep -oP '^pkgver=\K.*' PKGBUILD | head -1)
108+
tar czf "mochios-defaults-$pkgver.tar.gz" -C "$PWD" etc usr mochios-release
109+
sudo -u builder makepkg -cf --noconfirm --nodeps
110+
111+
- name: Build sober
112+
run: |
113+
cd pkgbuilds/sober
114+
pkgver=$(grep -oP '^pkgver=\K.*' PKGBUILD | head -1)
115+
tar czf "sober-$pkgver.tar.gz" -C "$PWD" sober-wrapper.sh
116+
sudo -u builder makepkg -cf --noconfirm --nodeps
117+
118+
- name: Build zen-browser
119+
run: |
120+
cd pkgbuilds/zen-browser
121+
pkgver=$(grep -oP '^pkgver=\K.*' PKGBUILD | head -1)
122+
sudo -u builder makepkg -cf --noconfirm --nodeps --skipchecksums
123+
78124
- name: Create repo
79125
run: |
80126
mkdir -p /repo/os/x86_64
81-
for f in pkgbuilds/mochi/mochi-*.pkg.tar.zst pkgbuilds/mochiinstall/mochiinstall-*.pkg.tar.zst pkgbuilds/mochiboot/mochiboot-*.pkg.tar.zst; do
82-
[ -f "$f" ] || continue
83-
cp "$f" /repo/os/x86_64/
127+
for dir in pkgbuilds/*/; do
128+
for f in "$dir"*.pkg.tar.zst; do
129+
[ -f "$f" ] || continue
130+
cp "$f" /repo/os/x86_64/
131+
done
84132
done
85133
cp /repo/pubkey/mochios-key.pub /repo/os/x86_64/
86134

‎pkgbuilds/mochios-defaults/PKGBUILD‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# Maintainer: mochios team
22
pkgname=mochios-defaults
33
pkgver=0.1.0
4-
pkgrel=4
4+
pkgrel=5
55
pkgdesc="mochios default system configuration files"
66
arch=('any')
77
url="https://mochios.dev"
88
license=('GPL3')
9-
depends=('zsh' 'sudo' 'btrfs-progs')
9+
depends=('zsh' 'sudo' 'btrfs-progs' 'waybar' 'dunst' 'wofi' 'hyprpaper')
10+
optdepends=('greetd: TUI greeter' 'ly: TUI greeter')
1011
source=("mochios-defaults-$pkgver.tar.gz")
1112
sha256sums=('SKIP')
1213

@@ -17,5 +18,25 @@ package() {
1718
install -Dm755 usr/bin/mochi-wallpaper "$pkgdir/usr/bin/mochi-wallpaper"
1819
install -Dm644 etc/xdg/autostart/mochi-wallpaper.desktop "$pkgdir/etc/xdg/autostart/mochi-wallpaper.desktop"
1920
install -Dm644 etc/xdg/kwinrc "$pkgdir/etc/xdg/kwinrc"
21+
22+
# hyprland
2023
install -Dm644 etc/skel/.config/hypr/hyprland.lua "$pkgdir/etc/skel/.config/hypr/hyprland.lua"
24+
install -Dm644 etc/skel/.config/hypr/hyprpaper.conf "$pkgdir/etc/skel/.config/hypr/hyprpaper.conf"
25+
26+
# waybar
27+
install -Dm644 etc/skel/.config/waybar/config "$pkgdir/etc/skel/.config/waybar/config"
28+
install -Dm644 etc/skel/.config/waybar/style.css "$pkgdir/etc/skel/.config/waybar/style.css"
29+
30+
# dunst
31+
install -Dm644 etc/skel/.config/dunst/dunstrc "$pkgdir/etc/skel/.config/dunst/dunstrc"
32+
33+
# wofi
34+
install -Dm644 etc/skel/.config/wofi/config "$pkgdir/etc/skel/.config/wofi/config"
35+
install -Dm644 etc/skel/.config/wofi/style.css "$pkgdir/etc/skel/.config/wofi/style.css"
36+
37+
# greetd
38+
install -Dm644 etc/greetd/config "$pkgdir/etc/greetd/config"
39+
40+
# ly
41+
install -Dm644 etc/ly/config.ini "$pkgdir/etc/ly/config.ini"
2142
}

‎pkgbuilds/mochios-defaults/etc/greetd/config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[terminal]
2+
vt = 1
3+
4+
[default_session]
5+
command = "tuigreet --remember --remember-session --time --greeting 'welcome to mochios :3'"
6+
user = "greeter"

‎pkgbuilds/mochios-defaults/etc/ly/config.ini‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[ly]
2+
reset = 2
3+
save = 1
4+
shutdown = 0
5+
6+
[animations]
7+
animation = 1

‎pkgbuilds/mochios-defaults/etc/skel/.config/dunst/dunstrc‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
[global]
2+
monitor = 0
3+
follow = mouse
4+
5+
width = 350
6+
height = 100
7+
origin = top-right
8+
offset = 15x15
9+
notification_limit = 5
10+
11+
progress_bar = true
12+
progress_bar_height = 10
13+
progress_bar_frame_width = 1
14+
progress_bar_min_width = 150
15+
progress_bar_max_width = 300
16+
17+
indicate_hidden = yes
18+
transparency = 10
19+
separator_height = 2
20+
padding = 12
21+
horizontal_padding = 12
22+
text_icon_padding = 12
23+
frame_width = 1
24+
frame_color = "#5a3a7e"
25+
gap_size = 4
26+
separator_color = frame
27+
sort = yes
28+
29+
font = Noto Sans 10
30+
line_height = 0
31+
markup = full
32+
format = "<b>%s</b>\n%b"
33+
alignment = left
34+
vertical_alignment = center
35+
show_age_threshold = 60
36+
ellipsize = middle
37+
ignore_newline = no
38+
stack_duplicates = true
39+
hide_duplicate_count = false
40+
show_indicators = yes
41+
42+
icon_position = left
43+
min_icon_size = 32
44+
max_icon_size = 64
45+
46+
corner_radius = 8
47+
mouse_left_click = close_current
48+
mouse_middle_click = do_action, close_current
49+
mouse_right_click = close_all
50+
51+
[urgency_low]
52+
background = "#1a1025"
53+
foreground = "#e0d0f0"
54+
frame_color = "#5a3a7e"
55+
timeout = 5
56+
57+
[urgency_normal]
58+
background = "#1a1025"
59+
foreground = "#e0d0f0"
60+
frame_color = "#7a3cb0"
61+
timeout = 10
62+
63+
[urgency_critical]
64+
background = "#1a1025"
65+
foreground = "#e0d0f0"
66+
frame_color = "#f38ba8"
67+
timeout = 0

‎pkgbuilds/mochios-defaults/etc/skel/.config/hypr/hyprpaper.conf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
preload = /usr/share/wallpapers/mochios/contents/images/1920x1080.png
2+
wallpaper = ,/usr/share/wallpapers/mochios/contents/images/1920x1080.png
3+
splash = false
4+
ipc = off

‎pkgbuilds/mochios-defaults/etc/skel/.config/waybar/config‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{
2+
"layer": "top",
3+
"position": "top",
4+
"height": 36,
5+
"spacing": 4,
6+
"margin-top": 5,
7+
"margin-left": 15,
8+
"margin-right": 15,
9+
10+
"modules-left": ["hyprland/workspaces", "hyprland/window"],
11+
"modules-center": ["clock"],
12+
"modules-right": ["tray", "pulseaudio", "network", "battery"],
13+
14+
"hyprland/workspaces": {
15+
"format": "{icon}",
16+
"format-icons": {
17+
"1": "1",
18+
"2": "2",
19+
"3": "3",
20+
"4": "4",
21+
"5": "5",
22+
"6": "6",
23+
"7": "7",
24+
"8": "8",
25+
"9": "9",
26+
"10": "0"
27+
},
28+
"on-click": "activate",
29+
"sort-by-number": true
30+
},
31+
32+
"hyprland/window": {
33+
"format": "{}",
34+
"max-length": 50,
35+
"separate-outputs": true
36+
},
37+
38+
"clock": {
39+
"format": " {:%H:%M}",
40+
"format-alt": " {:%Y-%m-%d %H:%M:%S}",
41+
"tooltip-format": "<tt>{calendar}</tt>",
42+
"interval": 1
43+
},
44+
45+
"tray": {
46+
"icon-size": 16,
47+
"spacing": 8,
48+
"show-passive-items": true
49+
},
50+
51+
"pulseaudio": {
52+
"format": "{icon} {volume}%",
53+
"format-muted": " muted",
54+
"format-icons": {
55+
"default": ["", "", ""]
56+
},
57+
"on-click": "pavucontrol"
58+
},
59+
60+
"network": {
61+
"format-wifi": " {signalStrength}%",
62+
"format-ethernet": " {ifname}",
63+
"format-disconnected": " offline",
64+
"tooltip-format": "{ifname}: {ipaddr}/{cidr}",
65+
"on-click": "nm-connection-editor"
66+
},
67+
68+
"battery": {
69+
"states": {
70+
"warning": 30,
71+
"critical": 15
72+
},
73+
"format": "{icon} {capacity}%",
74+
"format-charging": " {capacity}%",
75+
"format-plugged": " {capacity}%",
76+
"format-icons": ["", "", "", "", ""],
77+
"tooltip-format": "{timeTo}"
78+
}
79+
}

‎pkgbuilds/mochios-defaults/etc/skel/.config/waybar/style.css‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
* {
2+
font-family: "Noto Sans", "Cantarell", sans-serif;
3+
font-size: 13px;
4+
min-height: 0;
5+
}
6+
7+
window#waybar {
8+
background-color: rgba(26, 16, 37, 0.85);
9+
color: #e0d0f0;
10+
border-radius: 10px;
11+
border: 1px solid rgba(90, 58, 126, 0.5);
12+
}
13+
14+
tooltip {
15+
background: #1a1025;
16+
border: 1px solid #5a3a7e;
17+
border-radius: 6px;
18+
color: #e0d0f0;
19+
}
20+
21+
tooltip label {
22+
color: #e0d0f0;
23+
}
24+
25+
#workspaces button {
26+
padding: 0 8px;
27+
color: #705090;
28+
border-radius: 6px;
29+
margin: 4px 2px;
30+
background: transparent;
31+
border: none;
32+
}
33+
34+
#workspaces button.active {
35+
color: #e0d0f0;
36+
background: #7a3cb0;
37+
}
38+
39+
#workspaces button:hover {
40+
background: #3a2a5e;
41+
color: #c8a0f0;
42+
}
43+
44+
#window {
45+
padding: 0 12px;
46+
color: #b090d0;
47+
}
48+
49+
#clock {
50+
padding: 0 12px;
51+
color: #c8a0f0;
52+
font-weight: bold;
53+
}
54+
55+
#tray {
56+
padding: 0 8px;
57+
}
58+
59+
#tray > .passive {
60+
-gtk-icon-effect: dim;
61+
}
62+
63+
#tray > .needs-attention {
64+
-gtk-icon-effect: highlight;
65+
}
66+
67+
#pulseaudio {
68+
padding: 0 10px;
69+
color: #94e2d5;
70+
}
71+
72+
#network {
73+
padding: 0 10px;
74+
color: #89b4fa;
75+
}
76+
77+
#battery {
78+
padding: 0 10px;
79+
}
80+
81+
#battery.charging {
82+
color: #a6e3a1;
83+
}
84+
85+
#battery.warning:not(.charging) {
86+
color: #f9e2af;
87+
}
88+
89+
#battery.critical:not(.charging) {
90+
color: #f38ba8;
91+
animation: blink 1s linear infinite;
92+
}
93+
94+
@keyframes blink {
95+
to {
96+
color: #1a1025;
97+
background: #f38ba8;
98+
}
99+
}

0 commit comments

Comments
 (0)