Skip to content

Commit 52164e4

Browse files
fiftydinarfiftydinar
authored
Merge pull request #65 from fiftydinar/fedora-43
chore: Merge needed changes for Fedora 43
2 parents ff7181a + 4395dba commit 52164e4

File tree

9 files changed

+158
-195
lines changed

9 files changed

+158
-195
lines changed

‎README.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ Removed packages (RPMs):
2222
- Fedora third-party repos & built-in Fedora flatpak repo
2323

2424
Replaced packages (RPMs):
25-
- [Yafti](https://github.com/ublue-os/yafti) instead of [Gnome Initial Setup](https://gitlab.gnome.org/GNOME/gnome-initial-setup) & [Gnome Tour](https://gitlab.gnome.org/GNOME/gnome-tour)
26-
(for better, more suitable first-time install experience)
2725
- [Power Profiles Daemon](https://gitlab.freedesktop.org/upower/power-profiles-daemon) instead of [Tuned](https://tuned-project.org/)
2826
(because Power Profiles Daemon is simpler & more reliable than Tuned for power-management)
2927
- [Trivalent](https://github.com/secureblue/Trivalent) instead of [Firefox](https://www.mozilla.org/en-US/firefox/)
@@ -43,11 +41,9 @@ Installed packages (RPMs):
4341
- [Python3-icoextract](https://github.com/jlu5/icoextract) (for .exe icons thumbnailing support)
4442
- [Miniaturo](https://github.com/dbrgn/miniaturo) (RAW pictures thumbnailing for Nautilus)
4543
- [Foo2zjs](https://www.openprinting.org/driver/foo2zjs/) (Driver which supports some additional Konica Minolta printers)
46-
- [Uld](https://www.bchemnet.com/suldr/) (Driver which supports some additional Samsung printers)
4744
- [sg3_utils](https://sg.danny.cz/sg/sg3_utils.html) (Package which contains utilities that send SCSI commands to devices - used by Apple SuperDrive)
4845
- [rar](https://www.win-rar.com/rar-linux-mac.html?&L=0) (RAR CLI package)
4946
- [pandoc](https://github.com/jgm/pandoc) (CLI Document converter)
50-
- [fontconfig-font-replacements](https://github.com/hyperreal64/fedora-better-fonts) (Also known as `better-fonts`. It fills the gap of missing proprietary fonts with the open-source font replacements)
5147
- [dr14_t.meter](https://github.com/simon-r/dr14_t.meter) (support for reading dynamic range of audio files)
5248
- vulkan-tools (useful for debugging)
5349
- zenity (useful for showing dialogs & it's something crucial that the base image should have imo, but it's shot down as a suggestion)
@@ -69,7 +65,6 @@ Installed extensions:
6965
- [Quick Settings Audio Devices Renamer](https://extensions.gnome.org/extension/6000/quick-settings-audio-devices-renamer/) (disabled by default)
7066
- [Quick Settings Audio Devices Hider](https://extensions.gnome.org/extension/5964/quick-settings-audio-devices-hider/) (disabled by default)
7167
- [Remove World Clocks](https://extensions.gnome.org/extension/6973/remove-world-clocks/) (disabled by default)
72-
- [Sleep Through Notifications](https://gitlab.gnome.org/rhendric/sleep-through-notifications) (disabled by default, useful for setups where screen wake on new notifications is annoying, while retaining notifications functionality)
7368
- [Unblank lock screen](https://github.com/sunwxg/gnome-shell-extension-unblank) (disabled by default, useful if you don't want the behavior of locking the screen to also turn off your screen)
7469

7570
Installed flatpaks:
@@ -243,6 +238,5 @@ To rebase an existing installation to the latest build:
243238
## COPR repos used for some installed RPM packages
244239
- [ROM Properties](https://copr.fedorainfracloud.org/coprs/bazzite-org/rom-properties/)
245240
- [Miniaturo](https://copr.fedorainfracloud.org/coprs/decathorpe/miniaturo/)
246-
- [Better Fonts](https://copr.fedorainfracloud.org/coprs/hyperreal/better_fonts/)
247241
- [Trivalent subresource filter](https://copr.fedorainfracloud.org/coprs/secureblue/trivalent/)
248242
- [DR14 T Meter](https://copr.fedorainfracloud.org/coprs/sassam/dr14_tmeter/)

‎files/0-system/usr/share/X11/xkb/symbols/capslock‎

Lines changed: 0 additions & 85 deletions
This file was deleted.

‎files/0-system/usr/share/ublue-os/firstboot/yafti.yml‎

Lines changed: 0 additions & 95 deletions
This file was deleted.

‎files/0-system/usr/share/xkeyboard-config-2/symbols/capslock‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
default hidden partial modifier_keys
2+
xkb_symbols "capslock" {
3+
replace key <CAPS> { [ Caps_Lock ], type[group1] = "ONE_LEVEL" };
4+
modifier_map Lock { Caps_Lock };
5+
};
6+
7+
hidden partial modifier_keys
8+
xkb_symbols "shiftlock" {
9+
replace key <CAPS> { [ Shift_Lock ], type[group1] = "ONE_LEVEL" };
10+
modifier_map Shift { Shift_Lock };
11+
};
12+
13+
hidden partial modifier_keys
14+
xkb_symbols "swapescape" {
15+
key <CAPS> { [ Escape ], type[group1] = "ONE_LEVEL" };
16+
key <ESC> { [ Caps_Lock ] };
17+
};
18+
19+
hidden partial modifier_keys
20+
xkb_symbols "escape" {
21+
key <CAPS> { [ Escape ], type[group1] = "ONE_LEVEL" };
22+
};
23+
24+
hidden partial modifier_keys
25+
xkb_symbols "escape_shifted_capslock" {
26+
key <CAPS> {
27+
type[Group1] = "TWO_LEVEL",
28+
symbols[Group1] = [ Escape, Caps_Lock ],
29+
actions[Group1] = [ NoAction(), LockMods(modifiers = Lock) ]
30+
};
31+
};
32+
33+
hidden partial modifier_keys
34+
xkb_symbols "escape_shifted_compose" {
35+
key <CAPS> {
36+
type[Group1] = "TWO_LEVEL",
37+
symbols[Group1] = [ Escape, Multi_key ],
38+
actions[Group1] = [ NoAction(), NoAction() ]
39+
};
40+
};
41+
42+
hidden partial modifier_keys
43+
xkb_symbols "backspace" {
44+
key <CAPS> { [ BackSpace ], type[group1] = "ONE_LEVEL" };
45+
};
46+
47+
hidden partial modifier_keys
48+
xkb_symbols "return" {
49+
key <CAPS> { [ Return ], type[group1] = "ONE_LEVEL" };
50+
};
51+
52+
hidden partial modifier_keys
53+
xkb_symbols "super" {
54+
key <CAPS> { [ Super_L ], type[group1] = "ONE_LEVEL" };
55+
modifier_map Mod4 { <CAPS> };
56+
};
57+
58+
hidden partial modifier_keys
59+
xkb_symbols "hyper" {
60+
key <CAPS> { [ Hyper_L ], type[group1] = "ONE_LEVEL" };
61+
modifier_map None { <CAPS> };
62+
include "hyper(mod3)"
63+
};
64+
65+
hidden partial modifier_keys
66+
xkb_symbols "menu" {
67+
key <CAPS> { [ Menu ], type[group1] = "ONE_LEVEL" };
68+
};
69+
70+
hidden partial modifier_keys
71+
xkb_symbols "numlock" {
72+
key <CAPS> { [ Num_Lock ], type[group1] = "ONE_LEVEL" };
73+
};
74+
75+
hidden partial modifier_keys
76+
xkb_symbols "ctrl_shifted_capslock" {
77+
key <CAPS> {
78+
type[Group1] = "TWO_LEVEL",
79+
symbols[Group1] = [ Control_L, Caps_Lock ],
80+
// Explicit actions are preferred over modMap None/Control { Caps_Lock }
81+
// because they have no side effect
82+
actions[Group1] = [ SetMods(modifiers=Control), LockMods(modifiers=Lock) ]
83+
};
84+
};
85+
86+
// This changes the <CAPS> key to become a Control modifier,
87+
// but it will still produce the Caps_Lock keysym.
88+
hidden partial modifier_keys
89+
xkb_symbols "ctrl_modifier" {
90+
key <CAPS> {
91+
type="ALPHABETIC",
92+
repeat=No,
93+
symbols[Group1]= [ Caps_Lock, Caps_Lock ],
94+
actions[Group1]= [ LockMods(modifiers=Lock),
95+
LockMods(modifiers=Shift+Lock,affect=unlock) ]
96+
};
97+
};
98+
99+
hidden partial modifier_keys
100+
xkb_symbols "none" {
101+
key <CAPS> { [ VoidSymbol ], type[group1] = "ONE_LEVEL" };
102+
};
103+
104+
// For layouts having digits on the 2nd level on the digits row and key type
105+
// FOUR_LEVEL (e.g. fr(basic) and be(basic)), this makes CapsLock give the digits
106+
// by changing their key type to FOUR_LEVEL_SEMIALPHABETIC. Note that this has the
107+
// drawback that the uppercases À, È, É and Ç are no longer available, as those
108+
// layouts rely on internal capitalization rules for those letters.
109+
hidden partial alphanumeric_keys
110+
xkb_symbols "digits_row" {
111+
key.type[group1] = "FOUR_LEVEL_SEMIALPHABETIC";
112+
113+
// No symbol defined: we just want to change the key type
114+
key <AE01> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
115+
key <AE02> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
116+
key <AE03> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
117+
key <AE04> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
118+
key <AE05> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
119+
key <AE06> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
120+
key <AE07> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
121+
key <AE08> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
122+
key <AE09> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
123+
key <AE10> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
124+
};
125+
126+
// The Shift + Caps Lock combination inverts the first two levels only.
127+
// Originally designed for layouts with digits on the second level of the
128+
// digits row (e.g. Azerty layouts).
129+
// This allows users to have direct access to digits while keeping
130+
// usual capitalization via Caps Lock.
131+
hidden partial alphanumeric_keys
132+
xkb_symbols "digits_row_independent_lock" {
133+
key <CAPS> {
134+
type[Group1] = "TWO_LEVEL",
135+
symbols[Group1] = [ NoSymbol, ISO_Level5_Lock ]
136+
};
137+
138+
key.type[group1] = "FOUR_LEVEL_LOCKABLE_LEVEL2";
139+
140+
// No symbol defined: we just want to change the key type
141+
key <AE01> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
142+
key <AE02> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
143+
key <AE03> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
144+
key <AE04> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
145+
key <AE05> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
146+
key <AE06> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
147+
key <AE07> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
148+
key <AE08> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
149+
key <AE09> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
150+
key <AE10> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
151+
};

‎files/gschema-overrides/zz1-gidro.gschema.override‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ logo='/usr/share/pixmaps/gidro-gdm-logo.png'
113113
[org.gnome.Ptyxis]
114114
restore-session=false
115115

116+
[org.gnome.settings-daemon.plugins.housekeeping]
117+
donation-reminder-enabled=false
118+
116119
#-------------- RELOCATABLE SCHEMAS IN THIS SECTION ARE LOCATED IN DCONF --------------#
117120

118121
[org.gnome.desktop.app-folders]

‎recipes/base.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ modules:
117117
- rm -r /tmp/oversteer-udev/
118118
# Remove avif thumbnailer, as HEIF thumbnailer already covers it (not done in Ublue)
119119
- echo -e "\033[90mRemove avif thumbnailer, as HEIF thumbnailer already covers it (not done in Ublue)\033[0m"
120-
- rm /usr/share/thumbnailers/avif.thumbnailer
120+
- "if [ -f /usr/share/thumbnailers/heif.thumbnailer ] && [ -f /usr/share/thumbnailers/avif.thumbnailer ]; then rm -f /usr/share/thumbnailers/avif.thumbnailer; fi"
121121
# Install just manually until ISO problem is solved
122122
- echo -e "\033[90mInstalling just manually until ISO issue is fixed (not done in Ublue)\033[0m"
123123
- "VER=$(basename $(curl -Ls -o /dev/null -w %{url_effective} https://github.com/casey/just/releases/latest)) && curl -fLs --create-dirs https://github.com/casey/just/releases/download/${VER}/just-${VER}-x86_64-unknown-linux-musl.tar.gz -o /tmp/just-x86_64-unknown-linux-musl.tar.gz"

0 commit comments

Comments
 (0)