Regenerated
This commit is contained in:
+11
-17
@@ -516,12 +516,11 @@ This sets up the zsh in the terminal
|
||||
** =generated/modules/traveldroid/apps/emacs/emacs.nix=
|
||||
This installs emacs
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/emacs/emacs.nix :noweb tangle :mkdirp yes :eval never-html
|
||||
{ lib, config, pkgs, flakeRoot, home-manager, ... }:
|
||||
{ lib, pkgs, flakeRoot, home-manager, config, ... }:
|
||||
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
|
||||
# Emacs package with tree sitter enabled
|
||||
emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
|
||||
|
||||
emacsExtraPackages = epkgs: [
|
||||
@@ -566,36 +565,31 @@ let
|
||||
epkgs.sideline-eglot
|
||||
];
|
||||
|
||||
# Paths to Emacs config files
|
||||
# Emacs config files
|
||||
earlyInitFile = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
|
||||
initFile = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
|
||||
|
||||
in
|
||||
{
|
||||
#################################
|
||||
# System-level Emacs (optional, if you want it available globally)
|
||||
#################################
|
||||
programs.emacs = {
|
||||
enable = true;
|
||||
package = emacsPkg;
|
||||
extraPackages = emacsExtraPackages;
|
||||
};
|
||||
|
||||
#################################
|
||||
# Home Manager user-specific configuration
|
||||
#################################
|
||||
_module.args.hmUsers = {
|
||||
${username} = {
|
||||
home.packages = [ emacsPkg ];
|
||||
|
||||
home.sessionVariables = {
|
||||
EDITOR = "emacs";
|
||||
XDG_SCREENSHOTS_DIR = "~/screenshots";
|
||||
};
|
||||
|
||||
programs.emacs = {
|
||||
enable = true;
|
||||
package = emacsPkg;
|
||||
extraPackages = emacsExtraPackages;
|
||||
};
|
||||
|
||||
home.file = {
|
||||
".emacs.d/early-init.el" = { source = earlyInitFile; };
|
||||
".emacs.d/init.el" = { source = initFile; };
|
||||
};
|
||||
|
||||
home.packages = [ emacsPkg ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
{ lib, config, pkgs, flakeRoot, home-manager, ... }:
|
||||
{ lib, pkgs, flakeRoot, home-manager, config, ... }:
|
||||
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
|
||||
# Emacs package with tree sitter enabled
|
||||
emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
|
||||
|
||||
emacsExtraPackages = epkgs: [
|
||||
@@ -48,36 +47,31 @@ let
|
||||
epkgs.sideline-eglot
|
||||
];
|
||||
|
||||
# Paths to Emacs config files
|
||||
# Emacs config files
|
||||
earlyInitFile = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
|
||||
initFile = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
|
||||
|
||||
in
|
||||
{
|
||||
#################################
|
||||
# System-level Emacs (optional, if you want it available globally)
|
||||
#################################
|
||||
programs.emacs = {
|
||||
enable = true;
|
||||
package = emacsPkg;
|
||||
extraPackages = emacsExtraPackages;
|
||||
};
|
||||
|
||||
#################################
|
||||
# Home Manager user-specific configuration
|
||||
#################################
|
||||
_module.args.hmUsers = {
|
||||
${username} = {
|
||||
home.packages = [ emacsPkg ];
|
||||
|
||||
home.sessionVariables = {
|
||||
EDITOR = "emacs";
|
||||
XDG_SCREENSHOTS_DIR = "~/screenshots";
|
||||
};
|
||||
|
||||
programs.emacs = {
|
||||
enable = true;
|
||||
package = emacsPkg;
|
||||
extraPackages = emacsExtraPackages;
|
||||
};
|
||||
|
||||
home.file = {
|
||||
".emacs.d/early-init.el" = { source = earlyInitFile; };
|
||||
".emacs.d/init.el" = { source = initFile; };
|
||||
};
|
||||
|
||||
home.packages = [ emacsPkg ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user