From a95ba2fa30c308124e3712d026872ebd01233460 Mon Sep 17 00:00:00 2001
From: Matthew Ess <mess@yelp.com>
Date: Tue, 23 Jan 2024 14:05:02 -0500
Subject: [PATCH] Reconcile with upstream

---
 darwin/homebrew.nix     |  6 ++----
 flake.nix               |  1 -
 pkgs/default.nix        |  1 -
 pkgs/yubiswitch.nix     | 26 --------------------------
 systems/darwin/work.nix |  5 ++---
 users/config.nix        |  4 +++-
 6 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/yubiswitch.nix

diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix
index 8af506f..c45492b 100644
--- a/darwin/homebrew.nix
+++ b/darwin/homebrew.nix
@@ -33,11 +33,11 @@
     ];
 
     masApps = {
+      Amphetamine = 937984704;
       "Draw Things" = 6444050820;
       GrandPerspective = 1111570163;
-      Reeder = 1529448980;
       Tailscale = 1475387142;
-      TickTick = 966085870;
+      Things = 904280696;
       Xcode = 497799835;
     };
 
@@ -76,12 +76,10 @@
       # terminal emulators
       "ghostty"
       "kitty"
-      "warp"
 
       # peripheral tools
       "logi-options-plus"
       "qflipper"
-      "remarkable"
       "via"
     ];
   };
diff --git a/flake.nix b/flake.nix
index 2e041e6..b47d5b8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -92,7 +92,6 @@
 
           yelpbook-m1 = self.nixos-flake.lib.mkMacosSystem {
             nixpkgs.hostPlatform = "aarch64-darwin";
-            users.me = "mess";
             imports = [
               self.darwinModules.default
               ./systems/darwin/m1.nix
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 8684a72..fad4642 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -22,5 +22,4 @@ inputs: self: super: {
       '';
     });
   recursive-patched = self.callPackage ./recursive-patched.nix { };
-  yubiswitch = self.callPackage ./yubiswitch.nix { };
 }
diff --git a/pkgs/yubiswitch.nix b/pkgs/yubiswitch.nix
deleted file mode 100644
index 110f633..0000000
--- a/pkgs/yubiswitch.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, stdenv, fetchurl, undmg, unzip }:
-let version = "0.16";
-in stdenv.mkDerivation {
-  pname = "yubiswitch";
-  inherit version;
-
-  nativeBuildInputs = [ undmg unzip ];
-  src = fetchurl {
-    url =
-      "https://github.com/pallotron/yubiswitch/releases/download/v${version}/yubiswitch_${version}.dmg";
-    sha256 = "aR/3AXwAAhFYchfGCmqfNSs8uNnuLOCZ8B0JbXlKAf8=";
-  };
-
-  sourceRoot = ".";
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/Applications
-    cp -r yubiswitch.app $out/Applications/yubiswitch.app
-
-    runHook postInstall
-  '';
-
-  meta.platforms = lib.platforms.darwin;
-}
diff --git a/systems/darwin/work.nix b/systems/darwin/work.nix
index 5afef92..2a08efe 100644
--- a/systems/darwin/work.nix
+++ b/systems/darwin/work.nix
@@ -1,8 +1,7 @@
-{ pkgs, lib, ... }: {
-  homebrew.casks = [ "itsycal" ];
+{ lib, ... }: {
+  homebrew.casks = [ "itsycal" "pallotron-yubiswitch" ];
   home-manager.sharedModules = [{
     launchd.agents.tarsnap.enable = lib.mkForce false;
-    home.packages = [ pkgs.yubiswitch ];
     programs.ssh.matchBlocks.devbox = {
       hostname = "csdev6";
       forwardAgent = true;
diff --git a/users/config.nix b/users/config.nix
index 795735f..1461e90 100644
--- a/users/config.nix
+++ b/users/config.nix
@@ -13,7 +13,9 @@
       name = "Matthew Ess";
       email = "mess@yelp.com";
       sshKeys = [
-        # TODO: work secretive keys
+        # secretive
+        "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLWD/lvxFOdmE48MUKdigYZOAc3bSIyPxW4M7frWe8Nks9cr58Z/1btvUUmAK+u+J6gw5g+Mt9X0uwR7KPQlavg= mat"
+        "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOkqyHm9fBDXChdmNgbhxd2U1IpkiD4xjC8AVOvil+uEeKYqDi5mF3oeAGYJrV6BRc7hEO+DQP60pN0wI5tMoYE= yelp"
       ];
     };
   };