refactor: rename utils to lib'

deploy/colmena.nix

@@ -5,20 +5,20 @@
 
 let
   inherit (inputs.nixpkgs) lib;
-  utils = import ../utils { inherit lib; };
+  lib' = import ../lib { inherit lib; };
   # exclude hosts that need auto rollback (until `colmena` supports it) for
   # now, we use `deploy-rs` (which has magic rollback) for those (also see ./deploy-rs.nix)
   #
   # see <https://github.com/nix-community/colmena/issues/38>
   #     <https://github.com/nix-community/colmena/issues/344>
   hostnames = lib.filter (
-    hostname: !((utils.hostMeta ../hosts/${hostname}).deploy.autoRollback or false)
-  ) (utils.dirNames ../hosts);
+    hostname: !((lib'.hostMeta hostname).deploy.autoRollback or false)
+  ) lib'.nixosHosts;
 
   mkNode =
     hostname:
     let
-      meta = utils.hostMeta ../hosts/${hostname};
+      meta = lib'.hostMeta hostname;
       isArm = meta.system == "aarch64-linux";
     in
     {
@@ -40,13 +40,9 @@ inputs.colmena.lib.makeHive (
     meta = {
       nixpkgs = import inputs.nixpkgs { localSystem = "x86_64-linux"; };
       specialArgs = {
-        inherit inputs;
+        inherit inputs lib';
         outputs = self;
-        myUtils = utils;
-        paths = {
-          dots = ../dots;
-          hosts = ../hosts;
-        };
+        dotsPath = ../dots;
       };
     };
   }

deploy/deploy-rs.nix

@@ -5,18 +5,18 @@
 
 let
   inherit (inputs.nixpkgs) lib;
-  utils = import ../utils { inherit lib; };
+  lib' = import ../lib { inherit lib; };
 
   # only include hosts that need auto rollback (until `colmena` supports it)
   # `colmena` is used for other hosts (see ./colmena.nix)
   hostnames = lib.filter (
-    hostname: (utils.hostMeta ../hosts/${hostname}).deploy.autoRollback or false
-  ) (utils.dirNames ../hosts);
+    hostname: (lib'.hostMeta hostname).deploy.autoRollback or false
+  ) lib'.nixosHosts;
 
   mkNode =
     hostname:
     let
-      meta = utils.hostMeta ../hosts/${hostname};
+      meta = lib'.hostMeta hostname;
     in
     {
       inherit hostname;

flake.nix

@@ -74,15 +74,9 @@
       ...
     }@inputs:
     let
-      inherit (self) outputs;
       inherit (inputs.nixpkgs) lib;
-      myUtils = import ./utils { inherit lib; };
-      hostDirNames = myUtils.dirNames ./hosts;
+      lib' = import ./lib { inherit lib; };
       system = "x86_64-linux";
-      paths = {
-        dots = ./dots;
-        hosts = ./hosts;
-      };
       gitHooks = import ./git-hooks.nix {
         inherit nixpkgs git-hooks system;
         src = ./.;
@@ -90,22 +84,20 @@
     in
     {
       nixosConfigurations =
-        (lib.genAttrs hostDirNames (
+        (lib.genAttrs lib'.nixosHosts (
           host:
           nixpkgs.lib.nixosSystem {
             modules = [
               ./hosts/${host}
               {
-                nixpkgs.hostPlatform = (myUtils.hostMeta ./hosts/${host}).system;
+                nixpkgs.hostPlatform = (lib'.hostMeta host).system;
                 host.name = host;
               }
             ];
             specialArgs = {
               inherit
                 inputs
-                outputs
-                paths
-                myUtils
+                lib'
                 ;
             };
           }
@@ -123,9 +115,7 @@
             specialArgs = {
               inherit
                 inputs
-                outputs
-                paths
-                myUtils
+                lib'
                 ;
             };
           };
@@ -141,9 +131,7 @@
             specialArgs = {
               inherit
                 inputs
-                outputs
-                paths
-                myUtils
+                lib'
                 ;
             };
           };
@@ -160,9 +148,7 @@
             osConfig = null;
             inherit
               inputs
-              outputs
-              paths
-              myUtils
+              lib'
               ;
           };
         };

home/modules/ai-tools/opencode.nix

@@ -2,21 +2,21 @@
   config,
   lib,
   pkgs,
-  myUtils,
+  lib',
   osConfig ? null,
   inputs ? null,
   ...
 }:
 
 let
-  sops = myUtils.sopsAvailability config osConfig;
+  sops = lib'.sopsAvailability config osConfig;
   standalone = osConfig == null;
 in
 {
   config = lib.mkIf config.ai-tools.opencode.enable (
     lib.optionalAttrs standalone {
       sops = {
-        secrets = myUtils.mkSopsSecrets "${toString inputs.nix-secrets}/secrets" {
+        secrets = lib'.mkSopsSecrets "${toString inputs.nix-secrets}/secrets" null {
           opencode = [ "api-key" ];
         };
         templates."opencode/auth.json" = {

home/modules/anki/default.nix

@@ -2,7 +2,7 @@
   config,
   lib,
   pkgs,
-  myUtils,
+  lib',
   osConfig ? null,
   inputs ? null,
   ...
@@ -10,7 +10,7 @@
 
 let
   cfg = config.anki;
-  sops = myUtils.sopsAvailability config osConfig;
+  sops = lib'.sopsAvailability config osConfig;
   standalone = osConfig == null;
 in
 {
@@ -18,7 +18,7 @@ in
 
   config = lib.mkIf cfg.enable (
     lib.optionalAttrs standalone {
-      sops.secrets = myUtils.mkSopsSecrets "${toString inputs.nix-secrets}/secrets" {
+      sops.secrets = lib'.mkSopsSecrets "${toString inputs.nix-secrets}/secrets" null {
         anki = [
           "sync-user"
           "sync-key"

home/modules/default.nix

@@ -2,14 +2,14 @@
   config,
   lib,
   pkgs,
-  myUtils,
+  lib',
   ...
 }:
 
 {
   imports =
     let
-      dirs = myUtils.dirNames ./.;
+      dirs = lib'.dirNames ./.;
       hasDef = name: builtins.pathExists ./${name}/default.nix;
     in
     map (name: ./${name}) (builtins.filter hasDef dirs);

home/modules/deploy/default.nix

@@ -3,23 +3,22 @@
   lib,
   pkgs,
   inputs,
-  myUtils,
-  paths,
+  lib',
   ...
 }:
 
 let
   cfg = config.deploy;
 
-  hostNames = myUtils.dirNames paths.hosts;
+  inherit (lib') hostNames;
   hostsWithKeys = lib.filter (
-    hostname: builtins.pathExists (paths.hosts + "/${hostname}/ssh_host.pub")
+    hostname: builtins.pathExists (lib'.hostsPath + "/${hostname}/ssh_host.pub")
   ) hostNames;
 
   colmena = inputs.colmena.packages.${pkgs.stdenv.hostPlatform.system}.colmena;
   deployRs = inputs.deploy-rs.packages.${pkgs.stdenv.hostPlatform.system}.default;
 
-  hostTags = hostname: (myUtils.hostMeta (paths.hosts + "/${hostname}")).tags;
+  hostTags = hostname: (lib'.hostMeta hostname).tags;
   nodeTagsDecl = ''
     declare -A _colmena_node_tags=(
     ${lib.concatMapStringsSep "\n" (

home/modules/git/default.nix

@@ -2,14 +2,14 @@
   config,
   inputs,
   lib,
-  myUtils,
+  lib',
   osConfig ? null,
   ...
 }:
 
 let
   cfg = config.git;
-  sops = myUtils.sopsAvailability config osConfig;
+  sops = lib'.sopsAvailability config osConfig;
   standalone = osConfig == null;
 
   personalEmail = sops.templates.".gitconfig.email".path;
@@ -50,7 +50,7 @@ in
   config = lib.mkIf cfg.enable (
     lib.optionalAttrs standalone {
       sops = {
-        secrets = myUtils.mkSopsSecrets "${toString inputs.nix-secrets}/secrets" {
+        secrets = lib'.mkSopsSecrets "${toString inputs.nix-secrets}/secrets" null {
           email = [
             "personal"
             "work"

home/modules/shell/bash.nix

@@ -1,7 +1,7 @@
 {
   config,
   lib,
-  paths,
+  lib',
   ...
 }:
 
@@ -66,6 +66,6 @@ in
       '';
     };
 
-    home.sessionPath = lib.optional cfg.addBinToPath "${paths.dots}/.bin";
+    home.sessionPath = lib.optional cfg.addBinToPath "${lib'.dotsPath}/.bin";
   };
 }

home/modules/ssh/default.nix

@@ -2,17 +2,16 @@
   config,
   lib,
   pkgs,
-  myUtils,
-  paths,
+  lib',
   ...
 }:
 
 let
   cfg = config.ssh;
-  hostNames = myUtils.dirNames paths.hosts;
+
   hostsWithKeys = lib.filter (
-    hostname: builtins.pathExists (paths.hosts + "/${hostname}/ssh_host.pub")
-  ) hostNames;
+    hostname: builtins.pathExists (lib'.hostsPath + "/${hostname}/ssh_host.pub")
+  ) lib'.hostNames;
 in
 {
   options.ssh.enable = lib.mkEnableOption "ssh";
@@ -37,7 +36,7 @@ in
         lib.genAttrs hostsWithKeys (
           hostname:
           let
-            meta = myUtils.hostMeta (paths.hosts + "/${hostname}");
+            meta = lib'.hostMeta hostname;
           in
           {
             User = meta.host.username;

home/modules/taskwarrior/default.nix

@@ -2,14 +2,14 @@
   config,
   lib,
   pkgs,
-  myUtils,
+  lib',
   osConfig ? null,
   inputs ? null,
   ...
 }:
 
 let
-  sops = myUtils.sopsAvailability config osConfig;
+  sops = lib'.sopsAvailability config osConfig;
   standalone = osConfig == null;
 
   syncHook = pkgs.writers.writePython3 "on-exit.sync.py" { flakeIgnore = [ "E501" ]; } ''
@@ -64,7 +64,7 @@ in
   config = lib.mkIf config.taskwarrior.enable (
     lib.optionalAttrs standalone {
       sops = {
-        secrets = myUtils.mkSopsSecrets "${toString inputs.nix-secrets}/secrets" {
+        secrets = lib'.mkSopsSecrets "${toString inputs.nix-secrets}/secrets" null {
           taskwarrior = [
             "sync-server-url"
             "sync-server-client-id"

lib/default.nix

@@ -4,5 +4,7 @@ let
   fs = import ./fs.nix { inherit lib; };
   hosts = import ./hosts.nix { inherit lib; };
   secrets = import ./secrets.nix { inherit lib; };
+
+  dotsPath = ../dots;
 in
-fs // hosts // secrets
+fs // hosts // secrets // { inherit dotsPath; }

lib/hosts.nix

@@ -0,0 +1,23 @@
+{ lib }:
+
+let
+  fs = import ./fs.nix { inherit lib; };
+
+  hostsPath = ../hosts;
+  hostMeta =
+    host:
+    let
+      metaPath = hostsPath + "/${host}/meta.nix";
+    in
+    if builtins.pathExists metaPath then
+      import metaPath
+    else
+      throw "meta.nix required in ${toString metaPath}";
+  hostNames = fs.dirNames hostsPath;
+in
+{
+  inherit hostsPath hostMeta hostNames;
+
+  adminHosts = builtins.filter (host: (hostMeta host).host.admin or false) hostNames;
+  nixosHosts = hostNames;
+}

lib/secrets.nix

@@ -0,0 +1,34 @@
+{ lib }:
+
+{
+  mkSopsSecrets =
+    sopsDir: owner: groups:
+    let
+      opts = lib.optionalAttrs (owner != null) { inherit owner; };
+      mkGroup =
+        group: names:
+        lib.listToAttrs (
+          map (name: {
+            name = "${group}/${name}";
+            value = {
+              sopsFile = "${sopsDir}/${group}.yaml";
+              key = name;
+            }
+            // opts;
+          }) names
+        );
+    in
+    lib.mergeAttrsList (lib.mapAttrsToList mkGroup groups);
+
+  sopsAvailability =
+    config: osConfig:
+    let
+      osSopsAvailable = osConfig != null && osConfig ? sops && osConfig.sops ? secrets;
+      hmSopsAvailable = config ? sops && config.sops ? secrets;
+    in
+    {
+      available = osSopsAvailable || hmSopsAvailable;
+      secrets = if osSopsAvailable then osConfig.sops.secrets else config.sops.secrets;
+      templates = if osSopsAvailable then osConfig.sops.templates else config.sops.templates;
+    };
+}

modules/common/home-manager.nix

@@ -1,8 +1,6 @@
 {
   inputs,
-  outputs,
-  paths,
-  myUtils,
+  lib',
   config,
   lib,
   ...
@@ -20,9 +18,7 @@ in
     extraSpecialArgs = {
       inherit
         inputs
-        outputs
-        paths
-        myUtils
+        lib'
         ;
     };
     sharedModules = [

modules/secrets/default.nix

@@ -3,7 +3,7 @@
   inputs,
   pkgs,
   config,
-  myUtils,
+  lib',
   ...
 }:
 
@@ -61,7 +61,7 @@ in
 
   config = lib.mkIf cfg.enable {
     sops = {
-      secrets = myUtils.mkSopsSecrets sopsDir system // myUtils.mkSopsUserSecrets sopsDir owner cfg.user;
+      secrets = lib'.mkSopsSecrets sopsDir null system // lib'.mkSopsSecrets sopsDir owner cfg.user;
     };
 
     nix.settings.secret-key-files = lib.mkIf cfg.nixSigningKey.enable [

modules/ssh/authorized-keys.nix

@@ -1,13 +1,13 @@
 {
   lib,
   config,
-  paths,
+  lib',
   ...
 }:
 
 let
   inherit (config.host) username;
-  adminHosts = (import ../../utils { inherit lib; }).adminHosts paths.hosts;
+  inherit (lib') adminHosts;
 in
 {
   options.ssh = {
@@ -23,7 +23,7 @@ in
         map (
           hostname:
           let
-            keyFile = paths.hosts + "/${hostname}/ssh_user.pub";
+            keyFile = lib'.hostsPath + "/${hostname}/ssh_user.pub";
           in
           lib.optionals (builtins.pathExists keyFile) (lib.splitString "\n" (builtins.readFile keyFile))
         ) ((builtins.filter (h: h != config.host.name) adminHosts) ++ config.ssh.authorizedHosts)

modules/ssh/known-hosts.nix

@@ -1,14 +1,13 @@
 {
   lib,
   config,
-  outputs,
-  paths,
+  lib',
   ...
 }:
 
 let
-  hosts = lib.attrNames outputs.nixosConfigurations;
-  keyPath = hostname: paths.hosts + "/${hostname}/ssh_host.pub";
+  hosts = lib'.nixosHosts;
+  keyPath = hostname: lib'.hostsPath + "/${hostname}/ssh_host.pub";
   hostsWithKeys = lib.filter (hostname: builtins.pathExists (keyPath hostname)) hosts;
 in
 {

modules/wol/default.nix

@@ -1,16 +1,15 @@
 {
   lib,
   config,
-  outputs,
-  paths,
-  myUtils,
+  inputs,
+  lib',
   pkgs,
   ...
 }:
 
 let
-  hosts = myUtils.dirNames paths.hosts;
-  interfaces = host: outputs.nixosConfigurations.${host}.config.wol.interfaces;
+  hosts = lib'.nixosHosts;
+  interfaces = host: inputs.self.nixosConfigurations.${host}.config.wol.interfaces;
 in
 {
   options.wol = {

utils/hosts.nix

@@ -1,19 +0,0 @@
-{ lib }:
-
-let
-  fs = import ./fs.nix { inherit lib; };
-in
-{
-  hostMeta =
-    hostDir:
-    if builtins.pathExists (hostDir + "/meta.nix") then
-      import (hostDir + "/meta.nix")
-    else
-      throw "meta.nix required in ${toString hostDir}";
-
-  adminHosts =
-    hostsPath:
-    builtins.filter (host: ((import (hostsPath + "/${host}/meta.nix")).host.admin or false)) (
-      fs.dirNames hostsPath
-    );
-}

utils/secrets.nix

@@ -1,42 +0,0 @@
-{ lib }:
-
-let
-  mkSecrets =
-    sopsDir: owner: groups:
-    let
-      opts = lib.optionalAttrs (owner != null) { inherit owner; };
-      mkGroup =
-        group: names:
-        let
-          file = "${group}.yaml";
-        in
-        lib.foldl' lib.mergeAttrs { } (
-          map (name: {
-            "${group}/${name}" = {
-              sopsFile = "${sopsDir}/${file}";
-              key = name;
-            }
-            // opts;
-          }) names
-        );
-    in
-    lib.foldl' lib.mergeAttrs { } (lib.mapAttrsToList mkGroup groups);
-in
-{
-  mkSopsSecrets = sopsDir: mkSecrets sopsDir null;
-
-  mkSopsUserSecrets = mkSecrets;
-
-  sopsAvailability =
-    config: osConfig:
-    let
-      osSopsAvailable = osConfig != null && osConfig ? sops && osConfig.sops ? secrets;
-      hmSopsAvailable = config ? sops && config.sops ? secrets;
-      preferOs = osSopsAvailable;
-    in
-    {
-      available = osSopsAvailable || hmSopsAvailable;
-      secrets = if preferOs then osConfig.sops.secrets else config.sops.secrets;
-      templates = if preferOs then osConfig.sops.templates else config.sops.templates;
-    };
-}