Merge branch 'flakes-template' into flakes

5 files changed, 14 insertions, 14 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 676c12a3..440efa4e 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -55,7 +55,7 @@ in {
   home-manager.users.${userName} = {
     programs = {
       ssh = {
-        matchBlocks = import ./ssh-hosts.nix; # customUtils.recImport { dir = ./ssh-hosts; };
+        matchBlocks = import ./ssh-hosts.nix; # customUtils.nixImport { dir = ./ssh-hosts; };
         extraConfig = ''
           Match host uniworx3.ifi.lmu.de,uniworx4.ifi.lmu.de,uniworx5.ifi.lmu.de,uni2workgw.ifi.lmu.de,blackbeard.tcs.ifi.lmu.de,gitlab2.rz.ifi.lmu.de,oregon.tcs.ifi.lmu.de !exec "nc -z -w 1 %h %p &>/dev/null"
             ProxyJump remote.cip.ifi.lmu.de
@@ -125,7 +125,7 @@ in {
               ${pkgs.systemd}/bin/systemctl --user try-restart trayer xmobar
             '';
         };
-        profiles = customUtils.recImport { dir = ./autorandr-profiles; };
+        profiles = customUtils.nixImport { dir = ./autorandr-profiles; };
       };
 
       zsh.initExtra = "source ${./zshrc}";
diff --git a/flake.nix b/flake.nix
index ea3d0747..d8684703 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,7 +29,7 @@
       inherit (builtins) attrNames attrValues elemAt toJSON isNull pathExists;
       inherit (nixpkgs) lib;
       utils = import ./utils { inherit lib; };
-      inherit (utils) recImport overrideModule;
+      inherit (utils) nixImport overrideModule;
       inherit (lib) nixosSystem mkIf splitString filterAttrs listToAttrs mapAttrsToList nameValuePair concatMap composeManyExtensions mapAttrs mapAttrs' recursiveUpdate genAttrs unique elem optionalAttrs;
 
       accountUserName = accountName: 
@@ -109,7 +109,7 @@
 
       activateNixosConfigurations = forAllSystems (system: _pkgs: mapAttrs' (hostName: nixosConfig: nameValuePair "${hostName}-activate" { type = "app"; program = "${nixosConfig.config.system.build.toplevel}/bin/switch-to-configuration"; }) self.nixosConfigurations);
 
-      overlayPaths = recImport rec { dir = ./overlays; _import = (path: _name: dir + "/${path}"); } // { pkgs = ./pkgs; };
+      overlayPaths = nixImport rec { dir = ./overlays; _import = (path: _name: dir + "/${path}"); } // { pkgs = ./pkgs; };
 
       installerProfiles = system:
         let nixpkgs-path = nixpkgs.legacyPackages.${system}.path;
@@ -126,16 +126,16 @@
     in
       {
         nixosModules =
-          let modulesAttrs = recImport { dir = ./modules; };
-              systemProfiles = recImport rec { dir = ./system-profiles; _import = mkSystemProfile dir; };
-              users = recImport rec { dir = ./users; _import = mkUserModule dir; };
-              userProfiles = forAllUsers (userName: recImport rec { dir = ./user-profiles; _import = mkUserProfile userName dir; });
-              accounts = recursiveUpdate rootAccounts (recImport rec { dir = ./accounts; _import = mkAccountModule dir; });
+          let modulesAttrs = nixImport { dir = ./modules; };
+              systemProfiles = nixImport rec { dir = ./system-profiles; _import = mkSystemProfile dir; };
+              users = nixImport rec { dir = ./users; _import = mkUserModule dir; };
+              userProfiles = forAllUsers (userName: nixImport rec { dir = ./user-profiles; _import = mkUserProfile userName dir; });
+              accounts = recursiveUpdate rootAccounts (nixImport rec { dir = ./accounts; _import = mkAccountModule dir; });
               rootAccounts = mapAttrs' (hostName: _value: nameValuePair "root@${hostName}" ({...}: { imports = [ self.nixosModules.users.root or ({...}: { imports = defaultUserProfiles "root"; }) ]; })) self.nixosConfigurations;
           in modulesAttrs // { inherit systemProfiles users userProfiles accounts; };
-        nixosConfigurations = optionalAttrs (!(isNull installerConfig)) { installer = installerConfig; } // recImport rec { dir = ./hosts; _import = mkNixosConfiguration [] dir; };
+        nixosConfigurations = optionalAttrs (!(isNull installerConfig)) { installer = installerConfig; } // nixImport rec { dir = ./hosts; _import = mkNixosConfiguration [] dir; };
 
-        homeManagerModules = recImport rec { dir = ./home-modules; };
+        homeManagerModules = nixImport rec { dir = ./home-modules; };
 
         overlay = import overlayPaths.pkgs;
         overlays = mapAttrs (_name: path: import path) overlayPaths;
diff --git a/modules/yggdrasil/default.nix b/modules/yggdrasil/default.nix
index 3d59051c..f4100e73 100644
--- a/modules/yggdrasil/default.nix
+++ b/modules/yggdrasil/default.nix
@@ -24,7 +24,7 @@ in {
   config = lib.mkIf cfg.enable {
     services.tinc.networks.yggdrasil = {
       name = config.networking.hostName;
-      hostSettings = customUtils.recImport { dir = ./hosts; };
+      hostSettings = customUtils.nixImport { dir = ./hosts; };
       debugLevel = 2;
       interfaceType = "tap";
       settings = {
diff --git a/system-profiles/openssh/default.nix b/system-profiles/openssh/default.nix
index ee7d8868..33a3e136 100644
--- a/system-profiles/openssh/default.nix
+++ b/system-profiles/openssh/default.nix
@@ -1,7 +1,7 @@
 { customUtils, lib, config, hostName, pkgs, ... }:
 {
   config = {
-    programs.ssh.knownHosts = lib.zipAttrsWith (_name: values: builtins.head values) (lib.mapAttrsToList (name: lib.mapAttrs' (type: value: lib.nameValuePair "${name}-${type}" value)) (customUtils.recImport { dir = ./known-hosts; }));
+    programs.ssh.knownHosts = lib.zipAttrsWith (_name: values: builtins.head values) (lib.mapAttrsToList (name: lib.mapAttrs' (type: value: lib.nameValuePair "${name}-${type}" value)) (customUtils.nixImport { dir = ./known-hosts; }));
 
     systemd.user.services."ssh-agent".enable = lib.mkForce false; # ssh-agent should be done via home-manager
 
diff --git a/utils/default.nix b/utils/default.nix
index d00357af..48add212 100644
--- a/utils/default.nix
+++ b/utils/default.nix
@@ -3,7 +3,7 @@ rec {
   inherit (builtins) readDir;
   inherit (lib) filterAttrs hasSuffix removeSuffix mapAttrs' nameValuePair isFunction functionArgs setFunctionArgs id;
   mapFilterAttrs = seive: f: attrs: filterAttrs seive (mapAttrs' f attrs);
-  recImport = { dir, _import ? name: _base: import "${toString dir}/${name}" }:
+  nixImport = { dir, _import ? name: _base: import "${toString dir}/${name}" }:
     mapFilterAttrs
       (_: v: v != null)
       (n: v: