home/misc: change neotheme module structure

1 files changed, 44 insertions, 46 deletions

diff --git a/home/modules/misc/neotheme/default.nix b/home/modules/misc/neotheme/default.nix
index df69251..5a5e375 100644
--- a/home/modules/misc/neotheme/default.nix
+++ b/home/modules/misc/neotheme/default.nix
@@ -5,58 +5,56 @@ let cfg = config.neotheme;
 in
 {
   options.neotheme = {
-    wallpaper = mkOption {
+    name = mkOption {
       type = types.str;
       default = "";
-      description = "path for wallpaper image file";
-      example = "/weird/dir/wallpaper.png";
+      description = "palette name";
+      example = "My Amazing Theme";
     };
 
-    palette = {
-      identifier = mkOption {
-        type = types.str;
-        default = "";
-        description = "palette identifier";
-        example = "mytheme";
-      };
-
-      name = mkOption {
-        type = types.str;
-        default = "";
-        description = "palette name";
-        example = "My Amazing Theme";
-      };
+    identifier = mkOption {
+      type = types.str;
+      default = "";
+      description = "palette identifier";
+      example = "mytheme";
+    };
 
-      colors =
-        let
-          mkColorOption = name: {
-            inherit name;
-            value = mkOption {
-              type = types.strMatching "[a-fA-F0-9]{6}";
-              description = "color ${name}.";
-            };
+    colors =
+      let
+        mkColorOption = name: {
+          inherit name;
+          value = mkOption {
+            type = types.strMatching "[a-fA-F0-9]{6}";
+            description = "color ${name}.";
           };
-        in
-        listToAttrs (map mkColorOption [
-          "background"
-          "foreground"
-          "color0"
-          "color1"
-          "color2"
-          "color3"
-          "color4"
-          "color5"
-          "color6"
-          "color7"
-          "bright0"
-          "bright1"
-          "bright2"
-          "bright3"
-          "bright4"
-          "bright5"
-          "bright6"
-          "bright7"
-        ]);
+        };
+      in
+      listToAttrs (map mkColorOption [
+        "background"
+        "foreground"
+        "color0"
+        "color1"
+        "color2"
+        "color3"
+        "color4"
+        "color5"
+        "color6"
+        "color7"
+        "bright0"
+        "bright1"
+        "bright2"
+        "bright3"
+        "bright4"
+        "bright5"
+        "bright6"
+        "bright7"
+      ]);
+
+    wallpaper = mkOption {
+      type = types.str;
+      default = "";
+      description = "path for wallpaper image file";
+      example = "/weird/dir/wallpaper.png";
     };
   };
 }