diff options
Diffstat (limited to '')
| -rw-r--r-- | nix/users/fcuny/emacs.nix | 82 |
1 files changed, 38 insertions, 44 deletions
diff --git a/nix/users/fcuny/emacs.nix b/nix/users/fcuny/emacs.nix index f7f83d6..9b7bbe8 100644 --- a/nix/users/fcuny/emacs.nix +++ b/nix/users/fcuny/emacs.nix @@ -1,50 +1,43 @@ { pkgs, ... }: let - myEmacs = pkgs.emacsWithPackagesFromUsePackage { - # TODO: https://github.com/NixOS/nixpkgs/issues/395169 - package = pkgs.emacs.override { withNativeCompilation = false; }; - config = ./configs/emacs/init.el; - defaultInitFile = true; - extraEmacsPackages = - epkgs: with epkgs; [ - # completion - cape - consult - corfu - marginalia - orderless - vertico + packages = + epkgs: with epkgs; [ + # completion + cape + consult + corfu + marginalia + orderless + vertico - # development - git-link - direnv - docker - docker-compose-mode - dockerfile-mode - go-mode - gotest - hcl-mode - jq-mode - json-mode - json-reformat - magit - nix-mode - protobuf-mode - terraform-mode - toml-mode - tree-sitter - tree-sitter-langs - treesit-grammars.with-all-grammars - yaml-mode + # development + git-link + direnv + docker + docker-compose-mode + dockerfile-mode + go-mode + gotest + hcl-mode + jq-mode + json-mode + json-reformat + magit + nix-mode + protobuf-mode + terraform-mode + toml-mode + tree-sitter + tree-sitter-langs + treesit-grammars.with-all-grammars + yaml-mode - # misc - ef-themes - exec-path-from-shell - rg - yasnippet - yasnippet-capf - ]; - }; + # misc + exec-path-from-shell + rg + yasnippet + yasnippet-capf + ]; in { home.file.".config/emacs/early-init.el".source = ./configs/emacs/early-init.el; @@ -52,7 +45,8 @@ in programs.emacs = { enable = true; - package = myEmacs; + extraPackages = packages; + package = pkgs.emacs.override { withNativeCompilation = false; }; }; home.packages = with pkgs; [ |