diff --git a/hosts/mercury/configuration.nix b/hosts/mercury/configuration.nix index df0a375..13e2af3 100644 --- a/hosts/mercury/configuration.nix +++ b/hosts/mercury/configuration.nix @@ -24,6 +24,7 @@ casks = [ "bruno" "figma" + "google-chrome" "jabra-direct" "linear" "loom" @@ -33,6 +34,7 @@ masApps = { "Flow" = 1423210932; "Trace" = 6768724888; + "Okta Verify" = 490179405; }; }; } diff --git a/modules/profiles/home/gh.nix b/modules/profiles/home/gh.nix index c47c7de..7bc3a3a 100644 --- a/modules/profiles/home/gh.nix +++ b/modules/profiles/home/gh.nix @@ -7,7 +7,10 @@ { programs.gh = { enable = true; - extensions = with pkgs; [ gh-poi ]; + extensions = with pkgs; [ + gh-poi + gh-stack + ]; settings = { aliases = { co = "pr checkout"; diff --git a/modules/profiles/home/opencode/default.nix b/modules/profiles/home/opencode/default.nix deleted file mode 100644 index 2e7ca14..0000000 --- a/modules/profiles/home/opencode/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, pkgs, ... }: { - sops.secrets = { - opencode_api_key = { - sopsFile = ./secrets.json; - path = "${config.xdg.dataHome}/secrets/opencode/opencode-api-key"; - }; - }; - - programs.opencode = { - enable = true; - package = pkgs.llm-agents.opencode; - enableMcpIntegration = true; - tui = { - theme = "nord"; - }; - settings = { - formatter = true; - lsp = true; - provider = { - opencode = { - options = { - apiKey = "{file:${config.sops.secrets.opencode_api_key.path}}"; - }; - }; - }; - permission = { - "*" = "ask"; - }; - }; - }; -} diff --git a/modules/profiles/home/opencode/secrets.json b/modules/profiles/home/opencode/secrets.json deleted file mode 100644 index 3ba86c7..0000000 --- a/modules/profiles/home/opencode/secrets.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "opencode_api_key": "ENC[AES256_GCM,data:333eY+xGFF4h9vKRdSDNEx0mNQWV385a5tyJcEVUJuzXYpj3uW2M+knQbDsz54oEOOjrz/oC1HKhssh5qtAjuuKhMA==,iv:2vQ0o2GVvl6jEdJQOzY8GCfWRfdF0lrk3Iud7aqmeUw=,tag:uHRXtK/6tzLxhZVRd8hQzg==,type:str]", - "sops": { - "age": [ - { - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsM1pHSHArWjkwUlFBQm04\nNGVlVE1BY1R5Y1hlS0xYcExtTlNVbGI0R0JnCk9uem80M08vK1NxQzBqQ3JzMlBF\nRytNakVmOUlkSjU4VVRsdVZIRmozUlEKLS0tIHV6Z0RYZVhtZ3ZNRTdtcmRxODlw\nV3dFMUppQ2VBS1JUWUtmTmdFaStneG8KCTGA1liCwWhU6mlL5gUigl/0KxaFh5UV\njrOsKtbe/2v0bPAdgMNV6z8QA2xgp/ASP9TZb2sDZvDBMb7lA+pnbQ==\n-----END AGE ENCRYPTED FILE-----\n", - "recipient": "age10539mc6shf02hpa8huyjktdw3nfyavxdg8pt247wwvq4xrv8h5zs8nc0k0" - }, - { - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIcXk3Y2VrU0Z0SDk1U0RL\nNnFMYmV0YkwwdnROejhjNG9RQy9Ea3FVRXdvCnIxMnovTE4rVklwVWRzdjcrVXdY\nMU5mbmdIZ0ZIWVJ5amozL29wVG5wWk0KLS0tIFY2WFdlMXM1ZHQ0NTU5c05Mc0ZZ\nNG9xSnN0eDZ5c1g0ekRiMlZNRVpvU2sKthGrP7Z/zP9W4/36RhRRZePNlL3Kv0ux\nLvRhBtGWMKx3Bc2Ln7SdLMIZedlyFMTN0cxj5aSuR8SrHUux25nnQA==\n-----END AGE ENCRYPTED FILE-----\n", - "recipient": "age1s2dhv789xf9jjfr9pdjsww7rf4dutl3qmavgpurlwj6l5khdkfasd4v7xn" - }, - { - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOUDVQbk52OWNtYTBGWEFV\nczhlRFJBbGpCaUhDbmpxcGJ6enpIcDVlNGtnClliV0NnN0YxcG1zT29ldHdKeGVP\nSDZIbkhuUmI1emtIYUc2aDBlZFJGOXMKLS0tIEpQZXRtdXBIWkxpMmcrWnlPN09N\nYkkzQ3RHNC83T1pMalhGbDlYUk9UMWcKX6BqVRDSVfYPP7O0cgxt7yunLxs6UwsS\nv6Fqb4YahxElRMzst4+kP2hdCjytuX2g+x8tbRpxQSNhN0m7jpsyeg==\n-----END AGE ENCRYPTED FILE-----\n", - "recipient": "age1hqq6znfaedyrmqkqqnaafa243cus77nts3e5vunxdl5xkfm6ffgqmf70r8" - }, - { - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCS1dMck5jTVVydnJXUita\nSmlMRXpDcXArQzluUGhQT3VLYzNZYzhubWhZCjVrd3QyU3ZNdmFQNjdhRVVLV1FD\nTXc5V00rR05zNjh2eGRLaDh1UzNGT3cKLS0tIHpYTDVDeXFxSXNkVVJBVGFET0I3\naTJWcVVrc2c2eDZuejFMak1lS0d5TG8KcdjMUbOln+vGMo+eNEoBS1yNyIc6EEHN\n6mX+35H7hbMRATxTaPWN+45vpy8HECNyXSv90aa9otAey6WNH2sUsQ==\n-----END AGE ENCRYPTED FILE-----\n", - "recipient": "age1zkx88lththygcwj07xtz54tcvy6ltavnedrpskfpzcdh9tt2ngyq9gvqv5" - } - ], - "lastmodified": "2026-06-04T05:02:48Z", - "mac": "ENC[AES256_GCM,data:EnFFxnZowxtZEc6LPJqsgCiWKMKHp19bWJkPInEvPhmhfPtPyBdfJi54Nod5XGpfVk5efruEaIyqyTHisJg6sDkNgNryN+Q+exyq7uJraOaeDy5newmFp+wXlaVTW60N1H6mWVJw3cmIIhPXEY3fbi8Hx6FZ3gPqKD+DlcLUfDk=,iv:l4BRPHIebkr7diSIfTwivjf/DzTQNk+PGqXmxXqlI04=,tag:NWDGtWOVeRLmm7VPhEvO+w==,type:str]", - "unencrypted_suffix": "_unencrypted", - "version": "3.13.1" - } -} diff --git a/modules/profiles/home/tools/common.nix b/modules/profiles/home/tools/common.nix index 412e428..44556da 100644 --- a/modules/profiles/home/tools/common.nix +++ b/modules/profiles/home/tools/common.nix @@ -10,6 +10,7 @@ httpie jq just + moreutils mtr nh nixd diff --git a/modules/suites/home.nix b/modules/suites/home.nix index be4236f..2a36f66 100644 --- a/modules/suites/home.nix +++ b/modules/suites/home.nix @@ -44,7 +44,6 @@ with profiles; mcp.memory mcp.nixos mise - opencode.default tuicr vscode ]; diff --git a/users/et/home.nix b/users/et/home.nix index 0a84eb5..53489fe 100644 --- a/users/et/home.nix +++ b/users/et/home.nix @@ -27,7 +27,6 @@ ./profiles/mcp/notion.nix ./profiles/mcp/postgres/default.nix ./profiles/mcp/sentry.nix - ./profiles/opencode/default.nix ./profiles/tmuxp.nix ./profiles/tools.nix ./profiles/vscode.nix diff --git a/users/et/profiles/opencode/default.nix b/users/et/profiles/opencode/default.nix deleted file mode 100644 index d4ac2e0..0000000 --- a/users/et/profiles/opencode/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, ... }: { - sops.secrets = { - opencode_anthropic_api_key = { - sopsFile = ./secrets.json; - path = "${config.xdg.dataHome}/secrets/opencode/opencode-anthropic-api-key"; - }; - }; - - programs.opencode.settings = { - provider.anthropic = { - options = { - apiKey = "{file:${config.sops.secrets.opencode_anthropic_api_key.path}}"; - }; - }; - }; -} diff --git a/users/et/profiles/opencode/secrets.json b/users/et/profiles/opencode/secrets.json deleted file mode 100644 index 40965b6..0000000 --- a/users/et/profiles/opencode/secrets.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "opencode_anthropic_api_key": "ENC[AES256_GCM,data:bILPPOpNjXOIUnrfQg0I+5shCZzXdX2iWQj/TBMlyzcLcDcnGwD+Nifrr8u6+AjI9u9bnCIen8Ju34tKl40b6AZXHWpToivt7Rl3efXf4VIMEibOfSBsfYsC04XE5+Eh5nmC3RmbdVSucbOQ,iv:yN601hfoYDu7xBjyPK9PC/nkAqJAzWp0HdM8sp1+TA0=,tag:mVgDznMYcEj6en8IIsD+kg==,type:str]", - "sops": { - "age": [ - { - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0T3Jjb1ZqVnI1VzR1VHhn\nVjJQK242ajg1YWhVQXFXMnZyT25TWTYxYjNzCk5SMU5yenAvZ0tjOGY1QTRRR1Zl\neGpBUjJ3OThlR01tRitUclAyZk9DWkUKLS0tIDAxS2xEem53eDRySmFmZzNiV1hy\nNzdNYnI0czNwNWtxZk8ySjNuUGo1dEUKMh/9Mv1Jatc3Co7J5IeA4V6HpGTMiJvK\nIfUzUCrwvt1Mrw9nbz9Sqf1J6Xbzn2fL3gcXK8lT8ejljCeAuK7qbA==\n-----END AGE ENCRYPTED FILE-----\n", - "recipient": "age10539mc6shf02hpa8huyjktdw3nfyavxdg8pt247wwvq4xrv8h5zs8nc0k0" - }, - { - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCWFc3WDdFSSs2WXhHbFkw\nSk1UQ2RET1Bqbjlhb0dyWXpGYlBQT0RnVzFJCmIxODVXZHJ5Ym5NZUhPaU9HcUEw\nNk1oaHhQVE0wUHJPOVR6WkMrQ2dCVTQKLS0tIGRLalN0NUUwdGNKamV6YStyNE5s\nZnhSYVNva0xUOFEyZWRIOGIvWVpCZ2MKfbBTd7YNZXZ4n1DjegjINbt+srATa4OT\nIGQD+R+ez3toH0ECotSu5TTQ47MlQlHG9sRiewBTDVGGywH/sqTAoA==\n-----END AGE ENCRYPTED FILE-----\n", - "recipient": "age1s2dhv789xf9jjfr9pdjsww7rf4dutl3qmavgpurlwj6l5khdkfasd4v7xn" - }, - { - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2Ly9QbWFZdW1xcWZrbkFG\nMmNha1creWo5OGcvUXlXZC9FYXozNDFZQTFFClBXSnZjTStYYUxna09POFYzeVJX\nTUxwNTlEaG9rNjYyWURFcXhjRXBOWmsKLS0tIEZmMVF0Z2Q4OTZIM29pYWtPMzlC\nOEExbnVuQnRVUDRjNUZVS0t5TU93bFUKglXjMIqrygF/ZytJG4ml+ac7R/4p7U9u\ns3RxJAMMmhdRGun5y2LYMunSK4IuD+ESakjS0+dSj2QzjBPg/KxVIg==\n-----END AGE ENCRYPTED FILE-----\n", - "recipient": "age1hqq6znfaedyrmqkqqnaafa243cus77nts3e5vunxdl5xkfm6ffgqmf70r8" - }, - { - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoNVVMMmM2UTJwdXYydHpa\ndTYrSW91ZSt0SVN3UDBtR0oyUWpMYTdxTkFRCko3c1d6ZlltZVhQbms0OVVJMmxZ\nNCsvN200ZktQcW0xUFhkTFRzb1VtUk0KLS0tIENCQlhEWEFVRWhKNGhrM081SUwz\nWmg4VmY0d1BNcnI4WHFzUDdPMmFWcHMKpA7iY2xxbar4hwqnsygoJSA+ytZH4zdd\nSoVJBpj0H6f2K6jeQKa++NxaFvA06uOFYrDnDWRh91rtrYbUjLAZ0Q==\n-----END AGE ENCRYPTED FILE-----\n", - "recipient": "age1zkx88lththygcwj07xtz54tcvy6ltavnedrpskfpzcdh9tt2ngyq9gvqv5" - } - ], - "lastmodified": "2026-06-04T15:28:05Z", - "mac": "ENC[AES256_GCM,data:f/tzq8e1qqzWOTez7pAAxSfHcHcavhkCclxw1EAVgMsToJEYg+Y7cSjjldU7//PNuzj5rnkzpwbkMYaAtc4IZqShz2Ehf5vFBL79C+Jq+vrZWt8YwgjV0n6MdflZVSTw6xEnbzwGqI+UDUQzUzXNokSd4wX9EOA4LFI9UDeZuL0=,iv:FjL6h4hhRIdIKqWyQjIUruz4kO/fKaRp3WO0FeTmZPY=,tag:AKjd5NRPoJ3D9Y9GlwAbEw==,type:str]", - "unencrypted_suffix": "_unencrypted", - "version": "3.13.1" - } -}