diff options
| -rw-r--r-- | hosts/home-darwin.nix | 2 | ||||
| -rw-r--r-- | hosts/home.nix | 2 | ||||
| -rw-r--r-- | overlays/base/default.nix | 5 | ||||
| -rw-r--r-- | packages/lsp-bridge/default.nix | 64 |
4 files changed, 2 insertions, 71 deletions
diff --git a/hosts/home-darwin.nix b/hosts/home-darwin.nix index 4c177c0..1cd5288 100644 --- a/hosts/home-darwin.nix +++ b/hosts/home-darwin.nix @@ -32,7 +32,7 @@ projectile lsp-ui - manualPackages.custom.lsp-bridge + lsp-bridge rust-mode rustic company diff --git a/hosts/home.nix b/hosts/home.nix index 18ea115..e615a96 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -169,7 +169,7 @@ projectile lsp-ui - manualPackages.custom.lsp-bridge + lsp-bridge rust-mode rustic company diff --git a/overlays/base/default.nix b/overlays/base/default.nix index b5e9124..03d5799 100644 --- a/overlays/base/default.nix +++ b/overlays/base/default.nix @@ -80,9 +80,4 @@ final: prev: mpv = prev.wrapMpv prev.mpv-unwrapped { scripts = [ prev.mpvScripts.mpris ]; }; - - emacsPackagesFor = emacs: ((prev.emacsPackagesFor emacs).overrideScope' (prev: final: rec { - manualPackages = final.manualPackages // { custom.lsp-bridge = prev.callPackage ../../packages/lsp-bridge { }; }; - })); - } diff --git a/packages/lsp-bridge/default.nix b/packages/lsp-bridge/default.nix deleted file mode 100644 index 7eba8f0..0000000 --- a/packages/lsp-bridge/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, python3Packages -, python3 -, posframe -, markdown-mode -, yasnippet -, org -, which-key -, makeWrapper -}: - -let - rev = "7dfeeb640d14697755e2ac7997af0ec6c413197f"; - python = python3.withPackages (ps: with ps; [ epc orjson sexpdata six ]); -in trivialBuild { - pname = "lsp-bridge"; - version = "20230104"; - - commit = rev; - - src = fetchFromGitHub { - owner = "manateelazycat"; - repo = "lsp-bridge"; - inherit rev; - sha256 = "sha256-sB5niigN0rdtqeprlZAJEKgAuQDkcUMbbL9yTnrdoLg="; - }; - - packageRequires = - [ - posframe - markdown-mode - yasnippet - org - which-key - ]; - - buildPhase = '' - runHook preInstall - install -d $out/share/emacs/site-lisp/ - install *.el $out/share/emacs/site-lisp/ - install acm/*.el $out/share/emacs/site-lisp/ - install *.py $out/share/emacs/site-lisp/ - cp -r core $out/share/emacs/site-lisp/ - cp -r langserver $out/share/emacs/site-lisp/ - cp -r multiserver $out/share/emacs/site-lisp/ - cp -r resources $out/share/emacs/site-lisp/ - cp -r acm/icons $out/share/emacs/site-lisp/ - runHook postInstall - ''; - - postPatch = '' - substituteInPlace lsp-bridge.el --replace '(defcustom lsp-bridge-python-command (if (memq system-type '"'"'(cygwin windows-nt ms-dos)) "python.exe" "python3")' '(defcustom lsp-bridge-python-command "${python.interpreter}"' - ''; - - meta = { - description = "Fastest LSP client in Emacs."; - longDescription = '' - Using python's threading technology to build caches that bridge Emacs and LSP server. - ''; - license = lib.licenses.gpl3; - }; -} |