big refactor

1 files changed, 25 insertions, 1 deletions

diff --git a/nix/modules/vars.nix b/nix/modules/vars.nix
index de9736e..c991588 100644
--- a/nix/modules/vars.nix
+++ b/nix/modules/vars.nix
@@ -1,4 +1,7 @@
 { lib, ... }:
+let
+  vars = import ../flakevars.nix;
+in
 {
   options.monorepo.vars = {
     device = lib.mkOption {
@@ -8,6 +11,20 @@
       description = "device that NixOS is installed to";
     };
 
+    internetName = lib.mkOption {
+      type = lib.types.str;
+      default = "${vars.internetName}";
+      example = "myinternetname";
+      description = "Internet name to be used for internet usernames";
+    };
+
+    repoName = lib.mkOption {
+      type = lib.types.str;
+      default = "monorepo";
+      example = "myreponame";
+      description = "Name of this repository";
+    };
+
     fileSystem = lib.mkOption {
       type = lib.types.str;
       default = "ext4";
@@ -43,11 +60,18 @@
 
     remoteHost = lib.mkOption {
       type = lib.types.str;
-      default = "ret2pop.net";
+      default = "${vars.remoteHost}";
       example = "example.com";
       description = "Address to push to and pull from for website and git repos";
     };
 
+    orgHost = lib.mkOption {
+      type = lib.types.str;
+      default = "${vars.orgHost}";
+      example = "orgname.org";
+      description = "Domain name of your organization";
+    };
+
     timeZone = lib.mkOption {
       type = lib.types.str;
       default = "America/Vancouver";