From d1cef34d092c16ae28bc72e77a6c87b77ac7d992 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 1 Aug 2025 22:05:45 +0200 Subject: [PATCH] lomiri.lomiri-gsettings-overrides: Drop Implemented via Dconf now. --- .../lomiri-gsettings-overrides/default.nix | 52 ------------------- pkgs/desktops/lomiri/default.nix | 1 - 2 files changed, 53 deletions(-) delete mode 100644 pkgs/desktops/lomiri/data/lomiri-gsettings-overrides/default.nix diff --git a/pkgs/desktops/lomiri/data/lomiri-gsettings-overrides/default.nix b/pkgs/desktops/lomiri/data/lomiri-gsettings-overrides/default.nix deleted file mode 100644 index 8f02f1531eb7..000000000000 --- a/pkgs/desktops/lomiri/data/lomiri-gsettings-overrides/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - runCommand, - glib, - lomiri-schemas, - lomiri-wallpapers, - nixos-icons, - writeText, - extraGSettingsOverrides ? "", - extraGSettingsOverridePackages ? [ ], - nixos-artwork, -}: - -let - # Overriding the background picture should be possible, but breaks within the VM tests. - # It results in either a grey background (prolly indicating an error somewhere) - # or hangs the session (also happens when using LSS, which sets it via AccountsService). - # - # So we can only override the launcher button details. - # Button colour: https://github.com/NixOS/nixos-artwork/blob/51a27e4a011e95cb559e37d32c44cf89b50f5154/logo/README.md#colours - gsettingsOverrides = writeText "lomiri-gschema-overrides" '' - [com.lomiri.Shell.Launcher] - logo-picture-uri='file://${nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake-white.svg' - home-button-background-color='#5277C3' - - ${extraGSettingsOverrides} - ''; - - gsettingsOverridePackages = [ - lomiri-schemas - ] - ++ extraGSettingsOverridePackages; -in -runCommand "lomiri-gsettings-overrides" { preferLocalBuild = true; } '' - dataDir="$out/share/gsettings-schemas/nixos-gsettings-overrides" - schemaDir="$dataDir/glib-2.0/schemas" - mkdir -p "$schemaDir" - - ${lib.strings.concatMapStringsSep "\n" ( - pkg: - "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schemaDir\"" - ) gsettingsOverridePackages} - - chmod -R a+w "$dataDir" - cp --no-preserve=mode "${gsettingsOverrides}" "$schemaDir/zz-nixos-defaults.gschema.override" - - ${lib.getExe' glib.dev "glib-compile-schemas"} --strict "$schemaDir" | tee gcs.log - - if grep 'No schema files found' gcs.log >/dev/null; then - exit 1 - fi -'' diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index fbcb046f2caa..893165171bb5 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -31,7 +31,6 @@ let teleports = callPackage ./applications/teleports { }; #### Data - lomiri-gsettings-overrides = callPackage ./data/lomiri-gsettings-overrides { }; lomiri-schemas = callPackage ./data/lomiri-schemas { }; lomiri-session = callPackage ./data/lomiri-session { }; lomiri-sounds = callPackage ./data/lomiri-sounds { };