refactor(infinidoge): move common elements to core/global

This commit is contained in:
Infinidoge 2022-04-14 09:57:36 -04:00
parent 8b18fc1013
commit 6997ef919f
2 changed files with 20 additions and 26 deletions

View file

@ -20,8 +20,14 @@ with lib.hlissner;
cleanTmpDir = mkDefault (!config.boot.tmpOnTmpfs); cleanTmpDir = mkDefault (!config.boot.tmpOnTmpfs);
}; };
# Allow non-root users to allow other users to access mount point
programs.fuse.userAllowOther = mkDefault true; programs = {
# Allow non-root users to allow other users to access mount point
fuse.userAllowOther = mkDefault true;
# Enable dconf for programs that need it
dconf.enable = true;
};
services = { services = {
# Ensure certain necessary directories always exist # Ensure certain necessary directories always exist

View file

@ -63,30 +63,18 @@ in
]; ];
}; };
environment = { environment.variables.EDITOR =
systemPackages = with pkgs; [ let
ffmpeg editorScript = pkgs.writeScriptBin "emacseditor" ''
]; #!${pkgs.runtimeShell}
if [ -z "$1" ]; then
shellAliases = { }; exec ${pkgs.emacs}/bin/emacsclient --create-frame --alternate-editor ${pkgs.emacs}/bin/emacs
else
variables.EDITOR = exec ${pkgs.emacs}/bin/emacsclient --alternate-editor ${pkgs.emacs}/bin/emacs "$@"
let fi
editorScript = pkgs.writeScriptBin "emacseditor" '' '';
#!${pkgs.runtimeShell} in
if [ -z "$1" ]; then (lib.mkOverride 900 "${editorScript}/bin/emacseditor");
exec ${pkgs.emacs}/bin/emacsclient --create-frame --alternate-editor ${pkgs.emacs}/bin/emacs
else
exec ${pkgs.emacs}/bin/emacsclient --alternate-editor ${pkgs.emacs}/bin/emacs "$@"
fi
'';
in
(lib.mkOverride 900 "${editorScript}/bin/emacseditor");
};
programs = {
dconf.enable = true;
};
modules = { modules = {
locale.fonts = { locale.fonts = {