diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix index 0059324..c754558 100644 --- a/modules/programs/emacs.nix +++ b/modules/programs/emacs.nix @@ -8,7 +8,7 @@ with lib; let cfg = config.my.programs.emacs; - myEmacs = with pkgs; ((emacsPackagesFor emacs).emacsWithPackages + myEmacs = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: [ epkgs.vterm ])); in { @@ -16,72 +16,25 @@ in config = mkIf cfg.enable { my.shell.aliases = { - emacs = "emacsclient -t -a 'emacs -t'"; + emacs = "emacsclient -nw -a 'emacs -nw'"; }; - fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ]; - environment.systemPackages = with pkgs; [ - ### Emacs itself - binutils # native-comp needs 'as', provided by this + fonts.fonts = with pkgs; [ + emacs-all-the-icons-fonts + (iosevka-bin.override { variant = "aile"; }) + ]; + users.users.moritz.packages = with pkgs; [ myEmacs - ### Doom dependencies - git (ripgrep.override { withPCRE2 = true; }) - gnutls # for TLS connectivity - - ### Optional dependencies - fd # faster projectile indexing - imagemagick # for image-dired - zstd # for undo-fu-session/undo-tree compression - - ### Module dependencies - ## :checkers - # spell + # flyspell (hunspellWithDicts [ hunspellDicts.en_GB-ize hunspellDicts.en_US hunspellDicts.de_DE ]) - # grammar - languagetool - - ## : tools - # lookup & org +roam - sqlite - gcc # HACK to get emacsqlite binary - wordnet - graphviz - - ## :lang - # latex & org (latex previews) - texlive.combined.scheme-full - texlab - - # nix - nixfmt # for formating nix - rnix-lsp - - # markdown & org +pandoc - pandoc - - # python - nodePackages.pyright - - # sh - nodePackages.bash-language-server - - ## :email - # mu4e - mu - isync - - ## :app - # everywhere - xdotool - xorg.xwininfo - xclip - xorg.xprop + # language servers + nil ]; home-manager.users.moritz = { home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ];