From 8b771361d0a84c8c75d3d45af6c18be6581fa3b7 Mon Sep 17 00:00:00 2001
From: Lilith <ole@benstem.de>
Date: Wed, 12 Mar 2025 16:02:38 +0100
Subject: [PATCH] refactor2

---
 system/optional/default.nix        |  2 +-
 system/optional/stylix.nix         | 38 ++++++++++++++++++++++++++++++
 system/optional/stylix/default.nix | 10 --------
 system/optional/stylix/style.nix   | 32 -------------------------
 4 files changed, 39 insertions(+), 43 deletions(-)
 create mode 100644 system/optional/stylix.nix
 delete mode 100644 system/optional/stylix/default.nix
 delete mode 100644 system/optional/stylix/style.nix

diff --git a/system/optional/default.nix b/system/optional/default.nix
index ae2521d4..123f026d 100644
--- a/system/optional/default.nix
+++ b/system/optional/default.nix
@@ -3,6 +3,6 @@
     ./nfs.nix
     ./desktop.nix
     ./gaming.nix
-    ./stylix
+    ./stylix.nix
   ];
 }
diff --git a/system/optional/stylix.nix b/system/optional/stylix.nix
new file mode 100644
index 00000000..9b442b4a
--- /dev/null
+++ b/system/optional/stylix.nix
@@ -0,0 +1,38 @@
+{stylix, pkgs, config, lib, ...}: {
+  imports = [ stylix.nixosModules.stylix ];
+
+  options.stylix.enable = lib.mkEnableOption "Enable Stylix";
+
+  config = lib.mkIf config.stylix.enable {
+    stylix = {
+      enable = true;
+
+      image = ../../../wallpapers/default.png;
+      polarity = "dark";
+
+      opacity = {
+        terminal = 0.8;
+        popups = 0.8;
+      };
+
+      fonts = {
+        monospace = {
+          package = pkgs.nerd-fonts.jetbrains-mono;
+          name = "JetBrainsMono Nerd Font";
+        };
+
+        emoji = {
+          package = pkgs.twemoji-color-font;
+          name = "Twemoji";
+        };
+
+        sizes = { applications = 14; desktop = 12; popups = 12; terminal = 14; };
+      };
+
+      cursor = {
+        package = pkgs.rose-pine-cursor;
+        name = "Rosé Pine";
+      };
+    };
+  };
+}
diff --git a/system/optional/stylix/default.nix b/system/optional/stylix/default.nix
deleted file mode 100644
index 927b66f5..00000000
--- a/system/optional/stylix/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stylix, pkgs, config, lib, ...}: {
-  options.stylix.enable = lib.mkEnableOption "Enable Stylix";
-
-  config = lib.mkIf config.stylix.enable {
-    imports = [
-      stylix.nixosModules.stylix
-      ./style.nix
-    ];
-  };
-}
diff --git a/system/optional/stylix/style.nix b/system/optional/stylix/style.nix
deleted file mode 100644
index 4a5a0e21..00000000
--- a/system/optional/stylix/style.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ pkgs, ...}: {
-  stylix = {
-    enable = true;
-
-    image = ../../../wallpapers/default.png;
-    polarity = "dark";
-
-    opacity = {
-      terminal = 0.8;
-      popups = 0.8;
-    };
-
-    fonts = {
-      monospace = {
-        package = pkgs.nerd-fonts.jetbrains-mono;
-        name = "JetBrainsMono Nerd Font";
-      };
-
-      emoji = {
-        package = pkgs.twemoji-color-font;
-        name = "Twemoji";
-      };
-
-      sizes = { applications = 14; desktop = 12; popups = 12; terminal = 14; };
-    };
-
-    cursor = {
-      package = pkgs.rose-pine-cursor;
-      name = "Rosé Pine";
-    };
-  };
-}