From efb5256d280429bd0536342928c01ae718b91119 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 28 Oct 2017 23:01:42 +0200 Subject: home-manager: use XDG configuration directory --- home-manager/home-manager | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'home-manager/home-manager') diff --git a/home-manager/home-manager b/home-manager/home-manager index 1a5676e5079..d3ef4dfcbb0 100644 --- a/home-manager/home-manager +++ b/home-manager/home-manager @@ -26,8 +26,9 @@ function setConfigFile() { return fi + local defaultConfFile="${XDG_CONFIG_HOME:-$HOME/.config}/nixpkgs/home.nix" local confFile - for confFile in "$HOME/.config/nixpkgs/home.nix" \ + for confFile in "$defaultConfFile" \ "$HOME/.nixpkgs/home.nix" ; do if [[ -e "$confFile" ]] ; then HOME_MANAGER_CONFIG="$confFile" @@ -36,14 +37,14 @@ function setConfigFile() { done errorEcho "No configuration file found." \ - "Please create one at ~/.config/nixpkgs/home.nix" + "Please create one at $defaultConfFile" exit 1 } function setHomeManagerNixPath() { local path for path in "@HOME_MANAGER_PATH@" \ - "$HOME/.config/nixpkgs/home-manager" \ + "${XDG_CONFIG_HOME:-$HOME/.config}/nixpkgs/home-manager" \ "$HOME/.nixpkgs/home-manager" ; do if [[ -e "$path" || "$path" =~ ^https?:// ]] ; then export NIX_PATH="$NIX_PATH${NIX_PATH:+:}home-manager=$path" -- cgit v1.2.3