talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

nixos/lomiri: Replace NIX_GSETTINGS_OVERRIDES_DIR with Dconf database

Browse Source 
To fix conflicting NIX_GSETTINGS_OVERRIDES_DIR definitions when enabling multiple DEs.
This commit is contained in:
OPNA2608 2025-08-01 22:02:25 +02:00
parent 4edcaa1606
commit be3916c40e
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nixos/modules/services/desktop-managers/lomiri.nix
View File

@ -7,9 +7,6 @@
let let
cfg = config.services.desktopManager.lomiri; cfg = config.services.desktopManager.lomiri;
nixos-gsettings-overrides = pkgs.lomiri.lomiri-gsettings-overrides.override {
inherit (cfg) extraGSettingsOverrides extraGSettingsOverridePackages;
};
in in
{ {
options.services.desktopManager.lomiri = { options.services.desktopManager.lomiri = {
@ -25,18 +22,6 @@ in
type = lib.types.bool; type = lib.types.bool;
default = config.services.xserver.displayManager.lightdm.greeters.lomiri.enable || cfg.enable; default = config.services.xserver.displayManager.lightdm.greeters.lomiri.enable || cfg.enable;
}; };
extraGSettingsOverrides = lib.mkOption {
description = "Additional GSettings overrides.";
type = lib.types.lines;
default = "";
};
extraGSettingsOverridePackages = lib.mkOption {
description = "List of packages for which GSettings are overridden.";
type = lib.types.listOf lib.types.path;
default = [ ];
};
}; };
config = lib.mkMerge [ config = lib.mkMerge [
@ -58,16 +43,26 @@ in
"/share/wallpapers" "/share/wallpapers"
]; ];
# Override GSettings defaults systemPackages = with pkgs.lomiri; [
sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
systemPackages = [
nixos-gsettings-overrides # GSettings default overrides
]
++ (with pkgs.lomiri; [
lomiri-wallpapers # default + additional wallpaper lomiri-wallpapers # default + additional wallpaper
suru-icon-theme # basic indicator icons suru-icon-theme # basic indicator icons
]); ];
};
# Override GSettings defaults
programs.dconf = {
enable = true;
profiles.user.databases = [
{
settings = {
"com/lomiri/shell/launcher" = {
logo-picture-uri = "file://${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake-white.svg";
home-button-background-color = "#5277C3";
};
};
lockAll = true;
}
];
}; };
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
@ -156,7 +151,6 @@ in
# Copy-pasted basic stuff # Copy-pasted basic stuff
hardware.graphics.enable = lib.mkDefault true; hardware.graphics.enable = lib.mkDefault true;
fonts.enableDefaultPackages = lib.mkDefault true; fonts.enableDefaultPackages = lib.mkDefault true;
programs.dconf.enable = lib.mkDefault true;
services.accounts-daemon.enable = true; services.accounts-daemon.enable = true;