Expand & refactor editor/emacs module

This commit is contained in:
Henrik Lissner 2020-01-04 00:14:19 -05:00
parent 4764e1fc54
commit 8f7f5a5cce
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 21 additions and 9 deletions

View file

@ -3,7 +3,6 @@
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
rustup rustup
rls
]; ];
home.xdg.configFile = { home.xdg.configFile = {

View file

@ -1,21 +1,34 @@
{ config, lib, pkgs, ... }: # Emacs is my main driver. I'm the author of Doom Emacs
# <https://github.com/hlissner/doom-emacs>. This module sets it up to meed my
# particular Doomy needs.
{ config, lib, pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(lib.mkIf (config.programs.gnupg.agent.enable) pinentry_emacs) # Doom dependencies
zstd
editorconfig-core-c
(ripgrep.override {withPCRE2 = true;})
# Doom Emacs + dependencies
emacs emacs
git
(ripgrep.override {withPCRE2 = true;})
# Optional dependencies
editorconfig-core-c # per-project style config
fd # faster projectile indexing
imagemagick # for image-dired
gnutls # for TLS connectivity
(lib.mkIf (config.programs.gnupg.agent.enable)
pinentry_emacs) # in-emacs gnupg prompts
zstd # for undo-tree compression
ffmpeg # for screen recording emacs
# Module dependencies
sqlite # :tools (lookup +docsets) sqlite # :tools (lookup +docsets)
texlive.combined.scheme-medium # :lang org -- for latex previews texlive.combined.scheme-medium # :lang org -- for latex previews
ccls # :lang (cc +lsp) ccls # :lang (cc +lsp)
nodePackages.javascript-typescript-langserver # :lang (javascript +lsp) nodePackages.javascript-typescript-langserver # :lang (javascript +lsp)
rls # :lang (rust +lsp)
]; ];
fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ]; fonts.fonts = [
pkgs.emacs-all-the-icons-fonts
];
home.xdg.configFile = { home.xdg.configFile = {
"zsh/rc.d/aliases.emacs.zsh".source = <config/emacs/aliases.zsh>; "zsh/rc.d/aliases.emacs.zsh".source = <config/emacs/aliases.zsh>;