diff options
| author | sterni <sternenseemann@systemli.org> | 2022-10-06T21·37+0200 |
|---|---|---|
| committer | sterni <sternenseemann@systemli.org> | 2022-10-06T21·41+0000 |
| commit | 8b880b4a5052a7deaf8663136ac6e436aefa64e8 (patch) | |
| tree | 6f8deda2c25032e03875fdbe75a8056e1e554864 /users/sterni | |
| parent | b530e496a5962a3998773343d7ed6a9dd84b7753 (diff) | |
fix(sterni/emacs): fix eval on i686-linux by disabling languagetool r/5042
Given that the laptop I need this for is really slow, I may want to disable even more stuff, but I'll take it step by step. This should at least make it possible to build its system closure. Change-Id: I50c55fa3426252e7f23f419bb2009d58a9312a98 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6876 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'users/sterni')
| -rw-r--r-- | users/sterni/emacs/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/users/sterni/emacs/default.nix b/users/sterni/emacs/default.nix index 8b2304f7aa..212abfc758 100644 --- a/users/sterni/emacs/default.nix +++ b/users/sterni/emacs/default.nix @@ -1,6 +1,8 @@ -{ depot, pkgs, ... }: +{ depot, pkgs, lib, ... }: let + inherit (pkgs.stdenv.hostPlatform) is64bit; + # emacsPgtkNativeComp is defined in emacs-overlay emacs = (pkgs.emacsPackagesFor pkgs.emacsPgtkNativeComp).withPackages (epkgs: [ epkgs.bqn-mode @@ -19,7 +21,6 @@ let epkgs.melpaPackages.haskell-mode epkgs.melpaPackages.hl-todo epkgs.melpaPackages.jq-mode - epkgs.melpaPackages.languagetool epkgs.melpaPackages.lsp-haskell epkgs.melpaPackages.lsp-mode epkgs.melpaPackages.lsp-ui @@ -42,6 +43,8 @@ let epkgs.dash epkgs.s epkgs.jiralib2 + ] ++ lib.optionals is64bit [ + epkgs.melpaPackages.languagetool ]); configDirectory = pkgs.symlinkJoin { @@ -54,11 +57,15 @@ let text = '' ;; bqn-mode (setq bqn-interpreter-path "${pkgs.cbqn}/bin/BQN") + '' + # Java doesn't seem to be available for non 64bit platforms in nixpkgs + + lib.optionalString is64bit '' ;; languagetool (setq languagetool-java-bin "${pkgs.jre}/bin/java" languagetool-console-command "${pkgs.languagetool}/share/languagetool-commandline.jar" languagetool-server-command "${pkgs.languagetool}/share/languagetool-server.jar") + '' + '' ;; use bash instead of fish from SHELL for some things, as it plays ;; nicer with TERM=dumb, as I don't need/want vterm anyways. |