From 67d552b4ffcec81ca7c9145ae7196ff21b2962b3 Mon Sep 17 00:00:00 2001
From: Harivansh Rathi <rathiharivansh@gmail.com>
Date: Thu, 12 Mar 2026 19:33:36 -0400
Subject: [PATCH] updates

---
 flake.lock           | 55 ++++++++++++++++++++++++++++++++++++++++++++
 flake.nix            |  5 ++++
 modules/homebrew.nix | 13 ++++-------
 modules/macos.nix    |  2 ++
 modules/packages.nix | 48 ++++----------------------------------
 5 files changed, 71 insertions(+), 52 deletions(-)

diff --git a/flake.lock b/flake.lock
index dc87662..891570b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,6 +17,45 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "googleworkspace-cli": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1773347617,
+        "narHash": "sha256-jtigtoppWeurNbxFebpZNmnj45AtLvdn9nxxds/OlKo=",
+        "owner": "googleworkspace",
+        "repo": "cli",
+        "rev": "e3e1e86e0791af3ac427e82bfb3ce58f08c17eea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "googleworkspace",
+        "repo": "cli",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -94,11 +133,27 @@
     },
     "root": {
       "inputs": {
+        "googleworkspace-cli": "googleworkspace-cli",
         "home-manager": "home-manager",
         "nix-darwin": "nix-darwin",
         "nix-homebrew": "nix-homebrew",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 0abdcad..bba494c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    googleworkspace-cli = {
+      url = "github:googleworkspace/cli";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     nix-homebrew = {
       url = "github:zhaofengli-wip/nix-homebrew";
     };
diff --git a/modules/homebrew.nix b/modules/homebrew.nix
index a1c2abe..83718ac 100644
--- a/modules/homebrew.nix
+++ b/modules/homebrew.nix
@@ -9,17 +9,11 @@
     };
 
     taps = [
-      "humanlayer/humanlayer"
-      "jnsahaj/lumen"
       "nicosuave/tap"
-      "pantsbuild/tap"
-      "steipete/tap"
       "withgraphite/tap"
     ];
 
     brews = [
-      "daytonaio/tap/daytona"
-      "jnsahaj/lumen/lumen"
       "nicosuave/tap/memex"
       "postgresql@17"
       "python@3.13"
@@ -28,9 +22,10 @@
     ];
 
     casks = [
-      "anaconda"
-      "pants"
-      "riptide-dev"
+      "cap"
+      "raycast"
+      "thebrowsercompany-dia"
+      "wispr-flow"
     ];
   };
 }
diff --git a/modules/macos.nix b/modules/macos.nix
index a192f41..89921c8 100644
--- a/modules/macos.nix
+++ b/modules/macos.nix
@@ -1,6 +1,8 @@
 {...}: {
   security.pam.services.sudo_local.touchIdAuth = true;
 
+  services.karabiner-elements.enable = true;
+
   system.defaults = {
     dock.autohide = true;
     dock.show-recents = false;
diff --git a/modules/packages.nix b/modules/packages.nix
index f352515..a9d156f 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -1,4 +1,5 @@
 {
+  inputs,
   pkgs,
   username,
   ...
@@ -12,69 +13,30 @@
       install -Dm644 "$src" "$out/share/fonts/opentype/BerkeleyMono-Regular.otf"
     '';
   };
+
+  gwsPackage =
+    inputs.googleworkspace-cli.packages.${pkgs.stdenv.hostPlatform.system}.default;
 in {
   environment.systemPackages = with pkgs; [
-    arrow-cpp
-    binwalk
-    cloc
-    cloudflared
-    cmakeCurses
     codex
     coreutils-prefixed
-    criterion
     delta
     diff-so-fancy
-    e2fsprogs
-    emacs
-    ffmpeg_7
-    flyctl
     git-filter-repo
     git-lfs
-    gitleaks
-    gogcli
     google-cloud-sdk
+    gwsPackage
     imagemagickBig
-    kind
-    kubernetes-helm-wrapped
     lazygit
     libpq
     librsvg
-    livekit
-    livekit-cli
     llmfit
-    mactop
-    minikube
-    mint
     mise
     ngrok
-    opencode-desktop
-    javaPackages.compiler.openjdk25
-    p7zip
-    pandoc
-    pipx
-    poppler
-    portaudio
-    postgresql_14
     postgresql_16
-    potrace
     redis
-    resvg
-    semgrep
-    sox
-    stow
-    stripe-cli
-    supabase-cli
-    swiftformat
-    swiftlint
     tailscale
     terraform
-    time
-    trivy
-    universal-ctags
-    warp-terminal
-    websocat
-    yazi-unwrapped
-    yq
     yt-dlp
   ];