From fc6f064a51cd74978bf3d75e22d61b26b11f4e76 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Tue, 2 Jan 2024 18:21:22 +0800 Subject: [PATCH] feat: enable emacs on fern, add dependencies for emacs/neovim --- home/base/desktop/editors/emacs/default.nix | 6 +----- home/base/desktop/editors/packages.nix | 4 ++++ hosts/fern/home.nix | 7 ++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/home/base/desktop/editors/emacs/default.nix b/home/base/desktop/editors/emacs/default.nix index 630ff416..963b6483 100644 --- a/home/base/desktop/editors/emacs/default.nix +++ b/home/base/desktop/editors/emacs/default.nix @@ -16,7 +16,7 @@ with lib; let cfg = config.modules.editors.emacs; envExtra = '' - export PATH="$XDG_CONFIG_HOME/emacs/bin:$PATH" + export PATH="${config.xdg.cacheHome}/emacs/bin:$PATH" ''; shellAliases = { e = "emacs"; @@ -34,13 +34,9 @@ in { config = mkIf cfg.enable { home.packages = with pkgs; [ ## Emacs itself - binutils # native-comp needs 'as', provided by this - # 28.2 + native-comp ((emacsPackagesFor emacs-unstable-nox).emacsWithPackages (epkgs: [ epkgs.vterm - epkgs.rime - epkgs.meow ])) emacs-all-the-icons-fonts diff --git a/home/base/desktop/editors/packages.nix b/home/base/desktop/editors/packages.nix index 5e3403dd..98266ffb 100644 --- a/home/base/desktop/editors/packages.nix +++ b/home/base/desktop/editors/packages.nix @@ -84,6 +84,10 @@ jsonnet-language-server hadolint # Dockerfile linter + # -- Scheme + guile + racket-minimal + #-- Others taplo # TOML language server / formatter / validator nodePackages.yaml-language-server diff --git a/hosts/fern/home.nix b/hosts/fern/home.nix index 57c997d2..8a2d6ff1 100644 --- a/hosts/fern/home.nix +++ b/hosts/fern/home.nix @@ -1,4 +1,4 @@ -_: { +{ programs.ssh = { enable = true; extraConfig = '' @@ -11,4 +11,9 @@ _: { IdentitiesOnly yes ''; }; + + modules.editors.emacs = { + enable = true; + doom.enable = true; + }; }