From df1d1381e1a5365aec86efb17d9b73e1431c559b Mon Sep 17 00:00:00 2001
From: Anthony Rodriguez <anthony@nezia.dev>
Date: Tue, 8 Oct 2024 22:58:03 +0200
Subject: [PATCH] repo: switch catppuccin flavor to macchiato

---
 home/programs/editors/neovim.nix | 4 ++--
 home/programs/niri/default.nix   | 4 ++--
 modules/style/default.nix        | 3 ++-
 modules/style/gtk.nix            | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/home/programs/editors/neovim.nix b/home/programs/editors/neovim.nix
index 90437ff..a5ce680 100644
--- a/home/programs/editors/neovim.nix
+++ b/home/programs/editors/neovim.nix
@@ -40,7 +40,7 @@
       theme = {
         enable = true;
         name = "catppuccin";
-        style = "frappe";
+        style = "macchiato";
       };
 
       visuals = {
@@ -55,7 +55,7 @@
 
       statusline.lualine = {
         enable = true;
-        theme = "catppuccin";
+        theme = "auto";
       };
 
       git.enable = true;
diff --git a/home/programs/niri/default.nix b/home/programs/niri/default.nix
index b03e0fe..da0b2b3 100644
--- a/home/programs/niri/default.nix
+++ b/home/programs/niri/default.nix
@@ -2,10 +2,10 @@
   inputs,
   lib,
   pkgs,
-  nixosConfig,
+  osConfig,
   ...
 }: let
-  colors = inputs.basix.schemeData.base16.${nixosConfig.style.scheme}.palette;
+  colors = inputs.basix.schemeData.base16.${osConfig.style.scheme}.palette;
 in {
   imports = [./binds.nix];
   programs.niri = {
diff --git a/modules/style/default.nix b/modules/style/default.nix
index a97420e..cb12675 100644
--- a/modules/style/default.nix
+++ b/modules/style/default.nix
@@ -13,7 +13,8 @@ in {
         Name of the tinted-scheming color scheme to use.
       '';
       type = string;
-      example = lib.literalExpression "catppuccin-frappe";
+      example = lib.literalExpression "catppuccin-macchiato";
+      default = "catppuccin-macchiato";
     };
     wallpaper = mkOption {
       description = ''
diff --git a/modules/style/gtk.nix b/modules/style/gtk.nix
index db02ff9..ddb9d88 100644
--- a/modules/style/gtk.nix
+++ b/modules/style/gtk.nix
@@ -16,7 +16,7 @@ in {
       name = mkOption {
         type = str;
         description = "Name for the GTK theme";
-        default = "catppuccin-frappe-lavender-standard";
+        default = "catppuccin-macchiato-lavender-standard";
       };
       package = mkOption {
         type = package;
@@ -24,7 +24,7 @@ in {
 
         default = pkgs.catppuccin-gtk.override {
           # https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/data/themes/catppuccin-gtk/default.nix
-          variant = "frappe";
+          variant = "macchiato";
           accents = ["lavender"];
           size = "standard";
         };
@@ -42,7 +42,7 @@ in {
         description = "The GTK icon theme to be used";
         default = pkgs.catppuccin-papirus-folders.override {
           accent = "lavender";
-          flavor = "frappe";
+          flavor = "macchiato";
         };
       };
     };