repo: switch catppuccin flavor to macchiato

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;

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 = {

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 = ''

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";
         };
       };
     };