Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ Removed packages (RPMs):
- Fedora third-party repos & built-in Fedora flatpak repo

Replaced packages (RPMs):
- [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)
(for better, more suitable first-time install experience)
- [Power Profiles Daemon](https://gitlab.freedesktop.org/upower/power-profiles-daemon) instead of [Tuned](https://tuned-project.org/)
(because Power Profiles Daemon is simpler & more reliable than Tuned for power-management)
- [Trivalent](https://github.com/secureblue/Trivalent) instead of [Firefox](https://www.mozilla.org/en-US/firefox/)
Expand All @@ -43,11 +41,9 @@ Installed packages (RPMs):
- [Python3-icoextract](https://github.com/jlu5/icoextract) (for .exe icons thumbnailing support)
- [Miniaturo](https://github.com/dbrgn/miniaturo) (RAW pictures thumbnailing for Nautilus)
- [Foo2zjs](https://www.openprinting.org/driver/foo2zjs/) (Driver which supports some additional Konica Minolta printers)
- [Uld](https://www.bchemnet.com/suldr/) (Driver which supports some additional Samsung printers)
- [sg3_utils](https://sg.danny.cz/sg/sg3_utils.html) (Package which contains utilities that send SCSI commands to devices - used by Apple SuperDrive)
- [rar](https://www.win-rar.com/rar-linux-mac.html?&L=0) (RAR CLI package)
- [pandoc](https://github.com/jgm/pandoc) (CLI Document converter)
- [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)
- [dr14_t.meter](https://github.com/simon-r/dr14_t.meter) (support for reading dynamic range of audio files)
- vulkan-tools (useful for debugging)
- zenity (useful for showing dialogs & it's something crucial that the base image should have imo, but it's shot down as a suggestion)
Expand All @@ -69,7 +65,6 @@ Installed extensions:
- [Quick Settings Audio Devices Renamer](https://extensions.gnome.org/extension/6000/quick-settings-audio-devices-renamer/) (disabled by default)
- [Quick Settings Audio Devices Hider](https://extensions.gnome.org/extension/5964/quick-settings-audio-devices-hider/) (disabled by default)
- [Remove World Clocks](https://extensions.gnome.org/extension/6973/remove-world-clocks/) (disabled by default)
- [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)
- [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)

Installed flatpaks:
Expand Down Expand Up @@ -243,6 +238,5 @@ To rebase an existing installation to the latest build:
## COPR repos used for some installed RPM packages
- [ROM Properties](https://copr.fedorainfracloud.org/coprs/bazzite-org/rom-properties/)
- [Miniaturo](https://copr.fedorainfracloud.org/coprs/decathorpe/miniaturo/)
- [Better Fonts](https://copr.fedorainfracloud.org/coprs/hyperreal/better_fonts/)
- [Trivalent subresource filter](https://copr.fedorainfracloud.org/coprs/secureblue/trivalent/)
- [DR14 T Meter](https://copr.fedorainfracloud.org/coprs/sassam/dr14_tmeter/)
85 changes: 0 additions & 85 deletions files/0-system/usr/share/X11/xkb/symbols/capslock

This file was deleted.

95 changes: 0 additions & 95 deletions files/0-system/usr/share/ublue-os/firstboot/yafti.yml

This file was deleted.

151 changes: 151 additions & 0 deletions files/0-system/usr/share/xkeyboard-config-2/symbols/capslock
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
default hidden partial modifier_keys
xkb_symbols "capslock" {
replace key <CAPS> { [ Caps_Lock ], type[group1] = "ONE_LEVEL" };
modifier_map Lock { Caps_Lock };
};

hidden partial modifier_keys
xkb_symbols "shiftlock" {
replace key <CAPS> { [ Shift_Lock ], type[group1] = "ONE_LEVEL" };
modifier_map Shift { Shift_Lock };
};

hidden partial modifier_keys
xkb_symbols "swapescape" {
key <CAPS> { [ Escape ], type[group1] = "ONE_LEVEL" };
key <ESC> { [ Caps_Lock ] };
};

hidden partial modifier_keys
xkb_symbols "escape" {
key <CAPS> { [ Escape ], type[group1] = "ONE_LEVEL" };
};

hidden partial modifier_keys
xkb_symbols "escape_shifted_capslock" {
key <CAPS> {
type[Group1] = "TWO_LEVEL",
symbols[Group1] = [ Escape, Caps_Lock ],
actions[Group1] = [ NoAction(), LockMods(modifiers = Lock) ]
};
};

hidden partial modifier_keys
xkb_symbols "escape_shifted_compose" {
key <CAPS> {
type[Group1] = "TWO_LEVEL",
symbols[Group1] = [ Escape, Multi_key ],
actions[Group1] = [ NoAction(), NoAction() ]
};
};

hidden partial modifier_keys
xkb_symbols "backspace" {
key <CAPS> { [ BackSpace ], type[group1] = "ONE_LEVEL" };
};

hidden partial modifier_keys
xkb_symbols "return" {
key <CAPS> { [ Return ], type[group1] = "ONE_LEVEL" };
};

hidden partial modifier_keys
xkb_symbols "super" {
key <CAPS> { [ Super_L ], type[group1] = "ONE_LEVEL" };
modifier_map Mod4 { <CAPS> };
};

hidden partial modifier_keys
xkb_symbols "hyper" {
key <CAPS> { [ Hyper_L ], type[group1] = "ONE_LEVEL" };
modifier_map None { <CAPS> };
include "hyper(mod3)"
};

hidden partial modifier_keys
xkb_symbols "menu" {
key <CAPS> { [ Menu ], type[group1] = "ONE_LEVEL" };
};

hidden partial modifier_keys
xkb_symbols "numlock" {
key <CAPS> { [ Num_Lock ], type[group1] = "ONE_LEVEL" };
};

hidden partial modifier_keys
xkb_symbols "ctrl_shifted_capslock" {
key <CAPS> {
type[Group1] = "TWO_LEVEL",
symbols[Group1] = [ Control_L, Caps_Lock ],
// Explicit actions are preferred over modMap None/Control { Caps_Lock }
// because they have no side effect
actions[Group1] = [ SetMods(modifiers=Control), LockMods(modifiers=Lock) ]
};
};

// This changes the <CAPS> key to become a Control modifier,
// but it will still produce the Caps_Lock keysym.
hidden partial modifier_keys
xkb_symbols "ctrl_modifier" {
key <CAPS> {
type="ALPHABETIC",
repeat=No,
symbols[Group1]= [ Caps_Lock, Caps_Lock ],
actions[Group1]= [ LockMods(modifiers=Lock),
LockMods(modifiers=Shift+Lock,affect=unlock) ]
};
};

hidden partial modifier_keys
xkb_symbols "none" {
key <CAPS> { [ VoidSymbol ], type[group1] = "ONE_LEVEL" };
};

// For layouts having digits on the 2nd level on the digits row and key type
// FOUR_LEVEL (e.g. fr(basic) and be(basic)), this makes CapsLock give the digits
// by changing their key type to FOUR_LEVEL_SEMIALPHABETIC. Note that this has the
// drawback that the uppercases À, È, É and Ç are no longer available, as those
// layouts rely on internal capitalization rules for those letters.
hidden partial alphanumeric_keys
xkb_symbols "digits_row" {
key.type[group1] = "FOUR_LEVEL_SEMIALPHABETIC";

// No symbol defined: we just want to change the key type
key <AE01> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE02> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE03> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE04> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE05> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE06> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE07> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE08> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE09> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE10> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
};

// The Shift + Caps Lock combination inverts the first two levels only.
// Originally designed for layouts with digits on the second level of the
// digits row (e.g. Azerty layouts).
// This allows users to have direct access to digits while keeping
// usual capitalization via Caps Lock.
hidden partial alphanumeric_keys
xkb_symbols "digits_row_independent_lock" {
key <CAPS> {
type[Group1] = "TWO_LEVEL",
symbols[Group1] = [ NoSymbol, ISO_Level5_Lock ]
};

key.type[group1] = "FOUR_LEVEL_LOCKABLE_LEVEL2";

// No symbol defined: we just want to change the key type
key <AE01> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE02> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE03> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE04> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE05> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE06> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE07> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE08> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE09> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
key <AE10> { [ NoSymbol, NoSymbol, NoSymbol, NoSymbol ] };
};
3 changes: 3 additions & 0 deletions files/gschema-overrides/zz1-gidro.gschema.override
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ logo='/usr/share/pixmaps/gidro-gdm-logo.png'
[org.gnome.Ptyxis]
restore-session=false

[org.gnome.settings-daemon.plugins.housekeeping]
donation-reminder-enabled=false

#-------------- RELOCATABLE SCHEMAS IN THIS SECTION ARE LOCATED IN DCONF --------------#

[org.gnome.desktop.app-folders]
Expand Down
2 changes: 1 addition & 1 deletion recipes/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ modules:
- rm -r /tmp/oversteer-udev/
# Remove avif thumbnailer, as HEIF thumbnailer already covers it (not done in Ublue)
- echo -e "\033[90mRemove avif thumbnailer, as HEIF thumbnailer already covers it (not done in Ublue)\033[0m"
- rm /usr/share/thumbnailers/avif.thumbnailer
- "if [ -f /usr/share/thumbnailers/heif.thumbnailer ] && [ -f /usr/share/thumbnailers/avif.thumbnailer ]; then rm -f /usr/share/thumbnailers/avif.thumbnailer; fi"
# Install just manually until ISO problem is solved
- echo -e "\033[90mInstalling just manually until ISO issue is fixed (not done in Ublue)\033[0m"
- "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"
Expand Down
Loading