From c768ee4aa3e3bc3438adb158a0a44effeda3f778 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 19:20:59 +0200 Subject: [PATCH 1/7] nixos/lomiri: ubuntu_font_family -> ubuntu-classic --- nixos/modules/services/desktop-managers/lomiri.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 8db2c4f5fca8..50080daaf7de 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -63,7 +63,7 @@ in { fonts.packages = with pkgs; [ # Applications tend to default to Ubuntu font - ubuntu_font_family + ubuntu-classic ]; # Copy-pasted basic stuff From 6613de20f24bace652af15727ab1b9a2c25e63a0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 19:21:32 +0200 Subject: [PATCH 2/7] tests/lomiri-system-settings: ubuntu_font_family -> ubuntu-classic --- nixos/tests/lomiri-system-settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lomiri-system-settings.nix b/nixos/tests/lomiri-system-settings.nix index 867fc14797e7..fac518484752 100644 --- a/nixos/tests/lomiri-system-settings.nix +++ b/nixos/tests/lomiri-system-settings.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { fonts.packages = with pkgs; [ # Intended font & helps with OCR - ubuntu_font_family + ubuntu-classic ]; services.upower.enable = true; From 47e508ba36653578af343f3a465d46a5883183e1 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 19:21:56 +0200 Subject: [PATCH 3/7] tests/morph-browser: ubuntu_font_family -> ubuntu-classic --- nixos/tests/morph-browser.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/morph-browser.nix b/nixos/tests/morph-browser.nix index 859e6bb47646..65ad4d85cc12 100644 --- a/nixos/tests/morph-browser.nix +++ b/nixos/tests/morph-browser.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { fonts.packages = with pkgs; [ # Intended font & helps with OCR - ubuntu_font_family + ubuntu-classic ]; }; From dc004592e8cd280f4cfd662466ca2ca82875486d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 19:22:25 +0200 Subject: [PATCH 4/7] tests/lomiri-filemanager-app: ubuntu_font_family -> ubuntu-classic --- nixos/tests/lomiri-filemanager-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lomiri-filemanager-app.nix b/nixos/tests/lomiri-filemanager-app.nix index de42c9d15089..efde3a01c114 100644 --- a/nixos/tests/lomiri-filemanager-app.nix +++ b/nixos/tests/lomiri-filemanager-app.nix @@ -24,7 +24,7 @@ fonts.packages = with pkgs; [ # Intended font & helps with OCR - ubuntu_font_family + ubuntu-classic ]; }; From 005ef5ab3962e56355710385e0e2a051dbd2da59 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 19:22:45 +0200 Subject: [PATCH 5/7] tests/lomiri-calculator-app: ubuntu_font_family -> ubuntu-classic --- nixos/tests/lomiri-calculator-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lomiri-calculator-app.nix b/nixos/tests/lomiri-calculator-app.nix index 3231353097a7..14d8073611f2 100644 --- a/nixos/tests/lomiri-calculator-app.nix +++ b/nixos/tests/lomiri-calculator-app.nix @@ -24,7 +24,7 @@ fonts.packages = with pkgs; [ # Intended font & helps with OCR - ubuntu_font_family + ubuntu-classic ]; }; From 2d49594644df0819e33326c6fc02385853ffa023 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 19:23:00 +0200 Subject: [PATCH 6/7] tests/lomiri-clock-app: ubuntu_font_family -> ubuntu-classic --- nixos/tests/lomiri-clock-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lomiri-clock-app.nix b/nixos/tests/lomiri-clock-app.nix index e68b89def534..9db5cee49cf7 100644 --- a/nixos/tests/lomiri-clock-app.nix +++ b/nixos/tests/lomiri-clock-app.nix @@ -24,7 +24,7 @@ fonts.packages = with pkgs; [ # Intended font & helps with OCR - ubuntu_font_family + ubuntu-classic ]; }; From 029b06454efb4360270fbcca90da42182dfdf68c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 19:23:19 +0200 Subject: [PATCH 7/7] tests/teleports: ubuntu_font_family -> ubuntu-classic --- nixos/tests/teleports.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/teleports.nix b/nixos/tests/teleports.nix index 31f4946a0843..a4293f954a45 100644 --- a/nixos/tests/teleports.nix +++ b/nixos/tests/teleports.nix @@ -24,7 +24,7 @@ fonts.packages = with pkgs; [ # Intended font & helps with OCR - ubuntu_font_family + ubuntu-classic ]; };