Reorganize options and settings

configuration/machine/common/default.nix

@@ -10,7 +10,9 @@
 
     ../../module/machine
     ../../role/machine
-    ../../site
+    ../../option/site
+    ../../option/user
+    ../../../settintgs/site
   ];
 
   config = {

configuration/machine/furrball/default.nix

@@ -4,6 +4,8 @@
   ...
 }:
 let
+  useStylix = false;
+
   inherit (lib) enabled;
 in
 {
@@ -70,10 +72,9 @@ in
       };
 
       theme = {
-        nord.enable = true;
-        papirus.enable = true;
-        stylix.enable = true;
-        base16-schemes.enable = true;
+        nord.enable = !useStylix;
+        papirus.enable = !useStylix;
+        stylix.enable = useStylix;
       };
     };
 

configuration/option/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./site
+    ./ui
+  ];
+}

configuration/option/site/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./deploy.nix
+    ./network.nix
+    ./tool.nix
+  ];
+}

configuration/option/ui/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./font.nix
+  ];
+}

configuration/option/ui/font.nix

@@ -0,0 +1,54 @@
+{
+  config,
+  lib,
+  options,
+  ...
+}:
+let
+  inherit (lib) mkOption types;
+
+  font = types.submodule {
+    options = {
+      family = mkOption {
+        type = types.str;
+        default = "";
+        description = "Font family";
+      };
+      size = mkOption {
+        type = types.int;
+        default = 13;
+        description = "Font size";
+      };
+    };
+  };
+in
+{
+  options.looniversity.ui = {
+    desktop = {
+      display = { };
+      font = {
+        serif = mkOption {
+          type = types.attrsOf font;
+          description = "Serif font definition";
+          default = {
+            family = "NotoSerif";
+          };
+        };
+        sans-serif = mkOption {
+          type = types.attrsOf font;
+          description = "Sans-serif font definition";
+          default = {
+            family = "NotoSans";
+          };
+        };
+        monospace = mkOption {
+          type = types.attrsOf font;
+          description = "Monospace font definition";
+          default = {
+            family = "Hack Nerd Font";
+          };
+        };
+      };
+    };
+  };
+}

configuration/user/common/default.nix

@@ -2,6 +2,8 @@
   imports = [
     ../../module/user
     ../../role/user
-    ../../site
+    ../../option/site
+    ../../option/user
+    ../../../settintgs/ui
   ];
 }

settings/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./site
+    ./ui
+  ];
+}

settings/site/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./deploy.nix
+    ./network.nix
+    ./tool.nix
+  ];
+}

settings/ui/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./font.nix
+  ];
+}

settings/ui/font.nix

@@ -0,0 +1,8 @@
+{ config, ... }:
+{
+  config.looniversity.ui = {
+    desktop = {
+      font = { };
+    };
+  };
+}