refactor: simplify 'user' options

2026-04-21 13:59:03 +02:00
parent 38818e7508
commit 6a30a431f8
24 changed files with 94 additions and 139 deletions
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -6,25 +6,32 @@
 }:

 {
-  options.nixgl.wrap = lib.mkOption {
-    type = lib.types.functionTo lib.types.package;
-    default = if config.lib ? nixGL then config.lib.nixGL.wrap else lib.id;
-    readOnly = true;
-  };
+  options = {
+    host.username = lib.mkOption {
+      type = lib.types.str;
+      default = config.home.username;
+    };

-  options.wrapApp = lib.mkOption {
-    type = lib.types.raw;
-    default =
-      pkg: flags:
-      if config.lib ? nixGL then
-        pkg.overrideAttrs (old: {
-          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
-          postInstall = (old.postInstall or "") + ''
-            wrapProgram $out/bin/${pkg.meta.mainProgram} --add-flags "${flags}"
-          '';
-        })
-      else
-        pkg;
-    readOnly = true;
+    nixgl.wrap = lib.mkOption {
+      type = lib.types.functionTo lib.types.package;
+      default = if config.lib ? nixGL then config.lib.nixGL.wrap else lib.id;
+      readOnly = true;
+    };
+
+    wrapApp = lib.mkOption {
+      type = lib.types.raw;
+      default =
+        pkg: flags:
+        if config.lib ? nixGL then
+          pkg.overrideAttrs (old: {
+            nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
+            postInstall = (old.postInstall or "") + ''
+              wrapProgram $out/bin/${pkg.meta.mainProgram} --add-flags "${flags}"
+            '';
+          })
+        else
+          pkg;
+      readOnly = true;
+    };
  };
 }