diff options
Diffstat (limited to 'modules/emacs')
-rw-r--r-- | modules/emacs/README.org | 3 | ||||
-rw-r--r-- | modules/emacs/default.nix | 18 |
2 files changed, 10 insertions, 11 deletions
diff --git a/modules/emacs/README.org b/modules/emacs/README.org index 432d498..2d2acc9 100644 --- a/modules/emacs/README.org +++ b/modules/emacs/README.org @@ -86,6 +86,9 @@ Configuration to automagically open age files, and to encrypt them correctly to :hook (marginalia-mode . nerd-icons-completion-marginal) :config (nerd-icons-completion-mode)) + +(use-package nerd-icons-dired + :hook (dired-mode . nerd-icons-dired-mode)) #+end_src ** Direnv To integrate with nix shells. diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix index ceba97e..bdc9b19 100644 --- a/modules/emacs/default.nix +++ b/modules/emacs/default.nix @@ -1,19 +1,16 @@ { pkgs, inputs, lib, config, ...}: let outside-emacs = with pkgs; [ - (python3.withPackages (p: (with p; [ - python-lsp-server - python-lsp-ruff - ]))) nil ripgrep emacs-lsp-booster ]; - org-tangle-elisp-blocks = (pkgs.callPackage ./org.nix {inherit pkgs; inherit (inputs) from-elisp;}).org-tangle ({ language, flags } : - let is-elisp = (language == "emacs-lisp") || (language == "elisp"); - is-tangle = if flags ? ":tangle" then - flags.":tangle" == "yes" || flags.":tangle" == "y" else false; - in is-elisp && is-tangle + org-tangle-elisp-blocks = (pkgs.callPackage ./org.nix {inherit pkgs; inherit (inputs) from-elisp;}).org-tangle ({ language, flags } : let + is-elisp = (language == "emacs-lisp") || (language == "elisp"); + is-tangle = if flags ? ":tangle" then + flags.":tangle" == "yes" || flags.":tangle" == "y" else false; + in + is-elisp && is-tangle ); config-el = pkgs.writeText "config.el" (org-tangle-elisp-blocks (builtins.readFile ./README.org)); emacs = pkgs.emacsWithPackagesFromUsePackage { @@ -23,6 +20,7 @@ let withAlsaLib = true; withSystemd = true; withToolkitScrollBars = true; + withImageMagick = true; }; override = epkgs: epkgs // { eglot-booster = pkgs.callPackage ./eglot-booster.nix { @@ -46,10 +44,8 @@ in with lib; { nixpkgs.overlays = [ inputs.emacs-overlay.overlays.default ]; environment.systemPackages = [ emacs - (pkgs.aspellWithDicts (dicts: with dicts; [ pt_BR en en-computers ])) ] ++ outside-emacs; fonts.packages = with pkgs; [ - emacs-all-the-icons-fonts (nerdfonts.override { fonts = ["Iosevka"]; }) ]; }; |