Skip to content

Commit 88c889f

Browse files
committed
Fixed oxwm to reflect zig updates.
1 parent 8946f98 commit 88c889f

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

src/tonarchy.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ enum Terminal_Size {
2727

2828
static const char *XFCE_PACKAGES = "base base-devel linux linux-firmware linux-headers networkmanager git vim neovim curl wget htop btop man-db man-pages openssh sudo xorg-server xorg-xinit xorg-xrandr xorg-xset xfce4 xfce4-goodies xfce4-session xfce4-whiskermenu-plugin thunar thunar-archive-plugin file-roller firefox alacritty vlc evince eog fastfetch rofi ripgrep fd ttf-iosevka-nerd ttf-jetbrains-mono-nerd pavucontrol";
2929

30-
static const char *OXWM_PACKAGES = "base base-devel linux linux-firmware linux-headers networkmanager git vim neovim curl wget htop btop man-db man-pages openssh sudo xorg-server xorg-xinit xorg-xsetroot xorg-xrandr xorg-xset libx11 libxft freetype2 fontconfig pkg-config lua firefox alacritty vlc evince eog cargo ttf-iosevka-nerd ttf-jetbrains-mono-nerd picom xclip xwallpaper maim rofi pulseaudio pulseaudio-alsa pavucontrol alsa-utils fastfetch ripgrep fd pcmanfm lxappearance papirus-icon-theme gnome-themes-extra";
30+
static const char *OXWM_PACKAGES = "base base-devel linux linux-firmware linux-headers networkmanager git vim neovim curl wget htop btop man-db man-pages openssh sudo xorg-server xorg-xinit xorg-xsetroot xorg-xrandr xorg-xset libx11 libxft libxinerama freetype2 fontconfig pkg-config lua firefox alacritty vlc evince eog zig ttf-iosevka-nerd ttf-jetbrains-mono-nerd picom xclip xwallpaper maim rofi pulseaudio pulseaudio-alsa pavucontrol alsa-utils fastfetch ripgrep fd pcmanfm lxappearance papirus-icon-theme gnome-themes-extra";
3131

3232
static int is_uefi_system(void) {
3333
struct stat st;
@@ -288,7 +288,7 @@ static enum Terminal_Size get_terminal_size_category(int cols) {
288288
static int get_logo_width(int cols) {
289289
enum Terminal_Size size = get_terminal_size_category(cols);
290290
if (size == TERM_LARGE) return 70;
291-
if (size == TERM_MEDIUM) return 35;
291+
if (size == TERM_MEDIUM) return 25;
292292
return 8;
293293
}
294294

@@ -301,7 +301,7 @@ static int get_logo_start(int cols) {
301301
static int get_menu_start_row(int cols) {
302302
enum Terminal_Size size = get_terminal_size_category(cols);
303303
if (size == TERM_LARGE) return 10;
304-
if (size == TERM_MEDIUM) return 6;
304+
if (size == TERM_MEDIUM) return 7;
305305
return 4;
306306
}
307307

@@ -321,8 +321,9 @@ static void draw_logo(int cols) {
321321
};
322322

323323
const char *logo_medium[] = {
324-
"▀█▀ █▀█ █▄ █ ▄▀█ █▀█ █▀▀ █ █ █ █",
325-
" █ █▄█ █ ▀█ █▀█ █▀▄ █▄▄ █▀█ ▀█▀"
324+
"╔╦╗╔═╗╔╗╔╔═╗╦═╗╔═╗╦ ╦╦ ╦",
325+
" ║ ║ ║║║║╠═╣╠╦╝║ ╠═╣╚╦╝",
326+
" ╩ ╚═╝╝╚╝╩ ╩╩╚═╚═╝╩ ╩ ╩ "
326327
};
327328

328329
const char *logo_small[] = {
@@ -342,8 +343,8 @@ static void draw_logo(int cols) {
342343
break;
343344
case TERM_MEDIUM:
344345
logo = logo_medium;
345-
logo_height = 2;
346-
logo_width = 35;
346+
logo_height = 3;
347+
logo_width = 25;
347348
break;
348349
default:
349350
logo = logo_small;
@@ -1546,13 +1547,13 @@ static int configure_oxwm(const char *username) {
15461547
return 0;
15471548
}
15481549

1549-
if (!chroot_exec_fmt("cd %s && cargo build --release", oxwm_path)) {
1550+
if (!chroot_exec_fmt("cd %s && zig build -Doptimize=ReleaseSmall", oxwm_path)) {
15501551
LOG_ERROR("Failed to build oxwm");
15511552
show_message("Failed to build OXWM");
15521553
return 0;
15531554
}
15541555

1555-
if (!chroot_exec_fmt("cp %s/target/release/oxwm /usr/bin/oxwm", oxwm_path)) {
1556+
if (!chroot_exec_fmt("cp %s/zig-out/bin/oxwm /usr/bin/oxwm", oxwm_path)) {
15561557
LOG_ERROR("Failed to install oxwm binary");
15571558
show_message("Failed to install OXWM");
15581559
return 0;

0 commit comments

Comments
 (0)