From 9c2e5587cfe11e709f54fd1bcaa6a3d3dac40157 Mon Sep 17 00:00:00 2001 From: Deepak Mallubhotla Date: Sat, 15 Mar 2025 20:16:13 -0500 Subject: [PATCH] adding mcp text editor --- flake.lock | 99 ++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 6 +++ home/deepak/home.nix | 20 +++++++-- overlays/default.nix | 9 +++- 4 files changed, 128 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e287d94..2e13c00 100644 --- a/flake.lock +++ b/flake.lock @@ -65,6 +65,29 @@ "type": "github" } }, + "claude-mcp-bundle": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "pyproject-build-systems": "pyproject-build-systems", + "pyproject-nix": "pyproject-nix", + "uv2nix": "uv2nix" + }, + "locked": { + "lastModified": 1742087651, + "narHash": "sha256-pFu40WoDrZKpb0YWf/2YcyC9VH3ugyRnKlbrW7nPAVw=", + "ref": "refs/heads/master", + "rev": "6769b5cbbe8dc77d4568ad949017f15a93b6f6ec", + "revCount": 9, + "type": "git", + "url": "https://gitea.deepak.science/deepak/claude_mcp_bundle.git" + }, + "original": { + "type": "git", + "url": "https://gitea.deepak.science/deepak/claude_mcp_bundle.git" + } + }, "cmp-vimtex": { "flake": false, "locked": { @@ -326,11 +349,62 @@ "type": "github" } }, + "pyproject-build-systems": { + "inputs": { + "nixpkgs": [ + "claude-mcp-bundle", + "nixpkgs" + ], + "pyproject-nix": [ + "claude-mcp-bundle", + "pyproject-nix" + ], + "uv2nix": [ + "claude-mcp-bundle", + "uv2nix" + ] + }, + "locked": { + "lastModified": 1741647088, + "narHash": "sha256-y/Aj21rMGdE23dcFfD4lRhNMgkhIRucp+uuWLWUXv0M=", + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "rev": "6d7eced86469cf89ed4d19d91b870163deb0dca2", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "type": "github" + } + }, + "pyproject-nix": { + "inputs": { + "nixpkgs": [ + "claude-mcp-bundle", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741648141, + "narHash": "sha256-jQEZCSCgm60NGmBg3JPu290DDhNVI1GVVEd0P8VCnME=", + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "rev": "7747e5a058245c7abe033a798f818f0572d8e155", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "type": "github" + } + }, "root": { "inputs": { "NixOS-WSL": "NixOS-WSL", "NixOS-WSL-2405": "NixOS-WSL-2405", "NixOS-WSL-2411": "NixOS-WSL-2411", + "claude-mcp-bundle": "claude-mcp-bundle", "cmp-vimtex": "cmp-vimtex", "homeManager": "homeManager", "homeManager-24-05": "homeManager-24-05", @@ -410,6 +484,31 @@ "type": "github" } }, + "uv2nix": { + "inputs": { + "nixpkgs": [ + "claude-mcp-bundle", + "nixpkgs" + ], + "pyproject-nix": [ + "claude-mcp-bundle", + "pyproject-nix" + ] + }, + "locked": { + "lastModified": 1741780535, + "narHash": "sha256-B4seqoWl9HlKZ7m+nDosVtmDw9i6KbhvfonQlYhRrJg=", + "owner": "pyproject-nix", + "repo": "uv2nix", + "rev": "7de0e836e005f971a252e20b478d12b8b64909d8", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "uv2nix", + "type": "github" + } + }, "zsh-completions": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index ba860d4..374eb1d 100644 --- a/flake.nix +++ b/flake.nix @@ -66,6 +66,12 @@ url = "github:zsh-users/zsh-completions/master"; flake = false; }; + + claude-mcp-bundle = { + url = "git+https://gitea.deepak.science/deepak/claude_mcp_bundle.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; outputs = { self, nixpkgs, homeManager, NixOS-WSL, NixOS-WSL-2405, nixpkgs-24-05, nixpkgs-24-11, homeManager-24-05, homeManager-24-11, cmp-vimtex, spaceport-nvim, nomodoro, ...}@inputs: diff --git a/home/deepak/home.nix b/home/deepak/home.nix index a038dde..cef3a5b 100644 --- a/home/deepak/home.nix +++ b/home/deepak/home.nix @@ -1,5 +1,7 @@ { pkgs, config, specialArgs, lib, ...}: -let pkgs-unstable = specialArgs.nixpkgs-unstable; +let + pkgs-unstable = specialArgs.nixpkgs-unstable; + # default_python = pkgs-unstable.python313; in { @@ -20,7 +22,7 @@ in # lsps pkgs.nil # pkgs.nodePackages.pyright - pkgs.pyright + # pkgs.pyright pkgs.thefuck pkgs.fzf @@ -30,8 +32,14 @@ in pkgs.delta pkgs-unstable.claude-code - pkgs-unstable.uv - pkgs-unstable.nodejs + # default_python + # pkgs-unstable.uv + # pkgs-unstable.nodejs + + # From our claude bundle + pkgs.custom-servers.arxiv-mcp-server + pkgs.custom-servers.basic-memory-server + pkgs.custom-servers.mcp-text-editor ] ++ pkgs.lib.optionals specialArgs.withGUI [ pkgs.discord @@ -51,6 +59,10 @@ in "$HOME/.local/bin" ]; + home.sessionVariables = { + # UV_PYTHON = "${default_python}"; + }; + programs.direnv.enable = true; programs.direnv.nix-direnv.enable = true; diff --git a/overlays/default.nix b/overlays/default.nix index a97c9a5..5aee5c2 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,6 @@ { cmp-vimtex, spaceport-nvim, nomodoro, parrot-nvim, inputs }: -{ - overlay = final: prev: +let + pluginoverlay= final: prev: let cmpVimtexPlugin = prev.vimUtils.buildVimPlugin { src = cmp-vimtex; @@ -38,4 +38,9 @@ }; }; +in { + overlay = inputs.nixpkgs.lib.composeManyExtensions[ + pluginoverlay + inputs.claude-mcp-bundle.overlays.default + ]; }