From c40b7af66547180b990d94d77b80844a31630b6f Mon Sep 17 00:00:00 2001
From: mat ess <mat@mat.services>
Date: Sun, 26 Jun 2022 20:56:06 -0400
Subject: [PATCH] Tweaks and fixes

---
 darwin/homebrew.nix            |  7 ++++++-
 flake.lock                     | 24 ++++++++++++------------
 flake.nix                      | 31 +++++++++++++++++++++++--------
 overlays/colors/tokyonight.nix |  2 +-
 4 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix
index 00a61c8..2ea1adc 100644
--- a/darwin/homebrew.nix
+++ b/darwin/homebrew.nix
@@ -76,5 +76,10 @@ in
 
   # For cli packages that aren't currently available for macOS in `nixpkgs`.Packages should be
   # installed in `../home/default.nix` whenever possible.
-  homebrew.brews = [ "fileicon" "fzf" "unison-language" ];
+  homebrew.brews = [
+    "fileicon"
+    "fzf"
+    "unison-language"
+    "xcbeautify"
+  ];
 }
diff --git a/flake.lock b/flake.lock
index 2a2538c..bcc3164 100644
--- a/flake.lock
+++ b/flake.lock
@@ -79,11 +79,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1656111632,
-        "narHash": "sha256-TqNwPFPRy/NP3zGf9DJvBFfIyVtsH150nkOIX07MKBI=",
+        "lastModified": 1656266731,
+        "narHash": "sha256-yHA/O4VEtjaGFyI7tUD3/eCrrcrRrscwLyPttdd4jgE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "223b9deeaddb9b8e2a6325fb661d2f62abe8450d",
+        "rev": "72a135b093cbf3497a287bd5b1a605dcdcc73b7a",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1656052185,
-        "narHash": "sha256-jv62Zk1VX1kHI1nCSy1mbGeY4N+2RwWVfOmK0Fr91p0=",
+        "lastModified": 1656198488,
+        "narHash": "sha256-xe81o3Kin6a0jXA3mTxcR+jeA1jLKw3TCar5LUo/B5c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e1c9213887f54131c37c29935985b8679a55e785",
+        "rev": "46af3303651699dc58cfc251d9b18c0f59d857da",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1656121142,
-        "narHash": "sha256-3ATzeaa3YRPFldqX7/8OlZ1K/qzr8gNB4iEOZ4IbbVw=",
+        "lastModified": 1656270636,
+        "narHash": "sha256-gMF++Oe2wZmC63/CwoWtTD9d7XgB4jYeCLNIVOOPny0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f43ff7ef71ead37aebc362a7705236b5f2d2bdd7",
+        "rev": "f3b81e322917818cd31a58f64596cb583da67664",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1655876541,
-        "narHash": "sha256-eOz1YNclUTobC2f9meWpw+idhzWImdti43OKjLBoDq8=",
+        "lastModified": 1656130826,
+        "narHash": "sha256-dLqquYHvj6/EYPljULXJVUKcizB/8cbgdIL7aEXTDZY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a0edeb02ae5b92eda6efbee4e26d8c33c15063fd",
+        "rev": "72d1b0d0fac131df1ea254b65413c85609bdd2ee",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 9194eae..613d015 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,14 +27,16 @@
       # Configuration for `nixpkgs`
       nixpkgsConfig = {
         config = { allowUnfree = true; };
-        overlays = attrValues self.overlays ++ singleton (
-          final: prev: optionalAttrs
-            (prev.stdenv.system == "aarch64-darwin")
-            {
-              # Sub in x86 version of packages that don't build on Apple Silicon yet
-              # inherit (final.pkgs-x86) foo;
-            }
-        );
+        overlays = attrValues self.overlays ++ singleton
+          (
+            final: prev: optionalAttrs
+              (prev.stdenv.system == "aarch64-darwin")
+              {
+                # Sub in x86 version of packages that don't build on Apple Silicon yet
+                inherit (final.pkgs-x86);
+                inherit (final.patched) python310 kitty;
+              }
+          );
       };
 
       # Shared home-manager configs
@@ -169,6 +171,19 @@
             system = "x86_64-darwin";
             inherit (nixpkgsConfig) config;
           };
+          patched = {
+            python310 = prev.python310.override {
+              packageOverrides = python-self: python-super: {
+                pyopenssl = python-super.pyopenssl.overrideAttrs (_: {
+                  meta.broken = false;
+                });
+              };
+            };
+            kitty = prev.kitty.overrideAttrs (_: {
+              doCheck = false;
+              doInstallCheck = false;
+            });
+          };
         };
       };
 
diff --git a/overlays/colors/tokyonight.nix b/overlays/colors/tokyonight.nix
index 8319b8e..7b9280e 100644
--- a/overlays/colors/tokyonight.nix
+++ b/overlays/colors/tokyonight.nix
@@ -81,7 +81,7 @@ rec {
     cursor_text_color = background;
 
     # Selection
-    selection_background = "#101014";
+    selection_background = "#fafbff";
     selection_foreground = "none";
 
     # Tab bar