From 81d78c0168a29d80203c93b281c2b325754c7e98 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Wed, 10 Nov 2021 09:51:16 -0500 Subject: [PATCH] users/infinidoge(refactor): nest more definitions --- users/infinidoge/default.nix | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix index 721d116..5a5ee10 100644 --- a/users/infinidoge/default.nix +++ b/users/infinidoge/default.nix @@ -27,13 +27,11 @@ in ]) ]; - - programs.git = { - userEmail = "infinidoge@doge-inc.net"; - userName = "Infinidoge"; - }; - programs = { + git = { + userEmail = "infinidoge@doge-inc.net"; + userName = "Infinidoge"; + }; firefox = { enable = true; }; @@ -78,20 +76,20 @@ in shellAliases = { lsdisk = "lsblk -o name,size,mountpoint,fstype,label,uuid,fsavail,fsuse%"; }; - }; - environment.variables.EDITOR = - let - editorScript = pkgs.writeScriptBin "emacseditor" '' - #!${pkgs.runtimeShell} - if [ -z "$1" ]; then - 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"); + variables.EDITOR = + let + editorScript = pkgs.writeScriptBin "emacseditor" '' + #!${pkgs.runtimeShell} + if [ -z "$1" ]; then + 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;