refactor: compose hosts and home-manager features explicitly

2026-04-21 16:04:06 +02:00
parent 8c254f2eb1
commit a73cefb9df
28 changed files with 322 additions and 303 deletions
@@ -1,3 +1,19 @@
+{
+  config,
+  lib,
+  ...
+}:
+let
+  homeModules = config.flake.modules.homeManager;
+  baseSettings = import ./_noctalia-config.nix;
+  portableSettings = lib.recursiveUpdate baseSettings {
+    bar.widgets.right = baseSettings.bar.widgets.right ++ [
+      {
+        id = "Battery";
+      }
+    ];
+  };
+in
 {
  flake.modules.homeManager.noctalia =
    {
@@ -17,7 +33,13 @@
          }
        );

-        settings = import ./_noctalia-config.nix;
+        settings = baseSettings;
      };
    };
+
+  flake.modules.homeManager.noctalia-portable = {
+    imports = [ homeModules.noctalia ];
+
+    programs.noctalia-shell.settings = lib.mkForce portableSettings;
+  };
 }