From 0574776dfec2060e4c2073d1210ca830b40369a6 Mon Sep 17 00:00:00 2001
From: Gleb Khaykin <khaykingleb@gmail.com>
Date: Fri, 5 Sep 2025 00:05:47 +0200
Subject: [PATCH 1/2] fix(ssh): fix ssh config for github

---
 users/shared/programs/ssh.nix | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/users/shared/programs/ssh.nix b/users/shared/programs/ssh.nix
index 2417288..fbb3753 100644
--- a/users/shared/programs/ssh.nix
+++ b/users/shared/programs/ssh.nix
@@ -3,28 +3,32 @@
     enable = true;
     enableDefaultConfig = false;
     matchBlocks = {
-      "*.github.com" = {
+      "*.cloud.together.ai" = {
+        user = "gkhaykin";
+      };
+      "*.vast.ai" = {
+        identityFile = "${config.home.homeDirectory}/.ssh/vastai";
+      };
+      "alabama alaska" = {
+        user = "gkhaykin";
+        proxyCommand = "/opt/homebrew/bin/cloudflared access ssh --hostname %h-dc10.myna.ninja/ssh";
+      };
+      "github.com *.github.com" = {
+        hostname = "ssh.github.com";
+        port = 443;
+        user = "git";
+        identityFile = "${config.home.homeDirectory}/.ssh/id_rsa";
+        identitiesOnly = true;
         extraOptions = {
           "AddKeysToAgent" = "yes";
           "UseKeychain" = "yes";
         };
-        identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
-      };
-      "*.vast.ai" = {
-        identityFile = "${config.home.homeDirectory}/.ssh/vastai";
       };
       "red" = {
         hostname = "64.247.196.50";
         user = "shadeform";
         identityFile = "${config.home.homeDirectory}/Desktop/projects/iclerk/gpu-access/shadeform_private_key.pem";
       };
-      "alabama alaska" = {
-        user = "gkhaykin";
-        proxyCommand = "/opt/homebrew/bin/cloudflared access ssh --hostname %h-dc10.myna.ninja/ssh";
-      };
-      "*.cloud.together.ai" = {
-        user = "gkhaykin";
-      };
     };
   };
 }

From 3d5853481dbe99e33b62048fb5016892e662401a Mon Sep 17 00:00:00 2001
From: Gleb Khaykin <khaykingleb@gmail.com>
Date: Tue, 9 Sep 2025 02:41:48 +0200
Subject: [PATCH 2/2] feat(homebrew): add nordpass, remove 1password

---
 modules/darwin/homebrew.nix | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix
index 68ffdbd..73ca248 100644
--- a/modules/darwin/homebrew.nix
+++ b/modules/darwin/homebrew.nix
@@ -12,14 +12,17 @@ let
     "tailscale-app"
     "postman"
 
-    # TODO(khaykingleb): add notion-mail cask when it's available in homebrew
+    # Security
+    "nordpass"
+
     # Productivity
+    "todoist-app"
     "notion"
     "notion-calendar"
     "pomatez"
 
     # Communication
-    #"slack"
+    # "slack"
     "zoom"
 
     # TODO(khaykingleb): add preplexity cask when it's available in homebrew
@@ -28,19 +31,21 @@ let
     "excalidrawz"
     "drawio"
 
+    # Finance
+    "ibkr"
+    "tradingview"
+    "spotify"
+
     # Misc
     "google-chrome"
     "telegram"
-    "spotify"
   ];
 
   personalCasks = lib.lists.flatten [
     # Security
-    "1password"
     "keepassxc"
 
     # Productivity
-    "todoist-app"
     "anki"
 
     # Communication
@@ -55,10 +60,6 @@ let
     "mactex"
     "zotero"
 
-    # Finance
-    "ibkr"
-    "tradingview"
-
     # Misc
     "obs"
     "steam"
@@ -83,8 +84,8 @@ in
       "zlib" # compression library
       "ossp-uuid" # uuid generation library
       "icu4c" # unicode and globalization library
-      "awk"
-      "ansible"
+      "awk" # text processing language
+      "ansible" # automation tool for configuring and managing systems
 
       # Compilers and build tools
       "gcc@14"