diff --git a/nix/flake.nix b/nix/flake.nix index cf5674b..1c58f82 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -39,10 +39,6 @@ url = "git+https://github.com/akermu/emacs-libvterm"; flake = false; }; - easy-hls-nix = { - url = "github:jkachmar/easy-hls-nix"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; }; outputs = { self @@ -160,7 +156,6 @@ sss-cli = mkPkg "sss-cli"; shh = mkPkg "shh"; mainsail = mkPkg "mainsail"; - easy-hls-nix = if system == "x86_64-linux" then mkPkg "easy-hls-nix" else (import nixpkgs-unstable { inherit system; }).hello; winetricks = mkPkg "winetricks"; }); }; diff --git a/nix/overlays/emacs/default.nix b/nix/overlays/emacs/default.nix index 16779b6..db7594c 100644 --- a/nix/overlays/emacs/default.nix +++ b/nix/overlays/emacs/default.nix @@ -33,7 +33,9 @@ in ghc cabal-install - magic_rb.easy-hls-nix + haskell-language-server + + (symlinkJoin { name = "hledger-compat"; paths = [ hledger ]; postBuild = "ln -s $(readlink -f $out/bin/hledger) $out/bin/ledger"; }) ]; }; };