From 7db00936a0c6c5f79b25432b9d44d843b37b68ac Mon Sep 17 00:00:00 2001 From: punkfairie Date: Sat, 16 Nov 2024 22:46:27 -0800 Subject: [PATCH] fix(home): Import enabled from correct lib --- modules/home/programs/cava/default.nix | 4 ++-- modules/home/programs/fzf/default.nix | 4 ++-- modules/home/programs/starship/default.nix | 3 +-- modules/home/programs/zathura/default.nix | 4 ++-- modules/home/services/dunst/default.nix | 3 +-- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/home/programs/cava/default.nix b/modules/home/programs/cava/default.nix index 89a4cc2..975a189 100644 --- a/modules/home/programs/cava/default.nix +++ b/modules/home/programs/cava/default.nix @@ -4,8 +4,8 @@ ... }: let - inherit (lib) mkIf enabled; - inherit (lib.marleyos) mkEnableModule; + inherit (lib) mkIf; + inherit (lib.marleyos) mkEnableModule enabled; cfg = config.marleyos.programs.cava; inherit (config.marleyos.theme) colors; diff --git a/modules/home/programs/fzf/default.nix b/modules/home/programs/fzf/default.nix index 5f533d1..f354b6b 100644 --- a/modules/home/programs/fzf/default.nix +++ b/modules/home/programs/fzf/default.nix @@ -4,8 +4,8 @@ ... }: let - inherit (lib) mkIf enabled; - inherit (lib.marleyos) mkEnableModule; + inherit (lib) mkIf; + inherit (lib.marleyos) mkEnableModule enabled; cfg = config.marleyos.programs.fzf; inherit (config.marleyos.theme) colors; diff --git a/modules/home/programs/starship/default.nix b/modules/home/programs/starship/default.nix index 46622b1..d0c60f8 100644 --- a/modules/home/programs/starship/default.nix +++ b/modules/home/programs/starship/default.nix @@ -6,11 +6,10 @@ let inherit (lib) mkIf - enabled mkForce concatStrings ; - inherit (lib.marleyos) mkEnableModule; + inherit (lib.marleyos) mkEnableModule enabled; cfg = config.marleyos.programs.starship; inherit (config.marleyos.theme) colors; diff --git a/modules/home/programs/zathura/default.nix b/modules/home/programs/zathura/default.nix index 62ee14c..c7abd25 100644 --- a/modules/home/programs/zathura/default.nix +++ b/modules/home/programs/zathura/default.nix @@ -4,8 +4,8 @@ ... }: let - inherit (lib) mkIf enabled; - inherit (lib.marleyos) mkEnableModule; + inherit (lib) mkIf; + inherit (lib.marleyos) mkEnableModule enabled; cfg = config.marleyos.programs.zathura; inherit (config.marleyos.theme) colors; diff --git a/modules/home/services/dunst/default.nix b/modules/home/services/dunst/default.nix index 29c88f3..87e443d 100644 --- a/modules/home/services/dunst/default.nix +++ b/modules/home/services/dunst/default.nix @@ -6,10 +6,9 @@ let inherit (lib) mkIf - disabled mkMerge ; - inherit (lib.marleyos) mkEnableModule; + inherit (lib.marleyos) mkEnableModule disabled; cfg = config.marleyos.services.dunst; inherit (config.marleyos.theme) colors;