From 7fcfd9b565a470ccd43cd826d650931d660777fe Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 4 Apr 2021 18:39:44 +0200 Subject: [PATCH] home-manager: format `home-manager/default.nix` --- format | 1 - home-manager/default.nix | 60 ++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 34 deletions(-) diff --git a/format b/format index 9159a7049..d98660f45 100755 --- a/format +++ b/format @@ -18,7 +18,6 @@ esac find . -name '*.nix' \ ! -path ./modules/programs/irssi.nix \ \ - ! -path ./home-manager/default.nix \ ! -path ./home-manager/home-manager.nix \ ! -path ./modules/default.nix \ ! -path ./modules/files.nix \ diff --git a/home-manager/default.nix b/home-manager/default.nix index 68bfeb466..4af2be2e4 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -1,42 +1,36 @@ { runCommand, lib, bash, coreutils, findutils, gnused, less - # Extra path to Home Manager. If set then this path will be tried - # before `$HOME/.config/nixpkgs/home-manager` and - # `$HOME/.nixpkgs/home-manager`. -, path ? null -}: +# Extra path to Home Manager. If set then this path will be tried +# before `$HOME/.config/nixpkgs/home-manager` and +# `$HOME/.nixpkgs/home-manager`. +, path ? null }: let pathStr = if path == null then "" else path; -in +in runCommand "home-manager" { + preferLocalBuild = true; + allowSubstitutes = false; + meta = with lib; { + description = "A user environment configurator"; + maintainers = [ maintainers.rycee ]; + platforms = platforms.unix; + license = licenses.mit; + }; +} '' + install -v -D -m755 ${./home-manager} $out/bin/home-manager -runCommand - "home-manager" - { - preferLocalBuild = true; - allowSubstitutes = false; - meta = with lib; { - description = "A user environment configurator"; - maintainers = [ maintainers.rycee ]; - platforms = platforms.unix; - license = licenses.mit; - }; - } - '' - install -v -D -m755 ${./home-manager} $out/bin/home-manager + substituteInPlace $out/bin/home-manager \ + --subst-var-by bash "${bash}" \ + --subst-var-by coreutils "${coreutils}" \ + --subst-var-by findutils "${findutils}" \ + --subst-var-by gnused "${gnused}" \ + --subst-var-by less "${less}" \ + --subst-var-by HOME_MANAGER_PATH '${pathStr}' - substituteInPlace $out/bin/home-manager \ - --subst-var-by bash "${bash}" \ - --subst-var-by coreutils "${coreutils}" \ - --subst-var-by findutils "${findutils}" \ - --subst-var-by gnused "${gnused}" \ - --subst-var-by less "${less}" \ - --subst-var-by HOME_MANAGER_PATH '${pathStr}' - - install -D -m755 ${./completion.bash} \ - $out/share/bash-completion/completions/home-manager - install -D -m755 ${./completion.zsh} \ - $out/share/zsh/site-functions/_home-manager - '' + install -D -m755 ${./completion.bash} \ + $out/share/bash-completion/completions/home-manager + install -D -m755 ${./completion.zsh} \ + $out/share/zsh/site-functions/_home-manager +''