users/infinidoge(refactor): nest more definitions

This commit is contained in:
Infinidoge 2021-11-10 09:51:16 -05:00
parent ecce13882d
commit 81d78c0168

View file

@ -27,13 +27,11 @@ in
]) ])
]; ];
programs.git = {
userEmail = "infinidoge@doge-inc.net";
userName = "Infinidoge";
};
programs = { programs = {
git = {
userEmail = "infinidoge@doge-inc.net";
userName = "Infinidoge";
};
firefox = { firefox = {
enable = true; enable = true;
}; };
@ -78,20 +76,20 @@ in
shellAliases = { shellAliases = {
lsdisk = "lsblk -o name,size,mountpoint,fstype,label,uuid,fsavail,fsuse%"; lsdisk = "lsblk -o name,size,mountpoint,fstype,label,uuid,fsavail,fsuse%";
}; };
};
environment.variables.EDITOR = variables.EDITOR =
let let
editorScript = pkgs.writeScriptBin "emacseditor" '' editorScript = pkgs.writeScriptBin "emacseditor" ''
#!${pkgs.runtimeShell} #!${pkgs.runtimeShell}
if [ -z "$1" ]; then if [ -z "$1" ]; then
exec ${pkgs.emacs}/bin/emacsclient --create-frame --alternate-editor ${pkgs.emacs}/bin/emacs exec ${pkgs.emacs}/bin/emacsclient --create-frame --alternate-editor ${pkgs.emacs}/bin/emacs
else else
exec ${pkgs.emacs}/bin/emacsclient --alternate-editor ${pkgs.emacs}/bin/emacs "$@" exec ${pkgs.emacs}/bin/emacsclient --alternate-editor ${pkgs.emacs}/bin/emacs "$@"
fi fi
''; '';
in in
(lib.mkOverride 900 "${editorScript}/bin/emacseditor"); (lib.mkOverride 900 "${editorScript}/bin/emacseditor");
};
programs = { programs = {
dconf.enable = true; dconf.enable = true;