From d29a43028b95d20dbf6330ac7c3bf90fdb75e4e8 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sun, 26 Sep 2021 10:18:18 +0200 Subject: [PATCH] minor adjustments --- nixos/krops.nix | 8 ++------ nixos/system/all/default.nix | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/nixos/krops.nix b/nixos/krops.nix index 373c85d..7c1c86f 100644 --- a/nixos/krops.nix +++ b/nixos/krops.nix @@ -15,11 +15,11 @@ let source = { secrets.file = "${secrets}/secrets"; - assets.file = toString ./assets; private_assets.pass = { dir = toString ~/.password-store; name = "krops/private_assets"; }; + assets.file = toString ./assets; configs.file = toString ./configs; library.file = toString ./library; modules.file = toString ./modules; @@ -63,16 +63,12 @@ let target = lib.mkTarget "root@${host}/etc/NetworkManager"; }; in { - "${name}-all" = pkgs.writers.writeBashBin "${name}-all" '' + "${name}" = pkgs.writers.writeBashBin "${name}-all" '' echo "deploy network secerts" ${network}/bin/secrets echo "deploy system" ${system}/bin/system ''; - "${name}" = pkgs.writers.writeBashBin name '' - echo "deploy system" - ${system}/bin/system - ''; }; in (desktop { diff --git a/nixos/system/all/default.nix b/nixos/system/all/default.nix index 27f03f4..d8a97ee 100644 --- a/nixos/system/all/default.nix +++ b/nixos/system/all/default.nix @@ -61,7 +61,7 @@ # rewire NIX_PATH # --------------- - environment.variables.NIX_PATH = lib.mkForce "/var/src"; + # environment.variables.NIX_PATH = lib.mkForce "/var/src"; # Shell configuration # -------------------