From b423c8214765eb704eff5696bbdf7e8ef12b24e1 Mon Sep 17 00:00:00 2001
From: "Gustavo \"Guz\" L de Mello" <contact@guz.one>
Date: Thu, 6 Feb 2025 13:05:13 -0300
Subject: [PATCH] feat: frappuccino rice

---
 colors.nix  |  7 +++++++
 colors.yaml | 21 +++++++++++++++++++++
 flake.nix   | 16 +++++-----------
 home.nix    |  8 ++++----
 4 files changed, 37 insertions(+), 15 deletions(-)
 create mode 100644 colors.nix
 create mode 100644 colors.yaml

diff --git a/colors.nix b/colors.nix
new file mode 100644
index 0000000..e1d32ce
--- /dev/null
+++ b/colors.nix
@@ -0,0 +1,7 @@
+{...}: {
+  stylix.enable = true;
+  stylix.image = ./static/guz-wallpaper-default.png;
+  # stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+  stylix.base16Scheme = ./colors.yaml;
+  stylix.polarity = "dark";
+}
diff --git a/colors.yaml b/colors.yaml
new file mode 100644
index 0000000..843c480
--- /dev/null
+++ b/colors.yaml
@@ -0,0 +1,21 @@
+system: "base16"
+name: "Frappuccino (based on Catppuccin Mocha)"
+author: "https://github.com/catppuccin/catppuccin"
+variant: "dark"
+palette:
+  base00: "#111111" # base
+  base01: "#101010" # mantle
+  base02: "#181818" # surface0
+  base03: "#181818" # surface1
+  base04: "#181818" # surface2
+  base05: "#cdd6f4" # text
+  base06: "#f5e0dc" # rosewater
+  base07: "#b4befe" # lavender
+  base08: "#f38ba8" # red
+  base09: "#fab387" # peach
+  base0A: "#f9e2af" # yellow
+  base0B: "#a6e3a1" # green
+  base0C: "#94e2d5" # teal
+  base0D: "#89b4fa" # blue
+  base0E: "#cba6f7" # mauve
+  base0F: "#f2cdcd" # flamingo
diff --git a/flake.nix b/flake.nix
index 04df18f..b24aee3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,9 +49,8 @@
       in
         f pkgs);
 
-    # Shared NixOS modules
-    nixosModules = [
-      inputs.stylix.nixosModules.stylix
+    # Home manager NixOS module
+    homeNixOSModules = [
       home-manager.nixosModules.home-manager
       ./home.nix
     ];
@@ -60,7 +59,7 @@
       "battleship" = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs self;};
         modules =
-          nixosModules
+          homeNixOSModules
           ++ [
             ./hosts/battleship/configuration.nix
             ./hosts/battleship/home.nix
@@ -69,7 +68,7 @@
       "fighter" = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs self;};
         modules =
-          nixosModules
+          homeNixOSModules
           ++ [
             ./hosts/fighter/configuration.nix
             ./hosts/fighter/home.nix
@@ -82,13 +81,8 @@
         extraSpecialArgs = {inherit inputs self;};
         modules = [
           inputs.stylix.homeManagerModules.stylix
-          # inputs.xremap.homeManaggerModules.default
+          ./colors.nix
           ./home
-          ({pkgs, ...}: {
-            stylix.enable = true;
-            stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-            stylix.image = ../static/guz-wallpaper-default.png;
-          })
         ];
         pkgs = import nixpkgs {system = "x86_64-linux";};
       };
diff --git a/home.nix b/home.nix
index 8baa4d6..5c2a274 100644
--- a/home.nix
+++ b/home.nix
@@ -1,11 +1,14 @@
 {
-  config,
   inputs,
   pkgs,
   self,
   ...
 }: {
   # Home-manager configurations for when it is used as a NixOS module.
+  imports = [
+    inputs.stylix.nixosModules.stylix
+    ./colors.nix
+  ];
 
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
@@ -16,7 +19,4 @@
   programs.zsh.enable = true;
   users.users."guz".shell = pkgs.zsh;
 
-  stylix.enable = true;
-  stylix.image = ./static/guz-wallpaper-default.png;
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
 }