auxolotl/templates
20
1
Fork 3
Code Issues 3 Pull requests 2 Actions Packages Projects Releases Wiki Activity

fix(system): fix aux.system.ui.desktops namespacing in desktop and flatpak modules

Browse source
This commit is contained in:
Andre 2024-06-29 10:31:30 -04:00
parent e11982a0ac
commit 1ff80eed70
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
system/modules/system/system.nix
View file

@ -3,7 +3,6 @@
pkgs, pkgs,
config, config,
lib, lib,
inputs,
... ...
}: }:
let let

13
system/modules/ui/desktops/common.nix
View file

@ -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

4
system/modules/ui/flatpak.nix
View file

@ -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" ];
}; };