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:12:53 +00:00
parent eeab8daf9a
commit b602876a9e
2 changed files with 48 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+24 -17
View File
@@ -516,9 +516,14 @@ 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
{ config, pkgs, lib, flakeRoot, ... }: { lib, config, pkgs, flakeRoot, home-manager, ... }:
let let
username = config.defaultUser or "henrov";
# Emacs package with tree sitter enabled
emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
emacsExtraPackages = epkgs: [ emacsExtraPackages = epkgs: [
epkgs.manualPackages.treesit-grammars.with-all-grammars epkgs.manualPackages.treesit-grammars.with-all-grammars
epkgs.nerd-icons epkgs.nerd-icons
@@ -560,35 +565,37 @@ let
epkgs.sideline-flymake epkgs.sideline-flymake
epkgs.sideline-eglot epkgs.sideline-eglot
]; ];
# Paths to Emacs config files
earlyInitFile = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
initFile = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
in in
{ {
################################# #################################
# System-level Emacs # System-level Emacs (optional, if you want it available globally)
################################# #################################
programs.emacs = { programs.emacs = {
enable = true; enable = true;
package = pkgs.emacs-pgtk.override { withTreeSitter = true; }; package = emacsPkg;
extraPackages = emacsExtraPackages; extraPackages = emacsExtraPackages;
}; };
################################# #################################
# Home Manager-level configuration # Home Manager user-specific configuration
# Only define if Home Manager is active
################################# #################################
home-manager.useGlobalPkgs = lib.optionalBool (config.home-manager != null) true; _module.args.hmUsers = {
home-manager.useUserPackages = lib.optionalBool (config.home-manager != null) true; ${username} = {
home.sessionVariables = {
EDITOR = "emacs";
XDG_SCREENSHOTS_DIR = "~/screenshots";
};
home.sessionVariables = lib.optionalAttrs (config.home-manager != null) { home.file = {
EDITOR = "emacs"; ".emacs.d/early-init.el" = { source = earlyInitFile; };
XDG_SCREENSHOTS_DIR = "~/screenshots"; ".emacs.d/init.el" = { source = initFile; };
}; };
home.file = lib.optionalAttrs (config.home-manager != null) { home.packages = [ emacsPkg ];
".emacs.d/early-init.el" = {
source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
};
".emacs.d/init.el" = {
source = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
}; };
}; };
} }
Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
+24 -17
View File
@@ -1,6 +1,11 @@
{ config, pkgs, lib, flakeRoot, ... }: { lib, config, pkgs, flakeRoot, home-manager, ... }:
let let
username = config.defaultUser or "henrov";
# Emacs package with tree sitter enabled
emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
emacsExtraPackages = epkgs: [ emacsExtraPackages = epkgs: [
epkgs.manualPackages.treesit-grammars.with-all-grammars epkgs.manualPackages.treesit-grammars.with-all-grammars
epkgs.nerd-icons epkgs.nerd-icons
@@ -42,35 +47,37 @@ let
epkgs.sideline-flymake epkgs.sideline-flymake
epkgs.sideline-eglot epkgs.sideline-eglot
]; ];
# Paths to Emacs config files
earlyInitFile = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
initFile = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
in in
{ {
################################# #################################
# System-level Emacs # System-level Emacs (optional, if you want it available globally)
################################# #################################
programs.emacs = { programs.emacs = {
enable = true; enable = true;
package = pkgs.emacs-pgtk.override { withTreeSitter = true; }; package = emacsPkg;
extraPackages = emacsExtraPackages; extraPackages = emacsExtraPackages;
}; };
################################# #################################
# Home Manager-level configuration # Home Manager user-specific configuration
# Only define if Home Manager is active
################################# #################################
home-manager.useGlobalPkgs = lib.optionalBool (config.home-manager != null) true; _module.args.hmUsers = {
home-manager.useUserPackages = lib.optionalBool (config.home-manager != null) true; ${username} = {
home.sessionVariables = {
EDITOR = "emacs";
XDG_SCREENSHOTS_DIR = "~/screenshots";
};
home.sessionVariables = lib.optionalAttrs (config.home-manager != null) { home.file = {
EDITOR = "emacs"; ".emacs.d/early-init.el" = { source = earlyInitFile; };
XDG_SCREENSHOTS_DIR = "~/screenshots"; ".emacs.d/init.el" = { source = initFile; };
}; };
home.file = lib.optionalAttrs (config.home-manager != null) { home.packages = [ emacsPkg ];
".emacs.d/early-init.el" = {
source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
};
".emacs.d/init.el" = {
source = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el";
}; };
}; };
} }