diff --git a/apps/nogui/default.nix b/apps/nogui/default.nix index 1d4c04fc2ed25f762af1abb835238f8e1689ff03..cfabab80bda9b7788d5847c95dd09ec9a4d76d5b 100644 --- a/apps/nogui/default.nix +++ b/apps/nogui/default.nix @@ -15,8 +15,6 @@ ./jj.nix ./jq.nix ./lazygit.nix { pkgs, config, ... }: - ./bottom.nix -{ pkgs, config, ... }: ./eza.nix ./oh-my-posh.nix ./senpai.nix diff --git a/apps/nogui/llm.nix b/apps/nogui/llm.nix deleted file mode 100644 index 07a62753081e8e6529fc23e0d98a64fc61538246..0000000000000000000000000000000000000000 --- a/apps/nogui/llm.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ pkgs, lib, ... }: -let - claude = - let - inherit (pkgs) fetchFromGitHub nix-update-script python3Packages; - inherit (python3Packages) - buildPythonPackage - setuptools - anthropic - llm - pytestCheckHook - pytest - pytest-recording - ; - in - buildPythonPackage rec { - pname = "llm-claude-3"; - version = "0.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "simonw"; - repo = "llm-claude-3"; - rev = "refs/tags/${version}"; - hash = "sha256-5qF5BK319PNzB4XsLdYvtyq/SxBDdHJ9IoKWEnvNRp4="; - }; - - build-system = [ setuptools ]; - buildInputs = [ llm ]; - dependencies = [ anthropic ]; - optional-dependencies = { - test = [ - pytest - pytest-recording - ]; - }; - - # Test suite requires network access to talk to Claude (duh). - nativeCheckInputs = [ pytestCheckHook ]; - doCheck = false; - pythonImportsCheck = [ "llm_claude_3" ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "LLM plugin for interacting with the Claude 3 family of models"; - homepage = "https://github.com/simonw/llm-claude-3"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ jkachmar ]; - }; - }; -in -{ - home.packages = [ (pkgs.llm.withPlugins [ claude ]) ]; -} diff --git a/apps/nogui/nushell/jolheiser.nu b/apps/nogui/nushell/jolheiser.nu index c9ff05362ca9f56a6690623eab2c898678eb1209..ee508fd02363e70a935f5a4969034cce3327ed69 100644 --- a/apps/nogui/nushell/jolheiser.nu +++ b/apps/nogui/nushell/jolheiser.nu @@ -69,22 +69,6 @@ rm -rf $tmp echo 'nixpkgs.lib.fileContents ./go.mod.sri' } -def q [ - --debug # Debug mode, only echo query - ...args: string - ] { - let input = $in - mut query = $args | str join ' ' - if ($input | is-not-empty) { - $query = $"($query)\n\n($input)" - } - if ($debug) { - print $query - return - } - ^llm -s "Answer in as few words as possible. Use a brief style with short replies." -m claude-3.5-sonnet $"($query)" -} - # Run a command if known, otherwise run it with nix def , [ cmd: string # The command to run diff --git a/flake.nix b/flake.nix index c5edb42a109947ca87d0d5d0690e31847e7f41f6..ffd16417a39b51cae04798bb8be29aa9cd6b7d93 100644 --- a/flake.nix +++ b/flake.nix @@ -187,11 +187,6 @@ file = ./secrets/shared/cachix.age; path = "/home/${username}/.config/cachix/cachix.dhall"; }; { - resume = { - file = ./secrets/shared/llm.age; - path = "/home/${username}/.config/io.datasette.llm/keys.json"; - }; -{ url = "git+https://git.jolheiser.com/blog.git"; }; } diff --git a/justfile b/justfile index 24bc25406e22af6b55e8ff1b301b3f339afbfe00..bd211f59f7734b611558c9ad7259c3af98df44ac 100644 --- a/justfile +++ b/justfile @@ -12,7 +12,6 @@ switch *args: @just rebuild switch {{args}} hm: - @git add . @home-manager switch --flake . |& nix run nixpkgs#nix-output-monitor @systemctl --user start agenix.service diff --git a/secrets/secrets.nix b/secrets/secrets.nix index a2c3d3458ff2528fe3856a139b332da81212d54a..58cd8391a538bfef560666fd156376f638dead5c 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -21,8 +21,6 @@ "shared/irc-pw.age".publicKeys = all; "shared/gist-pw.age".publicKeys = all; "shared/git-send-email.age".publicKeys = all; jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; - matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1"; - jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; genmaicha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKhyzwMV0eoS8RSAcUvLkPhbXoR9/06cLoBmUVyb9DTw"; jolheiser dragonwell diff --git a/secrets/shared/llm.age b/secrets/shared/llm.age deleted file mode 100644 index 6ca7f7dca18b325eb5deb7fe34193ae2c5b77436..0000000000000000000000000000000000000000 --- a/secrets/shared/llm.age +++ /dev/null @@ -1,14 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 E8j6/g p21/KPTNTZrRXQUvPtlkHZuiFyNGkJWxF/yfhn643gk -jnN29WaHvFjMIjzVe0hkOEcolovBwjcgc2RfDlgY97E --> ssh-ed25519 xUMv2w Dvet20WUzCfQeoKrdmCb12ouUNlePgFDdKEUZP82PmA -Prj/pjjj+oDqwKq+Q59aSj80YqICcgvulCBVy8CYx5Q --> ssh-ed25519 ph+d2g vvjz0afKneI+lpiGGm8JuDTlJDlmoUygm/roW1vQphw -imYWGoW9O4MTbwTqXC5+5bH9sBf6qgkEJ8tNDtx6B0E --> ssh-ed25519 Cuo7gw zUGiEgCtGzwZOVUl5T3jMBdwYzf657jMAbfJ/G1uGX8 -jeoWPVh4+AVyGqdZlG1Do3XHT/bwojZsT14I8E3aF1s --> ssh-ed25519 f31uNA KmRTboipwSZZyDV1d69x4Apn0IjeboMxhmFVJBm72XI -Rgk4ranEXY0mcyBX7nWnW31yKZ8J3hrfzMV5NeQ3tLk ---- RW/X1U5gc3VSKroi8ZAIHZt4tvNShY/viK2TE2WSY4Q -|ut֐ Pf^