From ba911dc62727f67adb25f5d2270a0e957d490a9e Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Mon, 21 Oct 2024 17:06:15 +0200
Subject: [PATCH] add the theme variables inside the theme dir

---
 hosts/laptop/configuration.nix |  2 +-
 hosts/laptop/variables.nix     | 19 +------------------
 themes/{ => stylix}/nixy.nix   |  0
 themes/var/nixy.nix            | 18 ++++++++++++++++++
 4 files changed, 20 insertions(+), 19 deletions(-)
 rename themes/{ => stylix}/nixy.nix (100%)
 create mode 100644 themes/var/nixy.nix

diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index c874a83..51682ac 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -18,7 +18,7 @@
     ../../nixos/xdg-portal.nix
     ../../nixos/variables-config.nix
 
-    ../../themes/nixy.nix
+    ../../themes/stylix/nixy.nix
 
     ./hardware-configuration.nix
     ./variables.nix
diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix
index d20a6c0..fb5d3c7 100644
--- a/hosts/laptop/variables.nix
+++ b/hosts/laptop/variables.nix
@@ -22,23 +22,6 @@
     autoUpgrade = false;
     autoGarbageCollector = false;
 
-    theme = {
-      rounding = 15;
-      gaps-in = 10;
-      gaps-out = 10 * 2;
-      active-opacity = 1;
-      inactive-opacity = 0.89;
-      blur = true;
-      border-size = 3;
-      animation-speed = "medium"; # "fast" | "medium" | "slow"
-      fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
-
-      bar = {
-        position = "top"; # "top" | "bottom"
-        transparent = true;
-        transparentButtons = false;
-        floating = true;
-      };
-    };
+    theme = import ../../themes/var/nixy.nix;
   };
 }
diff --git a/themes/nixy.nix b/themes/stylix/nixy.nix
similarity index 100%
rename from themes/nixy.nix
rename to themes/stylix/nixy.nix
diff --git a/themes/var/nixy.nix b/themes/var/nixy.nix
new file mode 100644
index 0000000..5524135
--- /dev/null
+++ b/themes/var/nixy.nix
@@ -0,0 +1,18 @@
+{
+  rounding = 15;
+  gaps-in = 10;
+  gaps-out = 10 * 2;
+  active-opacity = 1;
+  inactive-opacity = 0.89;
+  blur = true;
+  border-size = 3;
+  animation-speed = "medium"; # "fast" | "medium" | "slow"
+  fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
+
+  bar = {
+    position = "top"; # "top" | "bottom"
+    transparent = true;
+    transparentButtons = false;
+    floating = true;
+  };
+}