6 files changed, 48 insertions, 11 deletions

diff --git a/lib/helper.nix b/lib/helper.nix
index 5bea0f1..d3ccc1c 100644
--- a/lib/helper.nix
+++ b/lib/helper.nix
@@ -44,11 +44,11 @@ in rec {
       modules =
         [
           ../systems/${system}/system.nix
+          ../modules/system
           customPackagesOverlay
         ]
         ++ umport {
           paths = [
-            ../modules/system
             ../features/system
           ];
           recursive = true;
@@ -66,11 +66,11 @@ in rec {
       modules =
         [
           ../users/${system}/${user}.nix
+          ../modules/user
           customPackagesOverlay
         ]
         ++ umport {
           paths = [
-            ../modules/user
             ../features/user
           ];
           recursive = true;
diff --git a/modules/system/default.nix b/modules/system/default.nix
new file mode 100644
index 0000000..cd7e8d6
--- /dev/null
+++ b/modules/system/default.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ./general-settings
+  ];
+}
diff --git a/modules/user/aesthetics/default.nix b/modules/user/aesthetics/default.nix
index 9bcf496..c49a198 100644
--- a/modules/user/aesthetics/default.nix
+++ b/modules/user/aesthetics/default.nix
@@ -1,6 +1,15 @@
-{ config, pkgs, lib, ... }: let
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
   cfg = config.aesthetics;
 in {
+  imports = [
+    ./targets
+    ./themes
+  ];
   options.aesthetics = {
     enable = lib.mkEnableOption "aesthetics";
     theme = lib.mkOption {
@@ -48,16 +57,17 @@ in {
           type = lib.types.str;
           default = "18";
           description = "The size of the font to use for large text.";
-        };        
+        };
       };
     };
     scheme = let
-      mkHexOption = {}: lib.mkOption {
-        type = lib.types.str;
-        default = "";
-        example = "ffffff";
-        description = "A hex color";
-      };
+      mkHexOption = {}:
+        lib.mkOption {
+          type = lib.types.str;
+          default = "";
+          example = "ffffff";
+          description = "A hex color";
+        };
     in {
       base00 = mkHexOption {};
       base01 = mkHexOption {};
@@ -85,7 +95,7 @@ in {
   config = lib.mkIf cfg.enable {
     aesthetics.themes.${cfg.theme}.enable = true;
 
-    home.packages = [ cfg.font.package ];
+    home.packages = [cfg.font.package];
     fonts.fontconfig.enable = true;
   };
 }
diff --git a/modules/user/aesthetics/targets/default.nix b/modules/user/aesthetics/targets/default.nix
new file mode 100644
index 0000000..7dba76d
--- /dev/null
+++ b/modules/user/aesthetics/targets/default.nix
@@ -0,0 +1,11 @@
+{...}: {
+  imports = [
+    ./mako.nix
+    ./zellij.nix
+    ./qutebrowser.nix
+    ./helix.nix
+    ./gtk.nix
+    ./foot.nix
+    ./vesktop.nix
+  ];
+}
diff --git a/modules/user/aesthetics/themes/default.nix b/modules/user/aesthetics/themes/default.nix
new file mode 100644
index 0000000..cc5ebdb
--- /dev/null
+++ b/modules/user/aesthetics/themes/default.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ./oxocarbon
+  ];
+}
diff --git a/modules/user/default.nix b/modules/user/default.nix
new file mode 100644
index 0000000..104148e
--- /dev/null
+++ b/modules/user/default.nix
@@ -0,0 +1,6 @@
+{...}: {
+  imports = [
+    ./aesthetics
+    ./default-apps.nix
+  ];
+}