From 3ccacbcf32c30677db8a2729c9e553431fd3b732 Mon Sep 17 00:00:00 2001 From: Martin Fischer <martin@push-f.com> Date: Mon, 24 Feb 2025 20:13:32 +0100 Subject: refactor: name npins import sources --- nixos/profiles/common/default.nix | 4 ++-- nixos/profiles/workstation/default.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/profiles/common/default.nix b/nixos/profiles/common/default.nix index d1fe93e..2b07724 100644 --- a/nixos/profiles/common/default.nix +++ b/nixos/profiles/common/default.nix @@ -1,12 +1,12 @@ { config, pkgs, ... }: let - npins = import ../../npins; + sources = import ../../npins; in { imports = [ ./sanix.nix ./basics.nix - "${npins.agenix}/modules/age.nix" + "${sources.agenix}/modules/age.nix" ]; } diff --git a/nixos/profiles/workstation/default.nix b/nixos/profiles/workstation/default.nix index 523cb1b..d987a0f 100644 --- a/nixos/profiles/workstation/default.nix +++ b/nixos/profiles/workstation/default.nix @@ -2,7 +2,7 @@ let cfg = config.workstation; - npins = import ../../npins; + sources = import ../../npins; nixGit = import (pkgs.fetchFromGitHub { owner = "NixOS"; repo = "nix"; @@ -40,11 +40,11 @@ in autologinOnce = true; # only in the first tty once per boot }; - environment.systemPackages = [ - pkgs.npins - (pkgs.callPackage "${npins.agenix}/pkgs/agenix.nix" {}) + environment.systemPackages = with pkgs; [ + npins + (callPackage "${sources.agenix}/pkgs/agenix.nix" {}) - pkgs.unzip + unzip ]; environment.sessionVariables = { -- cgit v1.2.3