From c733e34a7ca15b89a3578cb545ff852e33722c78 Mon Sep 17 00:00:00 2001 From: Mateus Melchiades Date: Sat, 13 May 2023 18:04:26 -0300 Subject: [PATCH 1/9] Port to ABRoot v2 --- .gitignore | 4 +++- recipe.json | 28 +++++++++--------------- vanilla_first_setup/defaults/hostname.py | 2 +- vanilla_first_setup/defaults/theme.py | 2 +- vanilla_first_setup/meson.build | 3 ++- vanilla_first_setup/utils/processor.py | 2 -- vanilla_first_setup/window.py | 8 +++---- 7 files changed, 21 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 492b1efd..a665706b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,6 @@ debian/vanilla-first-setup debian/.debhelper */__pycache__ *.pyc -/localbuild \ No newline at end of file +/localbuild +.buildconfig +install/ \ No newline at end of file diff --git a/recipe.json b/recipe.json index 3f48a7fb..27e8f926 100644 --- a/recipe.json +++ b/recipe.json @@ -3,14 +3,8 @@ "distro_name": "Vanilla OS", "distro_logo": "org.vanillaos.FirstSetup", "pre_run": [ - "export DEBIAN_FRONTEND=noninteractive", - "apt update", - "apt install -f", - "apt upgrade -y" ], "post_run": [ - "apt update", - "apt install -f" ], "tour": { "get-involved": { @@ -96,22 +90,20 @@ "if": "flatpak", "type": "command", "commands": [ - "apt install -y flatpak gnome-software-plugin-flatpak", + "abroot pkg add flatpak gnome-software-plugin-flatpak", "!nextBoot flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo" ] }, { "if": "snap", "type": "command", - "commands": ["apt install -y snapd"] + "commands": ["abroot pkg add snapd"] }, { "if": "appimage", "type": "command", "commands": [ - "apt install -y software-properties-common", - "add-apt-repository --yes ppa:appimagelauncher-team/stable", - "apt install -y fuse3 libfuse2 appimagelauncher" + "abroot pkg add fuse3 libfuse2 appimagelauncher" ] } ] @@ -324,7 +316,7 @@ "if" : "Document Viewer", "type" : "command", "commands" : ["!nextBoot flatpak install -y org.gnome.Evince || snap install evince"] - }, + }, { "if" : "Fonts", "type" : "command", @@ -432,7 +424,7 @@ { "if": "timeshift", "type": "command", - "commands": ["apt install -y timeshift"] + "commands": ["abroot pkg add timeshift"] } ] }, @@ -460,7 +452,7 @@ "if": "nvidia", "type": "command", "commands": [ - "apt install -y linux-headers-$(uname -r) nvidia-prime", + "abroot pkg add linux-headers-$(uname -r) nvidia-prime", "ikaros auto-install" ] } @@ -489,7 +481,7 @@ { "if": "vm", "type": "command", - "commands": ["apt install -y open-vm-tools open-vm-tools-desktop"] + "commands": ["abroot pkg add open-vm-tools open-vm-tools-desktop"] } ] }, @@ -513,7 +505,7 @@ { "if": "codecs", "type": "command", - "commands": ["apt install -y libavcodec-extra gstreamer1.0-fluendo-mp3 gstreamer1.0-libav gstreamer1.0-plugins-ugly gstreamer1.0-vaapi libavcodec-extra ttf-mscorefonts-installer unrar"] + "commands": ["abroot pkg add libavcodec-extra gstreamer1.0-fluendo-mp3 gstreamer1.0-libav gstreamer1.0-plugins-ugly gstreamer1.0-vaapi libavcodec-extra ttf-mscorefonts-installer unrar"] } ] }, @@ -535,7 +527,7 @@ "if": "apport", "type": "command", "commands": [ - "apt install -y apport", + "abroot pkg add apport", "systemctl enable apport.service || true" ] }, @@ -544,7 +536,7 @@ "condition": false, "type": "command", "commands": [ - "apt remove -y apport", + "abroot pkg remove apport", "systemctl disable apport.service || true" ] } diff --git a/vanilla_first_setup/defaults/hostname.py b/vanilla_first_setup/defaults/hostname.py index 71c2b55f..0ab758ed 100644 --- a/vanilla_first_setup/defaults/hostname.py +++ b/vanilla_first_setup/defaults/hostname.py @@ -73,7 +73,7 @@ def __on_hostname_entry_changed(self, *args): self.hostname_entry.remove_css_class('error') self.__verify_continue() return - + self.__window.toast("Hostname cannot contain special characters. Please choose another hostname.") self.hostname_entry.add_css_class('error') self.hostname = "" diff --git a/vanilla_first_setup/defaults/theme.py b/vanilla_first_setup/defaults/theme.py index 38f91607..f34a6851 100644 --- a/vanilla_first_setup/defaults/theme.py +++ b/vanilla_first_setup/defaults/theme.py @@ -37,7 +37,7 @@ def __init__(self, window, distro_info, key, step, **kwargs): self.btn_next.connect("clicked", self.__window.next) self.btn_default.connect('toggled', self.__set_theme, "light") self.btn_dark.connect('toggled', self.__set_theme, "dark") - + @property def step_id(self): return self.__key diff --git a/vanilla_first_setup/meson.build b/vanilla_first_setup/meson.build index bd021776..a1d9c003 100644 --- a/vanilla_first_setup/meson.build +++ b/vanilla_first_setup/meson.build @@ -23,7 +23,8 @@ configure_file( install_mode: 'rwxr-xr-x', configuration: conf, install: true, - install_dir: get_option('bindir') + install_dir: get_option('bindir'), + install_mode: 'rwxr-xr-x' ) configure_file( diff --git a/vanilla_first_setup/utils/processor.py b/vanilla_first_setup/utils/processor.py index 4a66f3f9..d3642780 100644 --- a/vanilla_first_setup/utils/processor.py +++ b/vanilla_first_setup/utils/processor.py @@ -127,8 +127,6 @@ def get_setup_commands(log_path, pre_run, post_run, commands): os.chmod(f.name, 0o755) cmd = ["pkexec", "sh", f.name] - if abroot_bin := shutil.which("abroot"): - cmd = ["pkexec", abroot_bin, "exec", "-f", "-s", "sh", f.name] return cmd @staticmethod diff --git a/vanilla_first_setup/window.py b/vanilla_first_setup/window.py index 5540e41e..da9349b7 100644 --- a/vanilla_first_setup/window.py +++ b/vanilla_first_setup/window.py @@ -108,7 +108,7 @@ def __build_ui(self, mode=0, rebuild=False): if rebuild: self.carousel.remove(self.__view_progress) self.carousel.remove(self.__view_done) - + for widget, status, protected in self.__builder.widgets: if rebuild: if protected: @@ -117,12 +117,12 @@ def __build_ui(self, mode=0, rebuild=False): if mode == 0 and not status: continue - + self.carousel.append(widget) self.carousel.append(self.__view_progress) self.carousel.append(self.__view_done) - + def rebuild_ui(self, mode=0): self.__build_ui(mode, rebuild=True) @@ -198,6 +198,6 @@ def toast(self, message, timeout=3): toast = Adw.Toast.new(message) toast.props.timeout = timeout self.toasts.add_toast(toast) - + def set_user(self, user): self.__user = user From f2a1a6a082ff7c13e2115043836da4c314446cbc Mon Sep 17 00:00:00 2001 From: Mateus Melchiades Date: Sat, 13 May 2023 18:30:13 -0300 Subject: [PATCH 2/9] defaults/user: Add new user to sudoers --- vanilla_first_setup/defaults/user.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vanilla_first_setup/defaults/user.py b/vanilla_first_setup/defaults/user.py index 8c78b150..9fbfd977 100644 --- a/vanilla_first_setup/defaults/user.py +++ b/vanilla_first_setup/defaults/user.py @@ -72,7 +72,8 @@ def get_finals(self): "type": "command", "commands": [ f"adduser --quiet --disabled-password --shell /bin/bash --gecos \"{self.fullname}\" {self.username}", - f"echo \"{self.username}:{self.password_entry.get_text()}\" | chpasswd" + f"echo \"{self.username}:{self.password_entry.get_text()}\" | chpasswd", + f"usermod -a -G sudo,lpadmin {self.username}" ] } ] From 396cd70b704a39bf7611d3553f35306678f924af Mon Sep 17 00:00:00 2001 From: Mateus Melchiades Date: Sat, 13 May 2023 18:35:16 -0300 Subject: [PATCH 3/9] views/post_script: Change font to Monospace --- vanilla_first_setup/views/post_script.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vanilla_first_setup/views/post_script.py b/vanilla_first_setup/views/post_script.py index d1fc3771..b125f80c 100644 --- a/vanilla_first_setup/views/post_script.py +++ b/vanilla_first_setup/views/post_script.py @@ -32,7 +32,7 @@ def __init__(self, window, post_script: str, **kwargs): self.__terminal = Vte.Terminal() self.__post_script = post_script self.__font = Pango.FontDescription() - self.__font.set_family("Ubuntu Mono") + self.__font.set_family("Monospace") self.__font.set_size(13 * Pango.SCALE) self.__font.set_weight(Pango.Weight.NORMAL) self.__font.set_stretch(Pango.Stretch.NORMAL) @@ -46,14 +46,14 @@ def __build_ui(self): self.console_output.append(self.__terminal) self.__terminal.connect("child-exited", self.on_vte_child_exited) - + palette = ["#353535", "#c01c28", "#26a269", "#a2734c", "#12488b", "#a347ba", "#2aa1b3", "#cfcfcf", "#5d5d5d", "#f66151", "#33d17a", "#e9ad0c", "#2a7bde", "#c061cb", "#33c7de", "#ffffff"] - + FOREGROUND = palette[0] BACKGROUND = palette[15] FOREGROUND_DARK = palette[15] BACKGROUND_DARK = palette[0] - + self.fg = Gdk.RGBA() self.bg = Gdk.RGBA() From 2b125c5d57b7c7120458a80cff68b5f7f3a579f9 Mon Sep 17 00:00:00 2001 From: Mateus Melchiades Date: Sat, 20 May 2023 21:44:58 -0300 Subject: [PATCH 4/9] utils/processor: Add `abroot pkg apply` command --- vanilla_first_setup/utils/processor.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vanilla_first_setup/utils/processor.py b/vanilla_first_setup/utils/processor.py index d3642780..95683dc2 100644 --- a/vanilla_first_setup/utils/processor.py +++ b/vanilla_first_setup/utils/processor.py @@ -18,7 +18,6 @@ import shutil import logging import tempfile -import subprocess logger = logging.getLogger("FirstSetup::Processor") @@ -115,6 +114,9 @@ def get_setup_commands(log_path, pre_run, post_run, commands): f.write(f"{out_run}\n") f.write("fi") + # commit changes + f.write(f"{abroot_bin} pkg apply\n") + # create the done file f.write("if [ $? -eq 0 ]; then\n") f.write(f"touch {done_file}\n") From 845646ba49689c48f99b899342c5d0ca0709acb9 Mon Sep 17 00:00:00 2001 From: Pietro di Caprio Date: Sun, 23 Jul 2023 23:43:23 +0200 Subject: [PATCH 5/9] Improve internet availability check --- vanilla_first_setup/defaults/conn_check.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/vanilla_first_setup/defaults/conn_check.py b/vanilla_first_setup/defaults/conn_check.py index 4b7436e6..2b92bdc5 100644 --- a/vanilla_first_setup/defaults/conn_check.py +++ b/vanilla_first_setup/defaults/conn_check.py @@ -14,8 +14,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from urllib.request import urlopen -from urllib.error import URLError +from requests import Session +from collections import OrderedDict +import requests import os from gi.repository import Gtk, GLib, Adw @@ -56,7 +57,14 @@ def async_fn(): return True try: - urlopen("https://google.com", timeout=1) + s = Session() + headers = OrderedDict({ + 'Accept-Encoding': 'gzip, deflate, br', + 'Host': "vanillaos.org", + 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:77.0) Gecko/20100101 Firefox/77.0' + }) + s.headers = headers + s.get(f"https://vanillaos.org/", headers=headers, verify=True) return True except: return False From cca15629f2fd58acde73e3822f40032b9854a947 Mon Sep 17 00:00:00 2001 From: Pietro di Caprio Date: Sun, 23 Jul 2023 23:49:58 +0200 Subject: [PATCH 6/9] Improve internet availability check --- vanilla_first_setup/defaults/conn_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vanilla_first_setup/defaults/conn_check.py b/vanilla_first_setup/defaults/conn_check.py index 2b92bdc5..0eea876a 100644 --- a/vanilla_first_setup/defaults/conn_check.py +++ b/vanilla_first_setup/defaults/conn_check.py @@ -57,7 +57,7 @@ def async_fn(): return True try: - s = Session() + s = Session() headers = OrderedDict({ 'Accept-Encoding': 'gzip, deflate, br', 'Host': "vanillaos.org", From c76a08093c2a4dcf78c390ac5be8c9511c74ba0d Mon Sep 17 00:00:00 2001 From: Mateus Melchiades Date: Mon, 24 Jul 2023 17:03:35 -0300 Subject: [PATCH 7/9] Update recipe --- recipe.json | 150 +++++------------- .../bundle-app-icons/org.gnome.Epiphany.png | Bin 0 -> 5815 bytes .../bundle-app-icons/org.gnome.Loupe.png | Bin 0 -> 10545 bytes .../assets/bundle-app-icons/org.gnome.eog.png | Bin 1769 -> 0 bytes vanilla_first_setup/defaults/hostname.py | 4 +- 5 files changed, 39 insertions(+), 115 deletions(-) create mode 100644 vanilla_first_setup/assets/bundle-app-icons/org.gnome.Epiphany.png create mode 100644 vanilla_first_setup/assets/bundle-app-icons/org.gnome.Loupe.png delete mode 100644 vanilla_first_setup/assets/bundle-app-icons/org.gnome.eog.png diff --git a/recipe.json b/recipe.json index 27e8f926..31d4bed1 100644 --- a/recipe.json +++ b/recipe.json @@ -65,12 +65,6 @@ "subtitle": "Manage and configure Flatpaks and the Flathub repository.", "default": true }, - { - "id": "snap", - "title": "Snap", - "subtitle": "Manage and configure Snaps and the Snapcraft repository.", - "disabled": true - }, { "id": "appimage", "title": "AppImage", @@ -94,16 +88,11 @@ "!nextBoot flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo" ] }, - { - "if": "snap", - "type": "command", - "commands": ["abroot pkg add snapd"] - }, { "if": "appimage", "type": "command", "commands": [ - "abroot pkg add fuse3 libfuse2 appimagelauncher" + "abroot pkg add fuse3 libfuse3-3" ] } ] @@ -128,20 +117,17 @@ { "name" : "Characters", "icon" : "org.gnome.Characters", - "flatpak" : true, - "snap" : true + "flatpak" : true }, { "name" : "Cheese", "icon" : "org.gnome.Cheese", - "flatpak" : true, - "snap" : true + "flatpak" : true }, { "name" : "Clocks", "icon" : "org.gnome.clocks", - "flatpak" : true, - "snap" : true + "flatpak" : true }, { "name" : "Connections", @@ -151,8 +137,7 @@ { "name" : "Contacts", "icon" : "org.gnome.Contacts", - "flatpak" : true, - "snap" : true + "flatpak" : true }, { "name" : "Disk Usage Analyzer", @@ -162,8 +147,7 @@ { "name" : "Document Viewer", "icon" : "org.gnome.Evince", - "flatpak" : true, - "snap" : true + "flatpak" : true }, { "name" : "Fonts", @@ -172,15 +156,13 @@ }, { "name" : "Image Viewer", - "icon" : "org.gnome.eog", - "flatpak" : true, - "snap" : true + "icon" : "org.gnome.Loupe", + "flatpak" : true }, { "name" : "Logs", "icon" : "org.gnome.Logs", - "flatpak" : true, - "snap" : true + "flatpak" : true }, { "name" : "Maps", @@ -195,8 +177,12 @@ { "name" : "Weather", "icon" : "org.gnome.Weather", - "flatpak" : true, - "snap" : true + "flatpak" : true + }, + { + "name" : "Web", + "icon" : "org.gnome.Epiphany", + "flatpak" : true } ] }, @@ -209,8 +195,7 @@ { "name" : "LibreOffice", "icon" : "org.libreoffice.LibreOffice", - "flatpak": true, - "snap" : true + "flatpak": true } ] }, @@ -238,14 +223,12 @@ { "name" : "Boxes", "icon" : "org.gnome.Boxes", - "flatpak" : true, - "snap" : true + "flatpak" : true }, { "name" : "Déjà Dup Backups", "icon" : "org.gnome.DejaDup", - "flatpak" : true, - "snap" : true + "flatpak" : true }, { "name" : "Flatseal", @@ -265,8 +248,7 @@ { "name" : "Shortwave", "icon" : "de.haeckerfelix.Shortwave", - "flatpak" : true, - "snap" : true + "flatpak" : true }, { "name" : "Sound Recorder", @@ -285,17 +267,17 @@ { "if" : "Characters", "type" : "command", - "commands" : ["!nextBoot flatpak install -y org.gnome.Characters || snap install gnome-characters"] + "commands" : ["!nextBoot flatpak install -y org.gnome.Characters"] }, { "if" : "Cheese", "type" : "command", - "commands" : ["!nextBoot flatpak install -y org.gnome.Cheese || snap install cheese"] + "commands" : ["!nextBoot flatpak install -y org.gnome.Cheese"] }, { "if" : "Clocks", "type" : "command", - "commands" : ["!nextBoot flatpak install -y org.gnome.clocks || snap install gnome-clocks"] + "commands" : ["!nextBoot flatpak install -y org.gnome.clocks"] }, { "if" : "Connections", @@ -305,7 +287,7 @@ { "if" : "Contacts", "type" : "command", - "commands" : ["!nextBoot flatpak install -y org.gnome.Contacts || snap install gnome-contacts"] + "commands" : ["!nextBoot flatpak install -y org.gnome.Contacts"] }, { "if" : "Disk Usage Analyzer", @@ -315,7 +297,7 @@ { "if" : "Document Viewer", "type" : "command", - "commands" : ["!nextBoot flatpak install -y org.gnome.Evince || snap install evince"] + "commands" : ["!nextBoot flatpak install -y org.gnome.Evince"] }, { "if" : "Fonts", @@ -325,12 +307,12 @@ { "if" : "Image Viewer", "type" : "command", - "commands" : ["!nextBoot flatpak install -y org.gnome.eog || snap install eog"] + "commands" : ["!nextBoot flatpak install -y org.gnome.Loupe"] }, { "if" : "Logs", "type" : "command", - "commands" : ["!nextBoot flatpak install -y org.gnome.Logs || snap install gnome-logs"] + "commands" : ["!nextBoot flatpak install -y org.gnome.Logs"] }, { "if" : "Maps", @@ -345,12 +327,17 @@ { "if" : "Weather", "type" : "command", - "commands" : ["!nextBoot flatpak install -y org.gnome.Weather || snap install gnome-weather"] + "commands" : ["!nextBoot flatpak install -y org.gnome.Weather"] + }, + { + "if" : "Web", + "type" : "command", + "commands" : ["!nextBoot flatpak install -y org.gnome.Epiphany"] }, { "if" : "LibreOffice", "type" : "command", - "commands" : ["!nextBoot flatpak install -y org.libreoffice.LibreOffice || snap install libreoffice"] + "commands" : ["!nextBoot flatpak install -y org.libreoffice.LibreOffice"] }, { "if" : "Bottles", @@ -370,12 +357,12 @@ { "if" : "Boxes", "type" : "command", - "commands" : ["!nextBoot flatpak install -y org.gnome.Boxes || snap install gnome-boxes"] + "commands" : ["!nextBoot flatpak install -y org.gnome.Boxes"] }, { "if" : "Déjà Dup Backups", "type" : "command", - "commands" : ["!nextBoot flatpak install -y org.gnome.DejaDup || snap install deja-dup"] + "commands" : ["!nextBoot flatpak install -y org.gnome.DejaDup"] }, { "if" : "Flatseal", @@ -395,7 +382,7 @@ { "if" : "Shortwave", "type" : "command", - "commands" : ["!nextBoot flatpak install -y de.haeckerfelix.Shortwave || snap install shortwave"] + "commands" : ["!nextBoot flatpak install -y de.haeckerfelix.Shortwave"] }, { "if" : "Sound Recorder", @@ -428,36 +415,6 @@ } ] }, - "nvidia": { - "template": "yes-no", - "is-advanced": true, - "preset": false, - "display-conditions": [ - "lspci | grep -i '.* nvidia .*'" - ], - "icon": "video-display-symbolic", - "title": "NVIDIA® Drivers", - "description": "Choose whether to install proprietary NVIDIA drivers for better compatibility and performance.", - "buttons": { - "yes": "Yes, install", - "no": "Skip", - "info": { - "type": "text", - "title": "About Proprietary Drivers", - "text": "A proprietary driver has private code that neither Vanilla OS nor Debian developers can review.\n\nSecurity and other updates are dependent on the driver vendor." - } - }, - "final": [ - { - "if": "nvidia", - "type": "command", - "commands": [ - "abroot pkg add linux-headers-$(uname -r) nvidia-prime", - "ikaros auto-install" - ] - } - ] - }, "vm": { "template": "yes-no", "is-advanced": true, @@ -505,40 +462,7 @@ { "if": "codecs", "type": "command", - "commands": ["abroot pkg add libavcodec-extra gstreamer1.0-fluendo-mp3 gstreamer1.0-libav gstreamer1.0-plugins-ugly gstreamer1.0-vaapi libavcodec-extra ttf-mscorefonts-installer unrar"] - } - ] - }, - "extra": { - "template": "preferences", - "is-advanced": true, - "icon": "dialog-warning-symbolic", - "title": "Extra Settings", - "description": "The following are optional settings, leave them as they are if you don't know what they do.", - "preferences": [ - { - "id": "apport", - "title": "Apport", - "subtitle": "Apport is a crash reporting system that helps us improve the stability of the system." - } - ], - "final": [ - { - "if": "apport", - "type": "command", - "commands": [ - "abroot pkg add apport", - "systemctl enable apport.service || true" - ] - }, - { - "if": "apport", - "condition": false, - "type": "command", - "commands": [ - "abroot pkg remove apport", - "systemctl disable apport.service || true" - ] + "commands": ["abroot pkg add libavcodec-extra gstreamer1.0-libav gstreamer1.0-plugins-ugly gstreamer1.0-vaapi libavcodec-extra ttf-mscorefonts-installer unrar"] } ] } diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Epiphany.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Epiphany.png new file mode 100644 index 0000000000000000000000000000000000000000..65f2b837f593ad6610999babaaa9d0ef8f174847 GIT binary patch literal 5815 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 B3&H>Z literal 0 HcmV?d00001 diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Loupe.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Loupe.png new file mode 100644 index 0000000000000000000000000000000000000000..f4d109d740d99afd0f3ef5d30787808f9267d6bf GIT binary patch literal 10545 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 literal 0 HcmV?d00001 diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.eog.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.eog.png deleted file mode 100644 index fc70bdf3533b735aed14053b12ddea61f5b37232..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1769 zcmZ{lcTm#_7RP@f2^|a(q)Q7`Bn1VDVS!KrQGq~Ms<3n^0fa~m20{xcAXQL7njDKO z%2JjEY0^BZut-t44XjA$Rgk`MZsun0W^UfR_nmp)`ONpf_foAb2}1l*`~Uz5S(uyH za8&+#^Kx@$SakFbM)7)Io&2+uMAK!3L|F(Ny3 z&F2qfx)8*A=?mklF^9XJ=YulcYDJjc7Mf7FW@0x33YV`nB{-6xOUYs_S6lfQ@1ckOh# zUyg4%D1G(T97?oe`l)?s=os9(+s|2bARON@2+LBbha#-pUu7Wl6eY_fH6$%DgEmXX zop`X!Z6T3F-f_#SCpLP|!ink(L_bciF)hx#?(Dl`QOzhxi4Y#r>(0WWo-Q^R(m z^^*gPw}LYEE@v9h29q8;v*mV~hj?;|Jz-vEUgipkNJ(X~s9!~Hto<32+3;29JZadulh;9A4<8C_;dh zUbi7Wv{oUGGQ?|0B~-iuzHf0!lnK)Kty(n)=|iVI{K~^)KGD-GTh?9qp|#W-A!nt2 zMh<;=BE_d}B=hW=noFo+ELbajM9h%Q_J@kjJ}Hd7XV7XD?JNCUsgr=8=QB-5;!1^0 zf=$kZMi4hAgt^CSjI%1psR8^};^tN5AsK}leU^nqc3^7uo!v~W&0S*;F+(NujD1-i6LNS*VCbA^JKOW}C zi42L9iwwG}G!4mM2&P~fzm}>i(H5ML)YraUwoEg?G)Qs$ zxImhFz2Lk}A+hg9C7e805^fCe(XN7NT-h8e!Blx@AMm0X$?uU#p9uyh7O|0$JIe(T zt|M;kg{Dy{b2GA;!)NIHgn+n%*Y3j~fsL8IJ z*1o!5A08^30(<-GeR0>O;rRjksgKgOgFaQZ+zFuN<;S0+GMKa=mMY|zQSNd+oQ$xe zv$OL-X~X+%$Ihpgd5xsbK>lA_c$?V1^BV?G@w%Jn$3*Gv&!k5PcU{PyN-rgGR5H=v z1z(&*i+u2pvLA=4lb~^nUR=p(A;P6+21b@gd?=cpY18LnF Date: Mon, 24 Jul 2023 17:14:43 -0300 Subject: [PATCH 8/9] Add icons to gschema --- vanilla_first_setup/vanilla-first-setup.gresource.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vanilla_first_setup/vanilla-first-setup.gresource.xml b/vanilla_first_setup/vanilla-first-setup.gresource.xml index a63fcbb3..d57d0fa5 100644 --- a/vanilla_first_setup/vanilla-first-setup.gresource.xml +++ b/vanilla_first_setup/vanilla-first-setup.gresource.xml @@ -39,10 +39,11 @@ assets/bundle-app-icons/org.gnome.clocks.png assets/bundle-app-icons/org.gnome.Connections.png assets/bundle-app-icons/org.gnome.Contacts.png - assets/bundle-app-icons/org.gnome.eog.png + assets/bundle-app-icons/org.gnome.Epiphany.png assets/bundle-app-icons/org.gnome.Evince.png assets/bundle-app-icons/org.gnome.font-viewer.png assets/bundle-app-icons/org.gnome.Logs.png + assets/bundle-app-icons/org.gnome.Loupe.png assets/bundle-app-icons/org.gnome.Maps.png assets/bundle-app-icons/org.gnome.SoundRecorder.png assets/bundle-app-icons/org.gnome.TextEditor.png @@ -53,3 +54,4 @@ assets/bundle-app-icons/org.gnome.DejaDup.png + From 63c3735f8484143fd0eddeace6562e9ce02fc098 Mon Sep 17 00:00:00 2001 From: Mateus Melchiades Date: Mon, 24 Jul 2023 18:43:27 -0300 Subject: [PATCH 9/9] Change log monospace font --- debian/changelog | 14 ++++++++++++++ vanilla_first_setup/views/progress.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 24d05c2f..4fab74b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +vanilla-first-setup (2.0.3) unstable; urgency=critical + + * Change log font + + -- Mateus Melchiades Mon, 24 Jul 2023 18:42:00 -0300 + +vanilla-first-setup (2.0.2) unstable; urgency=critical + + * Complete Orchid port + * Replace eog with Loupe + * Add Epiplany as default browser + + -- Mateus Melchiades Mon, 24 Jul 2023 18:34:00 -0300 + vanilla-first-setup (2.0.1) unstable; urgency=critical * Remove ubuntu-drivers-common dependency diff --git a/vanilla_first_setup/views/progress.py b/vanilla_first_setup/views/progress.py index 17656c6f..be65e040 100644 --- a/vanilla_first_setup/views/progress.py +++ b/vanilla_first_setup/views/progress.py @@ -41,7 +41,7 @@ def __init__(self, window, tour: dict, **kwargs): self.__success_fn = None self.__terminal = Vte.Terminal() self.__font = Pango.FontDescription() - self.__font.set_family("Ubuntu Mono") + self.__font.set_family("Monospace") self.__font.set_size(13 * Pango.SCALE) self.__font.set_weight(Pango.Weight.NORMAL) self.__font.set_stretch(Pango.Stretch.NORMAL)