diff --git a/darwin/configuration.nix b/darwin/configuration.nix index 0e0a10a..307836f 100644 --- a/darwin/configuration.nix +++ b/darwin/configuration.nix @@ -17,7 +17,6 @@ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "flyingcircus.io-1:Rr9CwiPv8cdVf3EQu633IOTb6iJKnWbVfCC8x8gVz2o=" ]; - sandbox = "relaxed"; }; }; diff --git a/home/modules/captive-browser.nix b/home/modules/captive-browser.nix index 501cdfb..f3c8453 100644 --- a/home/modules/captive-browser.nix +++ b/home/modules/captive-browser.nix @@ -36,20 +36,8 @@ in ${cfg.browserCommand} \ --user-data-dir="$HOME/Library/Application Support/Google/Captive" \ --proxy-server="socks5://$PROXY" \ - --proxy-bypass-list="<-loopback>" \ - --no-first-run \ - --new-window \ - --incognito \ - --no-default-browser-check \ - --no-crash-upload \ - --disable-extensions \ - --disable-sync \ - --disable-background-networking \ - --disable-client-side-phishing-detection \ - --disable-component-update \ - --disable-translate \ - --disable-web-resources \ - --safebrowsing-disable-auto-update \ + --host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost" \ + --no-first-run --new-window --incognito \ http://example.com ''; }; diff --git a/home/modules/llm.nix b/home/modules/llm.nix deleted file mode 100644 index 80466d4..0000000 --- a/home/modules/llm.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - pkgs, - lib, - inputs, - config, - system, - ... -}: -let - myAider = pkgs.aider-chat; - # FIXME: darwin build failure due to cfn-lint-1.32.1 - # myAider = pkgs.aider-chat.withOptional { - # withPlaywright = true; - # withBrowser = true; - # withHelp = true; - # withBedrock = false; - # }; -in -{ - home.packages = [ - myAider - pkgs.claude-code - ]; - #nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "claude-code" ]; # nixpkgs.config merging is unfortunately broken - # TODO: API token e.g. via sops - # TODO: proper codium and llm enable options - home.sessionVariables = { - AIDER_EDITOR = "codium --wait"; - DISABLE_TELEMETRY = 1; # for claude-code - }; -} diff --git a/home/workmac.nix b/home/workmac.nix index 64c3fc3..0e9c722 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -12,7 +12,6 @@ let unstable = inputs.nixos-unstable.legacyPackages.${system}; in { - imports = [ ./modules/llm.nix ]; schmittlauch.packages = { graphics = true; @@ -130,12 +129,7 @@ in ThrottleInterval = 60; }; }; - nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "1password-cli" - "claude-code" - ]; # nixpkgs.config merging is unfortunately broken + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "1password-cli" ]; home.stateVersion = "22.05"; }