Merge remote-tracking branch 'origin/personal' into personal

# Conflicts:
#	flake.lock

Author: jacopone

devenv.lock

@@ -3,11 +3,11 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1775334024,
-        "narHash": "sha256-vg1CVojgtjLPZNFe7QVd/d97E12TLUgBQDlCqMqbEGU=",
+        "lastModified": 1776863933,
+        "narHash": "sha256-v9NoQFSln9n5zqVWUWUc9PajsMaGmga51HOAJqMx7Qw=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "f30a244f8175ef14ed1a4e4dfc737d28ecc5d852",
+        "rev": "863b4204725efaeeb73811e376f928232b720646",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775036584,
-        "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=",
+        "lastModified": 1776796298,
+        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735",
+        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
         "nixpkgs-src": "nixpkgs-src"
       },
       "locked": {
-        "lastModified": 1774287239,
-        "narHash": "sha256-W3krsWcDwYuA3gPWsFA24YAXxOFUL6iIlT6IknAoNSE=",
+        "lastModified": 1776852779,
+        "narHash": "sha256-WwO/ITisCXwyiRgtktZgv3iGhAGO+IB5Av4kKCwezR0=",
         "owner": "cachix",
         "repo": "devenv-nixpkgs",
-        "rev": "fa7125ea7f1ae5430010a6e071f68375a39bd24c",
+        "rev": "ec3063523dcd911aeadb50faa589f237cdab5853",
         "type": "github"
       },
       "original": {
@@ -98,11 +98,11 @@
     "nixpkgs-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1773840656,
-        "narHash": "sha256-9tpvMGFteZnd3gRQZFlRCohVpqooygFuy9yjuyRL2C0=",
+        "lastModified": 1776329215,
+        "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512",
+        "rev": "b86751bc4085f48661017fa226dee99fab6c651b",
         "type": "github"
       },
       "original": {

flake.lock

@@ -69,6 +69,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # Google Workspace CLI (gws) - Unified CLI for all Google Workspace APIs
+    # MAINTAINER: @googleworkspace | AUTO-UPDATE: Via rebuild-nixos --refresh
+    gws = {
+      url = "github:googleworkspace/cli";
+    };
+
     # NixClaw - Personal AI agent platform for NixOS
     # MAINTAINER: @jacopone (YOU) | LOCAL DEV: path input
     # TEMPORARILY DISABLED: path input breaks on machines without ~/nixclaw
@@ -84,7 +90,7 @@
 
   };
 
-  outputs = { self, nixpkgs, home-manager, nixos-hardware, claude-code-nix, code-cursor-nix, whisper-dictation, claude-automation, antigravity-nix, ... }@inputs:
+  outputs = { self, nixpkgs, home-manager, nixos-hardware, claude-code-nix, code-cursor-nix, whisper-dictation, claude-automation, antigravity-nix, gws, ... }@inputs:
     let
       # Shared overlay: fix test failures / missing deps in nixos-unstable
       # Uses interpreter override (not overrideScope) so python3.withPackages sees fixes

flake.nix

@@ -8,6 +8,10 @@
     # AI Assistant
     inputs.claude-code-nix.packages.${pkgs.stdenv.hostPlatform.system}.default # Claude Code
 
+    # Google Workspace CLI - Unified CLI for Drive, Gmail, Calendar, etc.
+    inputs.gws.packages.${pkgs.stdenv.hostPlatform.system}.default
+    google-cloud-sdk # Google Cloud SDK (gcloud CLI) — needed by gws auth setup
+
     # Version control
     git
     gh

modules/common/packages.nix

@@ -196,7 +196,6 @@ in
       jinja2 # Jinja2 templating engine (for claude-nixos-automation)
     ])) # Python 3 with rich included (system-wide, avoids tkinter issues in devenv)
     ninja # Build system for faster compilation (required by numpy/aider)
-    google-cloud-sdk # Google Cloud SDK for gcloud CLI and cloud operations
     (pkgs.callPackage ../../pkgs/gogcli.nix { }) # Google Suite CLI (Gmail, Calendar, Drive, Contacts) - https://github.com/steipete/gogcli
 
     # system tools