diff options
Diffstat (limited to 'modules/gnome')
| -rw-r--r-- | modules/gnome/default.nix | 3 | ||||
| -rw-r--r-- | modules/gnome/extensions.nix | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/modules/gnome/default.nix b/modules/gnome/default.nix index 4422eef..af090a9 100644 --- a/modules/gnome/default.nix +++ b/modules/gnome/default.nix @@ -13,7 +13,8 @@ description = "Extension package"; }; email = mkOption { - type = str; + type = nullOr str; + default = null; description = "Extensions' maintainer email"; }; dconf-settings = mkOption { diff --git a/modules/gnome/extensions.nix b/modules/gnome/extensions.nix index 1127359..fe8f608 100644 --- a/modules/gnome/extensions.nix +++ b/modules/gnome/extensions.nix @@ -1,13 +1,13 @@ { config, lib, pkgs, ... } : let - inherit (builtins) attrNames attrValues; + inherit (builtins) attrNames attrValues filter; cfg = config.santi-modules.gnome; enabled-extensions = lib.filterAttrs (key: conf: conf.enabled) cfg.extensions; in { config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ gnome-tweaks - tela-icon-theme - hackneyed + tela-icon-theme # gtk theme + hackneyed # mouse icons ] ++ map (pkg-name: pkgs.gnomeExtensions.${pkg-name}) (attrNames enabled-extensions); santi-modules.gnome.extensions = { @@ -26,7 +26,8 @@ in { }; home-manager.users.leonardo.dconf.settings = lib.mkMerge ([{ "org/gnome/shell" = { - enabled-extensions = map (pkg: pkg.email) (attrValues enabled-extensions); + enabled-extensions = filter (e: !(isNull e)) + (map (pkg: pkg.email) (attrValues enabled-extensions)); }; }] ++ (map (pkg: pkg.dconf-settings) (attrValues enabled-extensions))); }; |