3 files changed, 5 insertions, 8 deletions
diff --git a/common/modules/beevim/default.nix b/common/modules/beevim/default.nix
index 477ffb4..d7c3a97 100644
--- a/common/modules/beevim/default.nix
+++ b/common/modules/beevim/default.nix
@@ -22,7 +22,7 @@ in
     enable = lib.mkEnableOption "Enable neovim config";
   };
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (cfg.enable && homeManager) {
     beevim = {
       enable = true;
       packageDefinitions.replace = builtins.mapAttrs (
diff --git a/common/modules/matugen/default.nix b/common/modules/matugen/default.nix
index 5f5d6cf..fb84b92 100644
--- a/common/modules/matugen/default.nix
+++ b/common/modules/matugen/default.nix
@@ -27,13 +27,13 @@ let
   '';
 in
 {
-  imports = [ ./templates ];
+  imports = lib.optionals homeManager [ ./templates ];
 
   options.${moduleNameSpace}.matugen = {
     enable = lib.mkEnableOption "Enable Dynamic colors";
   };
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.enable (if homeManager then {
     programs.wallust = {
       enable = true;
       settings = {
@@ -182,5 +182,5 @@ in
           '';
       };
     };
-  };
+  } else { });
 }
diff --git a/common/modules/terminal/default.nix b/common/modules/terminal/default.nix
index b8f97c2..fea6bc7 100644
--- a/common/modules/terminal/default.nix
+++ b/common/modules/terminal/default.nix
@@ -11,11 +11,8 @@
   ...
 }:
 with lib;
-let
-  cfg = config.${moduleNameSpace}.terminal;
-in
 {
-  imports = [
+  imports = lib.optionals homeManager [
     (import ./foot.nix { inherit lib config; })
     (import ./ghostty.nix { inherit lib config; })
     (import ./alacritty.nix { inherit lib config; })