fix(system): fix aux.system.ui.desktops namespacing in desktop and flatpak modules
This commit is contained in:
parent
99d245bbe0
commit
eb62349d7b
|
@ -25,9 +25,10 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
aux.system.ui.audio.enable = true;
|
aux.system = {
|
||||||
|
bluetooth.enable = true;
|
||||||
hardware.bluetooth.enable = true;
|
ui.audio.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
# Enable Plymouth for graphical bootsplash.
|
# Enable Plymouth for graphical bootsplash.
|
||||||
|
@ -46,12 +47,12 @@ in
|
||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system.
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
# Enable touchpad support (enabled by default in most desktop managers, buuuut just in case).
|
|
||||||
libinput.enable = true;
|
|
||||||
|
|
||||||
# Configure keymap in X11
|
# Configure keymap in X11
|
||||||
xkb = config.aux.system.ui.desktops.xkb;
|
xkb = config.aux.system.ui.desktops.xkb;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Enable touchpad support (enabled by default in most desktop managers, buuuut just in case).
|
||||||
|
libinput.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Support for AppImage files
|
# Support for AppImage files
|
||||||
|
|
|
@ -66,8 +66,8 @@ with lib;
|
||||||
aggregatedIcons = pkgs.buildEnv {
|
aggregatedIcons = pkgs.buildEnv {
|
||||||
name = "system-icons";
|
name = "system-icons";
|
||||||
paths = with pkgs; [
|
paths = with pkgs; [
|
||||||
(lib.mkIf config.aux.system.ui.gnome.enable gnome.gnome-themes-extra)
|
(lib.mkIf config.aux.system.ui.desktops.gnome.enable gnome.gnome-themes-extra)
|
||||||
(lib.mkIf config.aux.system.ui.kde.enable kdePackages.breeze-icons)
|
(lib.mkIf config.aux.system.ui.desktops.kde.enable kdePackages.breeze-icons)
|
||||||
];
|
];
|
||||||
pathsToLink = [ "/share/icons" ];
|
pathsToLink = [ "/share/icons" ];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue