Skip to content

New contributions #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: 1.4
Choose a base branch
from
Open

New contributions #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
df57739
Fixes compile command order
Jul 24, 2025
64468cc
Enables API translation for weather data
Jul 24, 2025
cc8bc21
Adds templates configuration
Jul 24, 2025
424b610
Refreshes GTK config on theme switch
Jul 24, 2025
6e827b2
Adds Romanian language support to fonts mod
Jul 24, 2025
02f3d7a
Adds printer driver support
Jul 24, 2025
92c968d
Installs libfuse based on Ubuntu release
Jul 24, 2025
4760f78
Merge branch 'Anduin2017:1.4' into 1.4
florintanasa Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/mods/07-system-tools-install-mod/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,21 @@ apt install $INTERACTIVE \
gettext \
cracklib-runtime \
libfuse2t64 \
libfuse3-4 \
libopengl0 \
initramfs-tools \
--no-install-recommends
judge "Install basic system tool packages"

print_ok "Installing libfuse for specific release..."
case $TARGET_UBUNTU_VERSION in
"questing")
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's not needed because 1.4 branch is for questing while 1.3 is for plucky. But nice to have.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

apt-get install $INTERACTIVE libfuse3-4 --no-install-recommends
;;
*)
apt-get install $INTERACTIVE libfuse3-3 --no-install-recommends
;;
esac

print_ok "Fixing the package base-files to avoid system upgrading it..."
# Fix the package base-files to avoid system upgrading it. This is because Ubuntu may upgrade the package base-files and caused AnduinOS to be changed to Ubuntu.
# This will edit the file /var/lib/dpkg/status and change the status of the package base-files to hold.
Expand All @@ -112,4 +121,4 @@ Package: base-files
Pin: release o=Ubuntu
Pin-Priority: -1
EOF
judge "Create PIN file for base-files"
judge "Create PIN file for base-files"
4 changes: 2 additions & 2 deletions src/mods/14-gnome-apps-mod/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ judge "Install gnome printer support"

print_ok "Installing ubuntu drivers support..."
apt install $INTERACTIVE \
ubuntu-drivers-common alsa-utils alsa-base fprintd --no-install-recommends
ubuntu-drivers-common alsa-utils alsa-base fprintd printer-driver-all --no-install-recommends
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have concern installing almost all drivers by default. Since not all users may need to setup a printer and this may cause the image larger. But I'm still wondering if it's a big issue that requires installing printer drivers manually.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, how you wish. But I prefer the user to have access to all drivers is easier for him and also if users see their printer from beginning is more happy.

judge "Install ubuntu drivers support"

print_ok "Installing python3..."
Expand Down Expand Up @@ -202,4 +202,4 @@ judge "Remove the default vim.desktop file"

print_ok "Installing $LANGUAGE_PACKS language packs"
apt install $INTERACTIVE $LANGUAGE_PACKS --no-install-recommends
judge "Install language packs"
judge "Install language packs"
4 changes: 2 additions & 2 deletions src/mods/15-fonts-mod/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set -u # treat unset variable as error
# | Korean | `ko`, `ko_KR` | Noto Sans CJK KR | Noto Serif CJK KR | Noto Sans Mono CJK KR | `lang=ko`, prepend-strong: use KR variants for Korean |
# | Thai | `th`, `th_TH` | Noto Sans Thai | Noto Serif Thai | Cascadia Code | `lang=th`, prepend-strong: use Thai fonts; code blocks → Cascadia Code |
# | Arabic | `ar`, `ar_SA` | Noto Naskh Arabic | Noto Naskh Arabic | Cascadia Code | `lang=ar`, prepend-strong: use Naskh Arabic; code blocks → Cascadia Code |
# | Latin & Cyrillic | `en_US`, `en_GB`, `de_DE`, `fr_FR`, `es_ES`, `it_IT`, `pt_BR`, `pt_PT`, `nl_NL`, `sv_SE`, `pl_PL`, `tr_TR`, `vi_VN`, `ru_RU` | Noto Sans | Noto Serif | Cascadia Code | `lang contains X`, prepend-strong: use pure Latin/Cyrillic fonts before CJK to fix punctuation |
# | Latin & Cyrillic | `en_US`, `en_GB`, `de_DE`, `fr_FR`, `es_ES`, `it_IT`, `pt_BR`, `pt_PT`, `nl_NL`, `sv_SE`, `pl_PL`, `tr_TR`, `vi_VN`, `ru_RU`, `ro_RO` | Noto Sans | Noto Serif | Cascadia Code | `lang contains X`, prepend-strong: use pure Latin/Cyrillic fonts before CJK to fix punctuation |
# | Generic fallback | * | Noto Sans CJK SC | Noto Serif CJK SC | Noto Sans Mono CJK SC + Symbols Nerd Font + Twitter Color Emoji | default sans/serif/mono rules for all other or mixed content |

print_ok "Patching fonts..."
Expand All @@ -20,4 +20,4 @@ judge "Patch fonts"

print_ok "Updating font cache"
fc-cache -f
judge "Update font cache"
judge "Update font cache"
2 changes: 1 addition & 1 deletion src/mods/20-deskmon-mod/deskmon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ====================
// File: deskmon.c
// Daemon: watch ~/Desktop for new .desktop files, chmod +x and mark as trusted
// Compile: gcc `pkg-config --cflags --libs gio-2.0 glib-2.0` -O2 -o deskmon deskmon.c
// Compile: gcc `pkg-config --cflags gio-2.0 glib-2.0` -O2 -o deskmon deskmon.c `pkg-config --libs gio-2.0 glib-2.0`
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's that for?

// Install to /usr/local/bin/deskmon and run via systemd user service

#define _GNU_SOURCE
Expand Down
18 changes: 18 additions & 0 deletions src/mods/29-gnome-extension-anduinos-switcher/switcher@anduinos/extension.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,20 @@ import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js';

const LIGHT_SCHEME_NAME = 'prefer-light';
const DARK_SCHEME_NAME = 'prefer-dark';
const GLib = imports.gi.GLib;

function runCommand(command) {
try {
let [stdout, stderr, exit_status] = GLib.spawn_command_line_sync(command);
if (exit_status !== 0) {
global.log(`Error running command: ${stderr}`);
} else {
global.log(`Command output: ${stdout}`);
}
} catch (e) {
global.log(`Error running command: ${e}`);
}
}

const LIGHT_THEME_SETTINGS = {
"org.gnome.desktop.interface": {
Expand Down Expand Up @@ -85,8 +99,12 @@ export default class LightDarkSwitcherExtension extends Extension {
_syncTheme() {
let scheme = this._interfaceSettings.get_string('color-scheme');
if (scheme === DARK_SCHEME_NAME) {
GLib.spawn_async(null, ['sh', '-c', "rm -rf $HOME/.config/gtk-4.0/*"], null, GLib.SpawnFlags.SEARCH_PATH, null);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's that for?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For theme, when change the theme to fix for libadawaita. In void linux I add also links in skel to work from the first boot look https://github.com/florintanasa/brgvos-void/tree/main/includedir/etc/skel/.config/gtk-4.0 I use for default the light theme.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look at https://git.aiursoft.cn/PublicVault/Fluent-gtk-theme/src/branch/master/install.sh from line 718 when install the theme for libadwaita is necessary some links.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And depend on color theme, so when we change from dark to light is necessary some links to light theme and when we change from light to dark theme is necessary to change the links to dark.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, but exist some problem with links Gnome settings not appear correctly for Aspect page, look at color accent
with_links_in_config_gtk-4
but without links is not colored in red, the close button from upper right corner of the windows
with_no_links_in_config_gtk-4

Also, I comment the lines for icon theme, I installed Accent Icons extensions and I set this extension with all Fluent icons color, but not exist for teal, is necessary to request from developer.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshots are taken from BRGV-OS based by Void Linux.

GLib.spawn_async(null, ['sh', '-c', "ln -sf /usr/share/themes/Fluent-round-Dark/gtk-4.0/* $HOME/.config/gtk-4.0/"], null, GLib.SpawnFlags.SEARCH_PATH, null);
applySettings(DARK_THEME_SETTINGS);
} else {
GLib.spawn_async(null, ['sh', '-c', "rm -rf $HOME/.config/gtk-4.0/*"], null, GLib.SpawnFlags.SEARCH_PATH, null);
GLib.spawn_async(null, ['sh', '-c', "ln -sf /usr/share/themes/Fluent-round-Light/gtk-4.0/* $HOME/.config/gtk-4.0/"], null, GLib.SpawnFlags.SEARCH_PATH, null);
applySettings(LIGHT_THEME_SETTINGS);
}
}
Expand Down
1 change: 1 addition & 0 deletions src/mods/35-dconf-patch/dconf.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ actual-city=0
has-run=true
locs=[(uint32 0, '上海市, 中国', uint32 0, '31.2312707,121.4700152')]
my-loc-prov='geoclue'
owm-api-translate=true
position-in-panel='left'
position-index=0
pressure-unit='mbar'
Expand Down
38 changes: 32 additions & 6 deletions src/mods/39-templates-mod/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,35 @@ set -e # exit on error
set -o pipefail # exit on pipeline error
set -u # treat unset variable as error

print_ok "Configuring templates..."
mkdir -p /etc/skel/Templates
touch /etc/skel/Templates/Text.txt
touch /etc/skel/Templates/Markdown.md
cat << 'EOF' > /etc/skel/Templates/Markdown.md
print_ok "Declare Templates dir name as variable for specific languages..."
case $LANG_MODE in
"ro_RO")
export TEMPLATE_DIR="Șabloane"
print_ok "Configuring templates..."
mkdir -p /etc/skel/$TEMPLATE_DIR
touch /etc/skel/$TEMPLATE_DIR/Text.txt
touch /etc/skel/$TEMPLATE_DIR/Markdown.md
cat << 'EOF' > /etc/skel/$TEMPLATE_DIR/Markdown.md
# Titlu

- [ ] De realizat 1
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This affects globally?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, only when is build for Romanian language.

- [ ] De realizat 2
- [ ] De realizat 3

## Subtitlu

1. Lista 1
2. Lista 2
3. Lista 3
EOF
;;
*)
export TEMPLATE_DIR="Templates"
print_ok "Configuring templates..."
mkdir -p /etc/skel/$TEMPLATE_DIR
touch /etc/skel/$TEMPLATE_DIR/Text.txt
touch /etc/skel/$TEMPLATE_DIR/Markdown.md
cat << 'EOF' > /etc/skel/$TEMPLATE_DIR/Markdown.md
# Title

- [ ] Task 1
Expand All @@ -19,4 +43,6 @@ cat << 'EOF' > /etc/skel/Templates/Markdown.md
2. Numbered 2
3. Numbered 3
EOF
judge "Configure templates"
;;
esac
judge "Configure templates"