Fix modules to properly guard HM-only config from NixOS evaluatio

8 files changed, 16 insertions, 19 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; })
diff --git a/common/programs/btop.nix b/common/programs/btop.nix
index aa548e9..a030e3d 100644
--- a/common/programs/btop.nix
+++ b/common/programs/btop.nix
@@ -3,7 +3,7 @@
   programs.btop = {
     enable = true;
     settings = {
-      color_theme = lib.optionals config.beeMods.matugen.enable "matugen";
+      color_theme = lib.optionalString config.beeMods.matugen.enable "matugen";
       theme_background = false;
       truecolor = true;
       vim_keys = true;
diff --git a/common/programs/rofi.nix b/common/programs/rofi.nix
index ea55259..d95f547 100644
--- a/common/programs/rofi.nix
+++ b/common/programs/rofi.nix
@@ -64,7 +64,7 @@
 
   xdg.configFile = {
     "rofi/shared/default-colors.rasi" = {
-      enable = !config.beeModes.matugen.enable;
+      enable = !config.beeMods.matugen.enable;
       text =
         # rasi
         ''
@@ -111,7 +111,7 @@
 
           /*****----- Global Properties -----*****/
           ${
-            if config.beeModes.matugen.enable then
+            if config.beeMods.matugen.enable then
               ''@import "shared/colors.rasi"''
             else
               ''@import "shared/default-colors.rasi"''
diff --git a/hosts/common.nix b/hosts/common.nix
index 87feb13..bc70e0e 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -117,8 +117,8 @@
   security.pam.services.login.enableGnomeKeyring = true;
 
   nixpkgs.config.allowUnfree = true;
-  nix.registry.${user}.flake = inputs.self;
-  nix.registry.nixpkgs.flake = inputs.nixpkgs;
+  # nix.registry.${user}.flake = inputs.self;
+  # nix.registry.nixpkgs.flake = inputs.nixpkgs;
 
   networking.networkmanager.wifi.powersave = false;
   networking.networkmanager.enable = true;
diff --git a/hosts/nixios/default.nix b/hosts/nixios/default.nix
index 28a7710..1eb9a86 100644
--- a/hosts/nixios/default.nix
+++ b/hosts/nixios/default.nix
@@ -11,9 +11,10 @@
   ...
 }:
 {
-  imports = [
+  imports = with inputs.self.nixosModules; [
     ./hardware-configuration.nix
     (import ../common.nix { inherit user; })
+    beeMods
   ];
 
   # REMOVE LATER
@@ -35,6 +36,10 @@
   programs.dconf.enable = true;
   security.pam.services.swaylock = { };
 
+  beeMods = {
+    mango.enable = true;
+  };
+
   xdg.portal = lib.mkForce {
     enable = true;
     extraPortals = [
diff --git a/users/bee/default.nix b/users/bee/default.nix
index fd37ca1..b684588 100644
--- a/users/bee/default.nix
+++ b/users/bee/default.nix
@@ -34,11 +34,6 @@
     TERM = config.beeMods.terminal.default;
   };
 
-  home.packages = with pkgs; [
-    vim
-    sops
-  ];
-
   programs.home-manager.enable = true;
 
   home.stateVersion = systemState; # check flake.nix