From 8ceb61f208457777cbd7d26c4722877ce54c808e Mon Sep 17 00:00:00 2001
From: theArctesian <stephen.d.okita@gmail.com>
Date: Mon, 29 Sep 2025 19:23:17 -0700
Subject: [PATCH] Fix remaining deprecation warnings

- Fixed MySQL -> MariaDB package name
- Fixed Kitty theme -> themeFile in tokyo-night.nix
- Fixed Mako settings structure in tokyo-night.nix
- Converted individual mako options to settings.* structure
---
 modules/packages.nix           |  2 +-
 modules/themes/catppuccin.nix  | 22 ++++++++++++----------
 modules/themes/tokyo-night.nix | 24 +++++++++++++-----------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/modules/packages.nix b/modules/packages.nix
index f5ae18e..3b10ad6 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -180,7 +180,7 @@ in
 
         # Database clients
         postgresql
-        mysql
+        mariadb
         sqlite
         redis
         mongodb-tools
diff --git a/modules/themes/catppuccin.nix b/modules/themes/catppuccin.nix
index 34b6942..8c2e946 100644
--- a/modules/themes/catppuccin.nix
+++ b/modules/themes/catppuccin.nix
@@ -185,16 +185,18 @@
 
       # Mako notification theme
       services.mako = {
-        backgroundColor = "#1e1e2e";
-        textColor = "#cdd6f4";
-        borderColor = "#cba6f7";
-        progressColor = "#cba6f7";
-        defaultTimeout = 5000;
-        borderRadius = 10;
-        borderSize = 2;
-        font = "JetBrainsMono Nerd Font 10";
-        padding = "10";
-        margin = "20";
+        settings = {
+          background-color = "#1e1e2e";
+                  text-color = "#cdd6f4";
+                  border-color = "#cba6f7";
+                  progress-color = "#cba6f7";
+                  default-timeout = 5000;
+                  border-radius = 10;
+                  border-size = 2;
+                  font = "JetBrainsMono Nerd Font 10";
+        };
+                  padding = "10";
+                  margin = "20";
       };
     };
 
diff --git a/modules/themes/tokyo-night.nix b/modules/themes/tokyo-night.nix
index c70ef78..145f797 100644
--- a/modules/themes/tokyo-night.nix
+++ b/modules/themes/tokyo-night.nix
@@ -93,7 +93,7 @@ in
 
       # Kitty theme
       programs.kitty = {
-        theme = "Tokyo Night";
+        themeFile = "Tokyo Night";
         settings = {
           background = "#1a1b26";
           foreground = "#c0caf5";
@@ -275,16 +275,18 @@ in
 
       # Mako notification theme
       services.mako = {
-        backgroundColor = "#1a1b26";
-        textColor = "#c0caf5";
-        borderColor = "#7aa2f7";
-        progressColor = "#7aa2f7";
-        defaultTimeout = 5000;
-        borderRadius = 10;
-        borderSize = 2;
-        font = "JetBrainsMono Nerd Font 10";
-        padding = "10";
-        margin = "20";
+        settings = {
+          background-color = "#1a1b26";
+          text-color = "#c0caf5";
+          border-color = "#7aa2f7";
+          progress-color = "#7aa2f7";
+          default-timeout = 5000;
+          border-radius = 10;
+          border-size = 2;
+          font = "JetBrainsMono Nerd Font 10";
+          padding = "10";
+          margin = "20";
+        };
       };
     };