From 0906d6ba4158dfefd858bbb7ac4c582e25d26050 Mon Sep 17 00:00:00 2001
From: Isshi0417 <isshi0417@gmail.com>
Date: Tue, 2 Jul 2024 17:41:23 +0900
Subject: [PATCH] clean up config

---
 hosts/default/configuration.nix               |  21 ++++++++++++
 hosts/default/home.nix                        |   3 +-
 modules/home-manager/stylix/ghibli/ghibli.nix |   5 ---
 modules/nixos/stylix/ghibli.nix               |  24 +++++++++++++
 modules/nixos/stylix/ghibli/stylix.nix        |  32 ------------------
 .../wallpapers/Desktop Ghibli Inspired 1.png  | Bin
 .../wallpapers/Desktop Ghibli Inspired 10.png | Bin
 .../wallpapers/Desktop Ghibli Inspired 2.png  | Bin
 .../wallpapers/Desktop Ghibli Inspired 4.png  | Bin
 .../wallpapers/Desktop Ghibli Inspired 5.png  | Bin
 .../wallpapers/Desktop Ghibli Inspired 6.png  | Bin
 .../wallpapers/Desktop Ghibli Inspired 7.png  | Bin
 .../wallpapers/Desktop Ghibli Inspired 8.png  | Bin
 .../wallpapers/Desktop Ghibli Inspired 9.png  | Bin
 .../{ghibli => }/wallpapers/ghibli-3.png      | Bin
 15 files changed, 46 insertions(+), 39 deletions(-)
 delete mode 100644 modules/home-manager/stylix/ghibli/ghibli.nix
 create mode 100644 modules/nixos/stylix/ghibli.nix
 delete mode 100644 modules/nixos/stylix/ghibli/stylix.nix
 rename modules/nixos/stylix/{ghibli => }/wallpapers/Desktop Ghibli Inspired 1.png (100%)
 rename modules/nixos/stylix/{ghibli => }/wallpapers/Desktop Ghibli Inspired 10.png (100%)
 rename modules/nixos/stylix/{ghibli => }/wallpapers/Desktop Ghibli Inspired 2.png (100%)
 rename modules/nixos/stylix/{ghibli => }/wallpapers/Desktop Ghibli Inspired 4.png (100%)
 rename modules/nixos/stylix/{ghibli => }/wallpapers/Desktop Ghibli Inspired 5.png (100%)
 rename modules/nixos/stylix/{ghibli => }/wallpapers/Desktop Ghibli Inspired 6.png (100%)
 rename modules/nixos/stylix/{ghibli => }/wallpapers/Desktop Ghibli Inspired 7.png (100%)
 rename modules/nixos/stylix/{ghibli => }/wallpapers/Desktop Ghibli Inspired 8.png (100%)
 rename modules/nixos/stylix/{ghibli => }/wallpapers/Desktop Ghibli Inspired 9.png (100%)
 rename modules/nixos/stylix/{ghibli => }/wallpapers/ghibli-3.png (100%)

diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index 7bf738f..186b470 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -102,6 +102,27 @@
     };
   };
 
+  stylix.enable = true;
+    stylix.image = ../../modules/home-manager/stylix/ghibli/ghibli-3.png;
+    stylix.base16Scheme = {
+        base00 = "#F0EBE1"; 
+        base01 = "#E1D6C6"; 
+        base02 = "#D0C2B2"; 
+        base03 = "#8C8075"; 
+        base04 = "#65594E";
+        base05 = "#4A413B"; 
+        base06 = "#322B25";
+        base07 = "#1C1813"; 
+        base08 = "#BF591E"; 
+        base09 = "#A38625"; 
+        base0A = "#86A325"; 
+        base0B = "#25A36C"; 
+        base0C = "#257EA3"; 
+        base0D = "#4659BF"; 
+        base0E = "#8646BF"; 
+        base0F = "#BF4686"; 
+    };
+
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
diff --git a/hosts/default/home.nix b/hosts/default/home.nix
index 6251043..8b369cf 100644
--- a/hosts/default/home.nix
+++ b/hosts/default/home.nix
@@ -1,10 +1,9 @@
-{ config, pkgs, ... }:
+{ inputs,onfig, pkgs, ... }:
 
 {
   imports =
   [
     ../../modules/home-manager/git.nix
-    # ../../modules/home-manager/ghibli/ghibli.nix
   ];
 
   # Allow Unfree
diff --git a/modules/home-manager/stylix/ghibli/ghibli.nix b/modules/home-manager/stylix/ghibli/ghibli.nix
deleted file mode 100644
index ecfb292..0000000
--- a/modules/home-manager/stylix/ghibli/ghibli.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, lib, ... }:
-
-{
-
-}
\ No newline at end of file
diff --git a/modules/nixos/stylix/ghibli.nix b/modules/nixos/stylix/ghibli.nix
new file mode 100644
index 0000000..74bc535
--- /dev/null
+++ b/modules/nixos/stylix/ghibli.nix
@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+
+{
+    stylix.enable = true;
+    stylix.image = ../../modules/home-manager/stylix/ghibli/ghibli-3.png;
+    stylix.base16Scheme = {
+        base00 = "#F0EBE1"; 
+        base01 = "#E1D6C6"; 
+        base02 = "#D0C2B2"; 
+        base03 = "#8C8075"; 
+        base04 = "#65594E";
+        base05 = "#4A413B"; 
+        base06 = "#322B25";
+        base07 = "#1C1813"; 
+        base08 = "#BF591E"; 
+        base09 = "#A38625"; 
+        base0A = "#86A325"; 
+        base0B = "#25A36C"; 
+        base0C = "#257EA3"; 
+        base0D = "#4659BF"; 
+        base0E = "#8646BF"; 
+        base0F = "#BF4686"; 
+    };
+}
\ No newline at end of file
diff --git a/modules/nixos/stylix/ghibli/stylix.nix b/modules/nixos/stylix/ghibli/stylix.nix
deleted file mode 100644
index 95540f2..0000000
--- a/modules/nixos/stylix/ghibli/stylix.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ pkgs, ... }:
-
-{
-    # Enable stylix
-    services.stylix.enable = libMkforce true;
-
-    stylix.homeManagerIntegration.autoImport = false;
-    stylix.homeManagerIntegration.followSystem = true;
-
-    stylix.image = ./wallpapers/ghibli-3.png;
-
-    stylix.polarity = "light";
-
-    stylix.base16Scheme = {
-        base00 = "#F0EBE1"; 
-        base01 = "#E1D6C6"; 
-        base02 = "#D0C2B2";
-        base03 = "#8C8075"; 
-        base04 = "#65594E"; 
-        base05 = "#4A413B"; 
-        base06 = "#322B25";
-        base07 = "#1C1813";
-        base08 = "#BF591E";
-        base09 = "#A38625"; 
-        base0A = "#86A325"; 
-        base0B = "#25A36C"; 
-        base0C = "#257EA3"; 
-        base0D = "#4659BF"; 
-        base0E = "#8646BF"; 
-        base0F = "#BF4686";
-    };
-}
\ No newline at end of file
diff --git a/modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 1.png b/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 1.png
similarity index 100%
rename from modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 1.png
rename to modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 1.png
diff --git a/modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 10.png b/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 10.png
similarity index 100%
rename from modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 10.png
rename to modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 10.png
diff --git a/modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 2.png b/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 2.png
similarity index 100%
rename from modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 2.png
rename to modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 2.png
diff --git a/modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 4.png b/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 4.png
similarity index 100%
rename from modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 4.png
rename to modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 4.png
diff --git a/modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 5.png b/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 5.png
similarity index 100%
rename from modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 5.png
rename to modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 5.png
diff --git a/modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 6.png b/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 6.png
similarity index 100%
rename from modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 6.png
rename to modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 6.png
diff --git a/modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 7.png b/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 7.png
similarity index 100%
rename from modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 7.png
rename to modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 7.png
diff --git a/modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 8.png b/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 8.png
similarity index 100%
rename from modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 8.png
rename to modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 8.png
diff --git a/modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 9.png b/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 9.png
similarity index 100%
rename from modules/nixos/stylix/ghibli/wallpapers/Desktop Ghibli Inspired 9.png
rename to modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 9.png
diff --git a/modules/nixos/stylix/ghibli/wallpapers/ghibli-3.png b/modules/nixos/stylix/wallpapers/ghibli-3.png
similarity index 100%
rename from modules/nixos/stylix/ghibli/wallpapers/ghibli-3.png
rename to modules/nixos/stylix/wallpapers/ghibli-3.png