From 6e139328bb000ea197d42bf1e8886e2447a19ace Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Sun, 13 Jul 2025 21:58:00 -0700
Subject: [PATCH] fix: mako, chaotic-nyx, upstreams

---
 flake.lock                      | 30 +++++++++++++++---------------
 flake.nix                       |  5 +++--
 home/environments/niri/mako.nix |  4 ----
 home/profiles/common/nix.nix    |  2 ++
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 47b1a940..f2bb6db8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,17 +5,17 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1752415765,
-        "narHash": "sha256-bNoZ0uNtrnOFNwMCXwn/LXUGMeF1JtB1uOXVd9o68nY=",
-        "owner": "arcnmx",
-        "repo": "nixexprs",
-        "rev": "9550baa43a7fb2358fca8c498aacb5f3efb49b89",
+        "lastModified": 1752468338,
+        "narHash": "sha256-JpV8ROSZydkPJHh/UjErk/YnVpnvrf4LegzZP4Dudew=",
+        "owner": "kittywitch",
+        "repo": "arcexprs",
+        "rev": "ec4452b08272248386e371b1d0c236a60fe2c4d5",
         "type": "github"
       },
       "original": {
-        "owner": "arcnmx",
+        "owner": "kittywitch",
         "ref": "master",
-        "repo": "nixexprs",
+        "repo": "arcexprs",
         "type": "github"
       }
     },
@@ -29,15 +29,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1716575596,
-        "narHash": "sha256-F+0nBhI4OfM8XtZ/Usb90c4oerEob1bENWXgb+lMjvg=",
-        "owner": "arcnmx",
+        "lastModified": 1752468274,
+        "narHash": "sha256-kE3/hdulqBns7ze1r1p8AlIHIU/yxgeEMCadYZJjKck=",
+        "owner": "kittywitch",
         "repo": "base16.nix",
-        "rev": "13b838df99d8694005d479388f7389b441c7e820",
+        "rev": "5cc4c252a8218767ee9e5001a7addd6dc4eea073",
         "type": "github"
       },
       "original": {
-        "owner": "arcnmx",
+        "owner": "kittywitch",
         "ref": "flake",
         "repo": "base16.nix",
         "type": "github"
@@ -77,11 +77,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751636951,
-        "narHash": "sha256-07ZP0hEF7HVqGdDc7hgP3jOduNznFt71Lqb3xgXXQWI=",
+        "lastModified": 1752227483,
+        "narHash": "sha256-eetITGJfURryoHY5gfuE9/4sEV9aSgzhPxgsQgofNa8=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "09e2be240370f27312a44633d852732b66cb8f01",
+        "rev": "5f431aac1a4038c385e6de2d2384d943e4802d61",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 9e4ecd77..03b55e44 100644
--- a/flake.nix
+++ b/flake.nix
@@ -312,10 +312,11 @@
     };
     # a bunch of modules (also arcnmx is good)
     arcexprs = {
-      url = "github:arcnmx/nixexprs/master";
+      url = "github:kittywitch/arcexprs/master";
+      #url = "github:arcnmx/nixexprs/master";
     };
     base16 = {
-      url = "github:arcnmx/base16.nix/flake";
+      url = "github:kittywitch/base16.nix/flake";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flakelib.follows = "flakelib";
diff --git a/home/environments/niri/mako.nix b/home/environments/niri/mako.nix
index bafd4c7c..3c7822e3 100644
--- a/home/environments/niri/mako.nix
+++ b/home/environments/niri/mako.nix
@@ -23,10 +23,6 @@ in {
     enable = true;
     settings = {
       font = "Monaspace Krypton 10";
-      defaultTimeout = 3000;
-      borderColor = palette.base08;
-      backgroundColor = "${palette.base00}BF";
-      textColor = palette.base05;
     };
   };
 }
diff --git a/home/profiles/common/nix.nix b/home/profiles/common/nix.nix
index 67115ecb..30e50f36 100644
--- a/home/profiles/common/nix.nix
+++ b/home/profiles/common/nix.nix
@@ -5,4 +5,6 @@ _: {
     frequency = "weekly";
     persistent = true;
   };
+  # adds to nixpkgs.overlay, made irrelevant due to `home-manager.useGlobalPkgs`
+  chaotic.nyx.overlay.enable = false;
 }