From 410a63cf1baf627a0b99c34a955b3d02efabb48f Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 14 Sep 2022 16:06:00 +0200 Subject: ... --- flake.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index e7557b2d..defcd864 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,6 @@ repo = "home-manager"; ref = "master"; inputs = { - flake-compat.follows = "flake-compat"; nixpkgs.follows = "nixpkgs"; }; }; @@ -78,11 +77,11 @@ inherit (lib) nixosSystem mkIf splitString filterAttrs listToAttrs mapAttrsToList nameValuePair concatMap composeManyExtensions mapAttrs mapAttrs' recursiveUpdate genAttrs unique elem optionalAttrs isDerivation concatLists concatStringsSep fix filter makeOverridable foldr; inherit (lib.strings) escapeNixString; - accountUserName = accountName: + accountUserName = accountName: let accountName' = splitString "@" accountName; in elemAt accountName' 0; - accountHostName = accountName: + accountHostName = accountName: let accountName' = splitString "@" accountName; in elemAt accountName' 1; @@ -132,7 +131,7 @@ (outputs: { _file = dir + "/${path}"; } // outputs // { imports = defaultUserProfiles userName ++ (outputs.imports or []); }); - + mkUserProfile = userName: dir: path: profileName: let profileModule = overrideModule (import (dir + "/${path}")) -- cgit v1.2.3