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:09:56 +00:00
parent 4da7454490
commit e78c0cdb24
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+7 -8
View File
@@ -516,10 +516,9 @@ 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, flakeRoot, ... }: { config, pkgs, lib, flakeRoot, ... }:
let let
# convenience for extra Emacs packages
emacsExtraPackages = epkgs: [ emacsExtraPackages = epkgs: [
epkgs.manualPackages.treesit-grammars.with-all-grammars epkgs.manualPackages.treesit-grammars.with-all-grammars
epkgs.nerd-icons epkgs.nerd-icons
@@ -573,18 +572,18 @@ in
}; };
############################ ############################
# Home Manager integration # Home Manager configuration
# Only evaluated if imported via home-manager.nixosModules.home-manager # Only define if home-manager is active
############################ ############################
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = lib.optionalBool (config.home-manager != null) true;
home-manager.useUserPackages = true; home-manager.useUserPackages = lib.optionalBool (config.home-manager != null) true;
home.sessionVariables = { home.sessionVariables = lib.optionalAttrs (config.home-manager != null) {
EDITOR = "emacs"; EDITOR = "emacs";
XDG_SCREENSHOTS_DIR = "~/screenshots"; XDG_SCREENSHOTS_DIR = "~/screenshots";
}; };
home.file = { home.file = lib.optionalAttrs (config.home-manager != null) {
".emacs.d/early-init.el" = { ".emacs.d/early-init.el" = {
source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el"; source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
}; };
Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix
+7 -8
View File
@@ -1,7 +1,6 @@
{ config, pkgs, flakeRoot, ... }: { config, pkgs, lib, flakeRoot, ... }:
let let
# convenience for extra Emacs packages
emacsExtraPackages = epkgs: [ emacsExtraPackages = epkgs: [
epkgs.manualPackages.treesit-grammars.with-all-grammars epkgs.manualPackages.treesit-grammars.with-all-grammars
epkgs.nerd-icons epkgs.nerd-icons
@@ -55,18 +54,18 @@ in
}; };
############################ ############################
# Home Manager integration # Home Manager configuration
# Only evaluated if imported via home-manager.nixosModules.home-manager # Only define if home-manager is active
############################ ############################
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = lib.optionalBool (config.home-manager != null) true;
home-manager.useUserPackages = true; home-manager.useUserPackages = lib.optionalBool (config.home-manager != null) true;
home.sessionVariables = { home.sessionVariables = lib.optionalAttrs (config.home-manager != null) {
EDITOR = "emacs"; EDITOR = "emacs";
XDG_SCREENSHOTS_DIR = "~/screenshots"; XDG_SCREENSHOTS_DIR = "~/screenshots";
}; };
home.file = { home.file = lib.optionalAttrs (config.home-manager != null) {
".emacs.d/early-init.el" = { ".emacs.d/early-init.el" = {
source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el"; source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el";
}; };