From 622ed856b1239723a2d3c49b46e597ddebd53c19 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Wed, 11 Dec 2024 05:23:04 -0500 Subject: [PATCH] chore: fix formatting --- nixosModules/base/common-nix/default.nix | 10 +++------- nixosModules/base/default.nix | 5 ++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/nixosModules/base/common-nix/default.nix b/nixosModules/base/common-nix/default.nix index 63fb015b..664541da 100644 --- a/nixosModules/base/common-nix/default.nix +++ b/nixosModules/base/common-nix/default.nix @@ -1,22 +1,17 @@ -# FIXME: remove unneeded params and reformat self: { config, lib, pkgs, ... }: let - inherit (lib) optionalString; - inherit (lib) attrValues filter findFirst isAttrs hasAttr mkDefault mkIf mkOption types; - inherit (self.inputs) home-manager nh nixd; + inherit (lib) attrValues filter findFirst hasAttr isAttrs mkIf optionalString; - - inherit (self.inputs) nixpkgs; + inherit (self.inputs) nixd nixpkgs; inherit (config.sops.secrets) access-token; cfg = config.roles.base; in { config = mkIf cfg.enable { - # Minimize dowloads of indirect nixpkgs flakes nix = { package = let nixdInput = @@ -31,6 +26,7 @@ in { in findFirst (x: x.version == nixdInput.version) {} nixVersions; + # Minimize dowloads of indirect nixpkgs flakes registry.nixpkgs.flake = nixpkgs; nixPath = ["nixpkgs=${nixpkgs}"]; diff --git a/nixosModules/base/default.nix b/nixosModules/base/default.nix index c8bfd604..71d0ad0c 100644 --- a/nixosModules/base/default.nix +++ b/nixosModules/base/default.nix @@ -1,12 +1,11 @@ -# FIXME: remove unneeded params and format self: { config, lib, pkgs, ... }: let - inherit (lib) attrValues filter findFirst isAttrs hasAttr mkDefault mkIf mkOption types; - inherit (self.inputs) home-manager nh nixd; + inherit (lib) attrValues mkDefault mkIf mkOption types; + inherit (self.inputs) home-manager nh; cfg = config.roles.base; in {