henrov/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Regenerated

Browse Source
This commit is contained in:
Henro Veijer
2026-03-25 12:13:40 +00:00
parent b602876a9e
commit d3d61d7157
2 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+11 -17
View File
@@ -516,12 +516,11 @@ This sets up the zsh in the terminal
** =generated/modules/traveldroid/apps/emacs/emacs.nix= ** =generated/modules/traveldroid/apps/emacs/emacs.nix=
This installs emacs This installs emacs
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/emacs/emacs.nix :noweb tangle :mkdirp yes :eval never-html #+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 let
username = config.defaultUser or "henrov"; username = config.defaultUser or "henrov";
# Emacs package with tree sitter enabled
emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; }; emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
emacsExtraPackages = epkgs: [ emacsExtraPackages = epkgs: [
@@ -566,36 +565,31 @@ let
epkgs.sideline-eglot epkgs.sideline-eglot
]; ];
# Paths to Emacs config files # Emacs config files
earlyInitFile = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el"; earlyInitFile = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
initFile = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el"; initFile = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
in 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 = { _module.args.hmUsers = {
${username} = { ${username} = {
home.packages = [ emacsPkg ];
home.sessionVariables = { home.sessionVariables = {
EDITOR = "emacs"; EDITOR = "emacs";
XDG_SCREENSHOTS_DIR = "~/screenshots"; XDG_SCREENSHOTS_DIR = "~/screenshots";
}; };
programs.emacs = {
enable = true;
package = emacsPkg;
extraPackages = emacsExtraPackages;
};
home.file = { home.file = {
".emacs.d/early-init.el" = { source = earlyInitFile; }; ".emacs.d/early-init.el" = { source = earlyInitFile; };
".emacs.d/init.el" = { source = initFile; }; ".emacs.d/init.el" = { source = initFile; };
}; };
home.packages = [ emacsPkg ];
}; };
}; };
} }
Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
+11 -17
View File
@@ -1,9 +1,8 @@
{ lib, config, pkgs, flakeRoot, home-manager, ... }: { lib, pkgs, flakeRoot, home-manager, config, ... }:
let let
username = config.defaultUser or "henrov"; username = config.defaultUser or "henrov";
# Emacs package with tree sitter enabled
emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; }; emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
emacsExtraPackages = epkgs: [ emacsExtraPackages = epkgs: [
@@ -48,36 +47,31 @@ let
epkgs.sideline-eglot epkgs.sideline-eglot
]; ];
# Paths to Emacs config files # Emacs config files
earlyInitFile = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el"; earlyInitFile = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
initFile = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el"; initFile = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
in 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 = { _module.args.hmUsers = {
${username} = { ${username} = {
home.packages = [ emacsPkg ];
home.sessionVariables = { home.sessionVariables = {
EDITOR = "emacs"; EDITOR = "emacs";
XDG_SCREENSHOTS_DIR = "~/screenshots"; XDG_SCREENSHOTS_DIR = "~/screenshots";
}; };
programs.emacs = {
enable = true;
package = emacsPkg;
extraPackages = emacsExtraPackages;
};
home.file = { home.file = {
".emacs.d/early-init.el" = { source = earlyInitFile; }; ".emacs.d/early-init.el" = { source = earlyInitFile; };
".emacs.d/init.el" = { source = initFile; }; ".emacs.d/init.el" = { source = initFile; };
}; };
home.packages = [ emacsPkg ];
}; };
}; };
} }