diff --git a/flake.lock b/flake.lock index 02f1eda..2df0d7c 100644 --- a/flake.lock +++ b/flake.lock @@ -8,8 +8,8 @@ ] }, "locked": { - "lastModified": 1774217644, - "narHash": "sha256-MnSCnEYGMZyfj42/8+frNDktCIpj5RUkGY50r29KirQ=", + "lastModified": 1774656030, + "narHash": "sha256-9wurVeFSma2w1sFb/ybWKORCWH+TZRuBmE5k+czKLxk=", "path": "/Users/rathi/Documents/GitHub/companion/agentcomputer/apps/cli", "type": "path" }, diff --git a/home/default.nix b/home/default.nix index 0f6e28a..fee11b6 100644 --- a/home/default.nix +++ b/home/default.nix @@ -2,7 +2,6 @@ imports = [ ./common.nix ./colima.nix - ./karabiner.nix ./rectangle.nix ]; } diff --git a/home/zsh.nix b/home/zsh.nix index e1af363..bfad832 100644 --- a/home/zsh.nix +++ b/home/zsh.nix @@ -38,7 +38,7 @@ ld = "lumen diff"; lg = "lazygit"; nim = "nvim ."; - sshnet = "ssh -i ~/.ssh/atlas-ssh.txt rathiharivansh@152.53.195.59"; + net = "rathiharivansh@152.53.195.59"; # nix helpers nr = "nix profile remove"; # nr - remove from profile diff --git a/modules/homebrew.nix b/modules/homebrew.nix index 6d9a41d..b7fc6db 100644 --- a/modules/homebrew.nix +++ b/modules/homebrew.nix @@ -9,17 +9,20 @@ }; taps = [ - # riptide-dev is still sourced from this tap. "humanlayer/humanlayer" + "gromgit/fuse" ]; brews = [ "bitwarden-cli" + "gromgit/fuse/sshfs-mac" ]; casks = [ "cap" "codex" + "karabiner-elements" + "macfuse" "rectangle" "raycast" "riptide-beta" diff --git a/modules/macos.nix b/modules/macos.nix index e433fb6..db0abf1 100644 --- a/modules/macos.nix +++ b/modules/macos.nix @@ -1,33 +1,8 @@ -{ - lib, - pkgs, - ... -}: let - karabinerAgentsDir = - "${pkgs.karabiner-elements}/Library/Application Support/org.pqrs/Karabiner-Elements/" - + "Karabiner-Elements Non-Privileged Agents v2.app/Contents/Library/LaunchAgents"; -in { +{...}: { security.pam.services.sudo_local.touchIdAuth = true; - services.karabiner-elements.enable = true; - - # Upstream nix-darwin still expects Karabiner's old agent layout. Override it - # here until the built-in module catches up to the 15.7+ bundle structure. - # Karabiner-Elements 15.7.0 moved its user launch agents into the - # Non-Privileged Agents v2 bundle and renamed karabiner_grabber. - # nix-darwin's built-in module still points at the old top-level paths. - environment.userLaunchAgents."org.pqrs.karabiner.agent.karabiner_grabber.plist".enable = - lib.mkForce false; - environment.userLaunchAgents."org.pqrs.karabiner.agent.karabiner_observer.plist".enable = - lib.mkForce false; - environment.userLaunchAgents."org.pqrs.karabiner.karabiner_console_user_server.plist".enable = - lib.mkForce false; - - environment.userLaunchAgents."org.pqrs.service.agent.Karabiner-Core-Service.plist".source = "${karabinerAgentsDir}/org.pqrs.service.agent.Karabiner-Core-Service.plist"; - environment.userLaunchAgents."org.pqrs.service.agent.Karabiner-NotificationWindow.plist".source = "${karabinerAgentsDir}/org.pqrs.service.agent.Karabiner-NotificationWindow.plist"; - environment.userLaunchAgents."org.pqrs.service.agent.Karabiner-Menu.plist".source = "${karabinerAgentsDir}/org.pqrs.service.agent.Karabiner-Menu.plist"; - environment.userLaunchAgents."org.pqrs.service.agent.karabiner_console_user_server.plist".source = "${karabinerAgentsDir}/org.pqrs.service.agent.karabiner_console_user_server.plist"; - environment.userLaunchAgents."org.pqrs.service.agent.Karabiner-MultitouchExtension.plist".source = "${karabinerAgentsDir}/org.pqrs.service.agent.Karabiner-MultitouchExtension.plist"; + # Karabiner-Elements is managed via Homebrew cask because nix-darwin's + # built-in module is broken with 15.7+ (missing karabiner_grabber/observer binaries). system.defaults = { dock.autohide = true;