Wrap emacs settings in a mkMerge.
This commit is contained in:
parent
8e22d8febb
commit
e00331bf94
@ -39,43 +39,48 @@ let
|
|||||||
e_shorthand = pkgs.writeShellScriptBin "e" ''
|
e_shorthand = pkgs.writeShellScriptBin "e" ''
|
||||||
exec ${pkgs.emacs29-pgtk}/bin/emacs "''${@}"
|
exec ${pkgs.emacs29-pgtk}/bin/emacs "''${@}"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [ ];
|
imports = [ ];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
config = lib.mkMerge [
|
||||||
plainmacs
|
|
||||||
e_shorthand
|
|
||||||
emacs29-pgtk
|
|
||||||
clang # To compile tree-sitter grammars
|
|
||||||
nixd # nix language server
|
|
||||||
nixfmt-rfc-style # auto-formatting nix files through nixd
|
|
||||||
];
|
|
||||||
|
|
||||||
home-manager.users.talexander =
|
|
||||||
{ pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
home.file.".config/emacs" = {
|
environment.systemPackages = with pkgs; [
|
||||||
source = ./files/emacs;
|
plainmacs
|
||||||
recursive = true;
|
e_shorthand
|
||||||
|
emacs29-pgtk
|
||||||
|
clang # To compile tree-sitter grammars
|
||||||
|
nixd # nix language server
|
||||||
|
nixfmt-rfc-style # auto-formatting nix files through nixd
|
||||||
|
];
|
||||||
|
|
||||||
|
home-manager.users.talexander =
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
home.file.".config/emacs" = {
|
||||||
|
source = ./files/emacs;
|
||||||
|
recursive = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
|
||||||
|
hideMounts = true;
|
||||||
|
users.talexander = {
|
||||||
|
directories = [
|
||||||
|
".config/emacs/eln-cache" # Installed packages
|
||||||
|
".config/emacs/elpa" # Installed packages
|
||||||
|
".config/emacs/private" # For recentf
|
||||||
|
".config/emacs/tree-sitter" # Compiled tree-sitter grammars
|
||||||
|
];
|
||||||
|
files = [
|
||||||
|
".config/emacs/history" # For savehist
|
||||||
|
".config/emacs/.last-package-update-day" # For use-package
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
|
environment.variables.EDITOR = "${plainmacs}/bin/plainmacs";
|
||||||
hideMounts = true;
|
}
|
||||||
users.talexander = {
|
];
|
||||||
directories = [
|
|
||||||
".config/emacs/eln-cache" # Installed packages
|
|
||||||
".config/emacs/elpa" # Installed packages
|
|
||||||
".config/emacs/private" # For recentf
|
|
||||||
".config/emacs/tree-sitter" # Compiled tree-sitter grammars
|
|
||||||
];
|
|
||||||
files = [
|
|
||||||
".config/emacs/history" # For savehist
|
|
||||||
".config/emacs/.last-package-update-day" # For use-package
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.variables.EDITOR = "${plainmacs}/bin/plainmacs";
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user