From 1193699ed0581761eae5cb2bf88b3c2ebbb97a3f Mon Sep 17 00:00:00 2001 From: Kieran Klukas Date: Fri, 30 Jan 2026 10:14:22 -0500 Subject: [PATCH] chore: nuke crush & remove vesktop from darwin --- machines/atalanta/default.nix | 9 +- machines/atalanta/home/default.nix | 5 +- machines/moonlark/home/default.nix | 2 +- modules/home/apps/crush.nix | 490 --------------------- modules/home/apps/crush/_crush-options.nix | 301 ------------- modules/home/apps/crush/crush-module.nix | 19 - modules/home/apps/wut/default.nix | 2 +- secrets/context7.age | 13 - secrets/crush.age | 13 - secrets/secrets.nix | 11 +- secrets/zai.age | 13 - 11 files changed, 7 insertions(+), 871 deletions(-) delete mode 100644 modules/home/apps/crush.nix delete mode 100644 modules/home/apps/crush/_crush-options.nix delete mode 100644 modules/home/apps/crush/crush-module.nix delete mode 100644 secrets/context7.age delete mode 100644 secrets/crush.age delete mode 100644 secrets/zai.age diff --git a/machines/atalanta/default.nix b/machines/atalanta/default.nix index 78b5e5b..cf53b88 100644 --- a/machines/atalanta/default.nix +++ b/machines/atalanta/default.nix @@ -102,14 +102,7 @@ file = ../../secrets/bluesky.age; owner = "kierank"; }; - crush = { - file = ../../secrets/crush.age; - owner = "kierank"; - }; - context7 = { - file = ../../secrets/context7.age; - owner = "kierank"; - }; + "bore/auth-token" = { file = ../../secrets/bore/auth-token.age; owner = "kierank"; diff --git a/machines/atalanta/home/default.nix b/machines/atalanta/home/default.nix index ed965a0..13ec1e3 100644 --- a/machines/atalanta/home/default.nix +++ b/machines/atalanta/home/default.nix @@ -12,9 +12,8 @@ home = { username = "kierank"; homeDirectory = "/Users/kierank"; - packages = with pkgs; [ + packages = [ inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default - vesktop ]; }; @@ -30,7 +29,7 @@ }; apps = { halloy.enable = true; - crush.enable = true; + helix = { enable = true; swift = true; diff --git a/machines/moonlark/home/default.nix b/machines/moonlark/home/default.nix index 550fb7c..f3f9b70 100644 --- a/machines/moonlark/home/default.nix +++ b/machines/moonlark/home/default.nix @@ -21,7 +21,7 @@ irssi.enable = true; qutebrowser.enable = true; spotify.enable = true; - crush.enable = true; + }; theming.enable = true; wm.hyprland.enable = true; diff --git a/modules/home/apps/crush.nix b/modules/home/apps/crush.nix deleted file mode 100644 index 5111f27..0000000 --- a/modules/home/apps/crush.nix +++ /dev/null @@ -1,490 +0,0 @@ -{ - lib, - config, - ... -}: -{ - options.atelier.apps.crush.enable = lib.mkEnableOption "Enable Crush config"; - config = lib.mkIf config.atelier.apps.crush.enable { - atelier.apps.anthropic-manager.enable = lib.mkDefault true; - - programs.crush = { - enable = true; - settings = { - mcp = { - context7 = { - type = "http"; - url = "https://mcp.context7.com/mcp"; - headers = { - CONTEXT7_API_KEY = "$(cat /run/agenix/context7)"; - }; - }; - sequential-thinking = { - command = "bunx"; - args = [ - "-y" - "@modelcontextprotocol/server-sequential-thinking" - ]; - }; - }; - providers = { - copilot = { - name = "Copilot"; - type = "openai"; - base_url = "https://api.githubcopilot.com"; - api_key = "$(bash ~/.config/crush/copilot.sh)"; - extra_headers = { - "Editor-Version" = "CRUSH/1.0"; - "Editor-Plugin-Version" = "CRUSH/1.0"; - "Copilot-Integration-Id" = "vscode-chat"; - }; - models = [ - { - id = "gpt-5.2-codex"; - name = "Copilot: OpenAI GPT-5.2-Codex"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 400000; - default_max_tokens = 128000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "gpt-5-mini"; - name = "Copilot: GPT-5 mini"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 264000; - default_max_tokens = 64000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "gpt-5"; - name = "Copilot: GPT-5"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 400000; - default_max_tokens = 128000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "grok-code-fast-1"; - name = "Copilot: Grok Code Fast 1"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 128000; - default_max_tokens = 64000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = false; - } - { - id = "gpt-5.1"; - name = "Copilot: GPT-5.1"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 264000; - default_max_tokens = 64000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "gpt-5.1-codex"; - name = "Copilot: GPT-5.1-Codex"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 400000; - default_max_tokens = 128000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "gpt-5.1-codex-mini"; - name = "Copilot: GPT-5.1-Codex-Mini"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 400000; - default_max_tokens = 128000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "gpt-5.1-codex-max"; - name = "Copilot: GPT-5.1-Codex-Max"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 400000; - default_max_tokens = 128000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "gpt-5-codex"; - name = "Copilot: GPT-5-Codex (Preview)"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 400000; - default_max_tokens = 128000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "claude-sonnet-4"; - name = "Copilot: Claude Sonnet 4"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 216000; - default_max_tokens = 16000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "claude-sonnet-4.5"; - name = "Copilot: Claude Sonnet 4.5"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 144000; - default_max_tokens = 16000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "claude-opus-4.5"; - name = "Copilot: Claude Opus 4.5"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 160000; - default_max_tokens = 16000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "claude-haiku-4.5"; - name = "Copilot: Claude Haiku 4.5"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 144000; - default_max_tokens = 16000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "gemini-3-pro-preview"; - name = "Copilot: Gemini 3 Pro (Preview)"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 128000; - default_max_tokens = 64000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "gemini-3-flash-preview"; - name = "Copilot: Gemini 3 Flash (Preview)"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 128000; - default_max_tokens = 64000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "gemini-2.5-pro"; - name = "Copilot: Gemini 2.5 Pro"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 128000; - default_max_tokens = 64000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "oswe-vscode-prime"; - name = "Copilot: Raptor mini (Preview)"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 264000; - default_max_tokens = 64000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "gpt-5.2"; - name = "Copilot: GPT-5.2"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 264000; - default_max_tokens = 64000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "gpt-4.1"; - name = "Copilot: GPT-4.1"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 128000; - default_max_tokens = 16384; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "gpt-4o"; - name = "Copilot: GPT-4o"; - cost_per_1m_in = 0; - cost_per_1m_out = 0; - cost_per_1m_in_cached = 0; - cost_per_1m_out_cached = 0; - context_window = 128000; - default_max_tokens = 4096; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - ]; - }; - hyper = { - name = "Charm Hyper"; - base_url = "https://hyper.charm.sh/api/v1/openai/"; - api_key = "$(cat /run/agenix/crush)"; - type = "openai"; - models = [ - { - name = "Qwen 3 Coder"; - id = "qwen3_coder"; - context_window = 118000; - default_max_tokens = 20000; - } - ]; - }; - zai = { - name = "Z.AI"; - base_url = "https://api.z.ai/api/paas/v4/"; - api_key = "$(cat /run/agenix/zai)"; - type = "openai"; - models = [ - { - name = "GLM-4.7"; - id = "glm-4.7"; - context_window = 200000; - default_max_tokens = 128000; - can_reason = true; - } - { - name = "GLM-4.6"; - id = "glm-4.6"; - context_window = 200000; - default_max_tokens = 128000; - can_reason = true; - } - { - name = "GLM-4.5"; - id = "glm-4.5"; - context_window = 128000; - default_max_tokens = 96000; - can_reason = true; - } - { - name = "GLM-4.5 Air"; - id = "glm-4.5-air"; - context_window = 128000; - default_max_tokens = 96000; - can_reason = true; - } - ]; - }; - claude-pro = { - name = "Claude Pro"; - type = "anthropic"; - base_url = "https://api.anthropic.com"; - api_key = "Bearer $(anthropic-manager --token)"; - system_prompt_prefix = "You are Claude Code, Anthropic's official CLI for Claude."; - extra_headers = { - "anthropic-version" = "2023-06-01"; - "anthropic-beta" = "oauth-2025-04-20,claude-code-20250219,interleaved-thinking-2025-05-14,fine-grained-tool-streaming-2025-05-14"; - }; - models = [ - { - id = "claude-haiku-4-5-20251001"; - name = "Claude Haiku 4.5"; - cost_per_1m_in = 3.0; - cost_per_1m_out = 15.0; - cost_per_1m_in_cached = 0.225; - cost_per_1m_out_cached = 15.0; - context_window = 200000; - default_max_tokens = 8192; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "claude-sonnet-4-5-20250929"; - name = "Claude Sonnet 4.5"; - cost_per_1m_in = 3.0; - cost_per_1m_out = 15.0; - cost_per_1m_in_cached = 0.225; - cost_per_1m_out_cached = 15.0; - context_window = 200000; - default_max_tokens = 64000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "claude-opus-4-1-20250805"; - name = "Claude Opus 4.1"; - cost_per_1m_in = 15.0; - cost_per_1m_out = 75.0; - cost_per_1m_in_cached = 1.5; - cost_per_1m_out_cached = 75.0; - context_window = 200000; - default_max_tokens = 32000; - can_reason = true; - has_reasoning_efforts = true; - supports_attachments = true; - } - { - id = "claude-opus-4-20250514"; - name = "Claude Opus 4"; - cost_per_1m_in = 15.0; - cost_per_1m_out = 75.0; - cost_per_1m_in_cached = 1.5; - cost_per_1m_out_cached = 75.0; - context_window = 200000; - default_max_tokens = 32000; - can_reason = true; - has_reasoning_efforts = true; - supports_attachments = true; - } - { - id = "claude-sonnet-4-20250514"; - name = "Claude Sonnet 4"; - cost_per_1m_in = 3.0; - cost_per_1m_out = 15.0; - cost_per_1m_in_cached = 0.225; - cost_per_1m_out_cached = 15.0; - context_window = 200000; - default_max_tokens = 64000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "claude-3-7-sonnet-20250219"; - name = "Claude Sonnet 3.7"; - cost_per_1m_in = 2.5; - cost_per_1m_out = 12.0; - cost_per_1m_in_cached = 0.187; - cost_per_1m_out_cached = 12.0; - context_window = 200000; - default_max_tokens = 64000; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "claude-3-5-haiku-20241022"; - name = "Claude Haiku 3.5"; - cost_per_1m_in = 0.8; - cost_per_1m_out = 4.0; - cost_per_1m_in_cached = 0.06; - cost_per_1m_out_cached = 4.0; - context_window = 200000; - default_max_tokens = 8192; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "claude-3-haiku-20240307"; - name = "Claude Haiku 3"; - cost_per_1m_in = 0.25; - cost_per_1m_out = 1.25; - cost_per_1m_in_cached = 0.03; - cost_per_1m_out_cached = 1.25; - context_window = 200000; - default_max_tokens = 4096; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - { - id = "claude-3-opus-20240229"; - name = "Claude Opus 3"; - cost_per_1m_in = 15.0; - cost_per_1m_out = 75.0; - cost_per_1m_in_cached = 1.5; - cost_per_1m_out_cached = 75.0; - context_window = 200000; - default_max_tokens = 8192; - can_reason = true; - has_reasoning_efforts = false; - supports_attachments = true; - } - ]; - }; - }; - }; - }; - - xdg.configFile."crush/copilot.sh".source = ../../../dots/copilot.sh; - }; -} diff --git a/modules/home/apps/crush/_crush-options.nix b/modules/home/apps/crush/_crush-options.nix deleted file mode 100644 index ca9ff77..0000000 --- a/modules/home/apps/crush/_crush-options.nix +++ /dev/null @@ -1,301 +0,0 @@ -{ lib }: -lib.mkOption { - type = lib.types.submodule { - options = { - providers = lib.mkOption { - type = lib.types.attrsOf ( - lib.types.submodule { - options = { - name = lib.mkOption { - type = lib.types.str; - description = "Human-readable name for the provider"; - }; - base_url = lib.mkOption { - type = lib.types.str; - default = ""; - description = "Base URL for the provider's API"; - }; - type = lib.mkOption { - type = lib.types.enum [ - "openai" - "anthropic" - "gemini" - "azure" - "vertexai" - ]; - default = "openai"; - description = "Provider type that determines the API format"; - }; - api_key = lib.mkOption { - type = lib.types.str; - default = ""; - description = "API key for authentication with the provider"; - }; - disable = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Whether this provider is disabled"; - }; - system_prompt_prefix = lib.mkOption { - type = lib.types.str; - default = ""; - description = "Custom prefix to add to system prompts for this provider"; - }; - extra_headers = lib.mkOption { - type = lib.types.attrsOf lib.types.str; - default = { }; - description = "Additional HTTP headers to send with requests"; - }; - extra_body = lib.mkOption { - type = lib.types.attrsOf lib.types.anything; - default = { }; - description = "Additional fields to include in request bodies"; - }; - models = lib.mkOption { - type = lib.types.listOf ( - lib.types.submodule { - options = { - id = lib.mkOption { - type = lib.types.str; - description = "Model ID"; - }; - name = lib.mkOption { - type = lib.types.str; - description = "Model display name"; - }; - cost_per_1m_in = lib.mkOption { - type = lib.types.number; - default = 0; - }; - cost_per_1m_out = lib.mkOption { - type = lib.types.number; - default = 0; - }; - cost_per_1m_in_cached = lib.mkOption { - type = lib.types.number; - default = 0; - }; - cost_per_1m_out_cached = lib.mkOption { - type = lib.types.number; - default = 0; - }; - context_window = lib.mkOption { - type = lib.types.int; - default = 128000; - }; - default_max_tokens = lib.mkOption { - type = lib.types.int; - default = 8192; - }; - can_reason = lib.mkOption { - type = lib.types.bool; - default = false; - }; - has_reasoning_efforts = lib.mkOption { - type = lib.types.bool; - default = false; - }; - default_reasoning_effort = lib.mkOption { - type = lib.types.str; - default = ""; - }; - supports_attachments = lib.mkOption { - type = lib.types.bool; - default = false; - }; - }; - } - ); - default = [ ]; - description = "List of models available from this provider"; - }; - }; - } - ); - default = { }; - description = "AI provider configurations"; - }; - - lsp = lib.mkOption { - type = lib.types.attrsOf ( - lib.types.submodule { - options = { - command = lib.mkOption { - type = lib.types.str; - description = "Command to execute for the LSP server"; - }; - args = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - description = "Arguments to pass to the LSP server command"; - }; - options = lib.mkOption { - type = lib.types.attrsOf lib.types.anything; - default = { }; - description = "LSP server-specific configuration options"; - }; - enabled = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Whether this LSP server is disabled"; - }; - }; - } - ); - default = { }; - description = "Language Server Protocol configurations"; - }; - - mcp = lib.mkOption { - type = lib.types.attrsOf ( - lib.types.submodule { - options = { - command = lib.mkOption { - type = lib.types.str; - default = ""; - description = "Command to execute for stdio MCP servers"; - }; - env = lib.mkOption { - type = lib.types.attrsOf lib.types.str; - default = { }; - description = "Environment variables to set for the MCP server"; - }; - args = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - description = "Arguments to pass to the MCP server command"; - }; - type = lib.mkOption { - type = lib.types.enum [ - "stdio" - "sse" - "http" - ]; - default = "stdio"; - description = "Type of MCP connection"; - }; - url = lib.mkOption { - type = lib.types.str; - default = ""; - description = "URL for HTTP or SSE MCP servers"; - }; - disabled = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Whether this MCP server is disabled"; - }; - headers = lib.mkOption { - type = lib.types.attrsOf lib.types.str; - default = { }; - description = "HTTP headers for HTTP/SSE MCP servers"; - }; - }; - } - ); - default = { }; - description = "Model Context Protocol server configurations"; - }; - - options = lib.mkOption { - type = lib.types.submodule { - options = { - context_paths = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - description = "Paths to files containing context information for the AI"; - }; - tui = lib.mkOption { - type = lib.types.submodule { - options = { - compact_mode = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable compact mode for the TUI interface"; - }; - }; - }; - default = { }; - description = "Terminal user interface options"; - }; - debug = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable debug logging"; - }; - debug_lsp = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable debug logging for LSP servers"; - }; - disable_auto_summarize = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Disable automatic conversation summarization"; - }; - data_directory = lib.mkOption { - type = lib.types.str; - default = ".crush"; - description = "Directory for storing application data (relative to working directory)"; - }; - }; - }; - default = { }; - description = "General application options"; - }; - - permissions = lib.mkOption { - type = lib.types.submodule { - options = { - allowed_tools = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - description = "List of tools that don't require permission prompts"; - }; - }; - }; - default = { }; - description = "Permission settings for tool usage"; - }; - - models = lib.mkOption { - type = lib.types.attrsOf ( - lib.types.submodule { - options = { - model = lib.mkOption { - type = lib.types.str; - description = "The model ID as used by the provider API"; - }; - provider = lib.mkOption { - type = lib.types.str; - description = "The model provider ID that matches a key in the providers config"; - }; - reasoning_effort = lib.mkOption { - type = lib.types.enum [ - "low" - "medium" - "high" - ]; - default = ""; - description = "Reasoning effort level for OpenAI models that support it"; - }; - max_tokens = lib.mkOption { - type = lib.types.int; - default = 0; - description = "Maximum number of tokens for model responses"; - }; - think = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable thinking mode for Anthropic models that support reasoning"; - }; - }; - } - ); - default = { }; - description = "Model configurations"; - }; - }; - }; - default = { }; - description = "Crush configuration options"; -} diff --git a/modules/home/apps/crush/crush-module.nix b/modules/home/apps/crush/crush-module.nix deleted file mode 100644 index 1142589..0000000 --- a/modules/home/apps/crush/crush-module.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -{ - options.programs.crush = { - enable = lib.mkEnableOption "Enable crush"; - settings = import ./_crush-options.nix { inherit lib; }; - }; - - config = lib.mkIf config.programs.crush.enable { - home.packages = [ pkgs.nur.repos.charmbracelet.crush ]; - home.file.".config/crush/crush.json" = lib.mkIf (config.programs.crush.settings != { }) { - text = builtins.toJSON config.programs.crush.settings; - }; - }; -} diff --git a/modules/home/apps/wut/default.nix b/modules/home/apps/wut/default.nix index ff5b019..6acecc7 100644 --- a/modules/home/apps/wut/default.nix +++ b/modules/home/apps/wut/default.nix @@ -436,7 +436,7 @@ in wut() { export WUT_WRAPPER_ACTIVE=1 local output - output=$("$(command -v wut)" "$@" 2>&1) + output=$(${wut}/bin/wut "$@" 2>&1) local exit_code=$? local cd_marker cd_marker=$(echo "$output" | grep "^__WUT_CD__:" | head -1) diff --git a/secrets/context7.age b/secrets/context7.age deleted file mode 100644 index 50c0275..0000000 --- a/secrets/context7.age +++ /dev/null @@ -1,13 +0,0 @@ -age-encryption.org/v1 --> ssh-rsa DqcG0Q -e03DRMRMDI6LCR+XT2n+EtefyS+4QSjNyFQ84ehZl4fu0ZAsSaPicWSIJWxCM1ny -D6SPJG7Ucll47iTX+Z3IFfr9jj4fI9G+iltoKUYy8SuOlINjE8k2b8J8+4qnbIkz -wWrqP6VABT2wcudvYMqXwaAn+W/RBDZO7YDlMqBra5w5EUhiOwdJecAXMUP01hH5 -DNuKwR9HVTEOcm23BgerexFYoXC+/VtCTqLt2c13NkIBuY7XwLznpz5RxyJr8nSc -9cqObb7rvwPtlSzhpMihmEsrrhDTdsZFMCH/mFjxw6jlt4TNqX9EYgdrgWeUY0db -iiQzoD7zYRmVu6+b0VDCR4qVjjx7qJCUAHVJGMXVQ8zZ7VaEcLOs+GwkJOi6Ds3+ -L1IgntlBwFXB23EMt9nKMkqSwbrTnyoL8HOhHLkDNPnagOCqMon+qLOsZfKoNSBC -uMYO81sApaQ7sWv3U70PzCPunCk5uyeTH5+L+myhBdLJMqJXGBvIuhat5suunxjA - ---- lYbv0hQZlIU5UiHiweDvJQfJNZpfz77h7qHUF0PFvBY -��rY1Iq�خ���q�E �B�< �����Nn���U�bmũ肃���HF�@��ϭ�Z��I(�M��J/~� \ No newline at end of file diff --git a/secrets/crush.age b/secrets/crush.age deleted file mode 100644 index 701db4e..0000000 --- a/secrets/crush.age +++ /dev/null @@ -1,13 +0,0 @@ -age-encryption.org/v1 --> ssh-rsa DqcG0Q -pXxvBC3KC0KrKcLNiAR4OpgTm45dqZur0YzNB9lMU9Wapc89sXc0iFRClIo9wOwK -239l5rvUN44nSAangwU5ch6kRZHezXwr52kgkEKKTWHK16hO9lXTpxhRH5XP9RA3 -2hfdDy8SABxpfAi1utmY/6CCX7z+DMIYCKnjKjfiFJhvAljMXHRj7TG39qicrdtA -DAtqDgDflMpkb7gENdqwlwS53VV8AYRUicenJGuH0XT8xs0HYp71g+mJZFLmqdMg -Uwh7Hrt2sfWf9sydJm49ob0nfyqpmygQh+wy1FmRRG+4HYxQQXLswYPmsU+o+v39 -pwg6ixzBWCojWnG3VQagmzpHiAU58JidYAxbkR3MMeaKbMlsY2OaRl9VuxcQJ9cg -ONaEHZvIfotLVa4arH/DHc8IyFAwVdWx8SRS6ahMYt3l7iNXVRHNIzoxbpGocraK -uMeLhCaG+ZeLRkdXNiOps50O7C5Y89+FfWv/qYk0wnHtFinBV3GcXrAzmaHue2nF - ---- sIuSUqv8QbgqVt8GnCtTYhg7Q1HUrEtjT0v48eHeXuE -��W��^B- �b�՚G�!oϦ��������UqN#��G��Dm� {�ziU ��4d��I�*q$�ŀ,��J�0 \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 75463c2..8e70bcf 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -17,12 +17,7 @@ in "iodine.age".publicKeys = [ kierank ]; - "crush.age".publicKeys = [ - kierank - ]; - "context7.age".publicKeys = [ - kierank - ]; + "cloudflare.age".publicKeys = [ kierank ]; @@ -74,9 +69,7 @@ in "tranquil-pds.age".publicKeys = [ kierank ]; - "zai.age".publicKeys = [ - kierank - ]; + "pbnj.age".publicKeys = [ kierank ]; diff --git a/secrets/zai.age b/secrets/zai.age deleted file mode 100644 index 19846ee..0000000 --- a/secrets/zai.age +++ /dev/null @@ -1,13 +0,0 @@ -age-encryption.org/v1 --> ssh-rsa DqcG0Q -HdjjUsbSvsBTugcIVyXsZvtyHu7lMkvGWYxrASvNm2DST3C3DG5SMlY7kz1APWc7 -uTUZTiDRvakHDpLgTSUWYs9O7s0klxh78alp2soaojm1RVGnAS0cxd77Lm0jaSTJ -QpOp9GER8yt5EieST7ox6TJTQ82gIH+ir15b5HGUVUvY7vmoEVYuWcF9bWfV7djL -nhOA7S+4FzDzXt/iq6v5iYKva8E7cJj4mdaOC9EcebHabCmylrBtdjJR8toRLsIO -HWS+NxSof5FSSKxjpsuJtbLESaZCkae4TYXcL4WNV3btGnRoV3JXN61HvxrLJ8fj -yRpFQ0qpl2/5OKZzp7ucOG4JkDI00ZQf0wFc52EfLJ+NgdjlU3gMl0Jmq8qUBUOu -PYHhJO2BlFQgGJCdCGNyRuEyy39oCx0R8pEkJVf4u1W9p41/Q8XDHn3ZwxSG/gtY -MMSmq/NK9TfoBzSY9sZKJ70Ah9/Zrcv58mkdpANUcwwifj4RzeB3SEG6XlWep6Vm - ---- VO2a9ThvhPCUPyuzMRmEnHf8baZxP3uKBlgp0J2ugLI -vm��^{��pS�}U4� !X��� �Ib����PI�~�sX��nܡ�s<&���O��ц3]u����ÿ��m�:?]{���y \ No newline at end of file -- 2.51.2