diff options
-rw-r--r-- | default.nix | 3 | ||||
-rwxr-xr-x | nixops/scripts/nixops_wrap | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/default.nix b/default.nix index 0c7cd7b..c8d8c8b 100644 --- a/default.nix +++ b/default.nix | |||
@@ -545,7 +545,7 @@ in | |||
545 | inherit pdftk; | 545 | inherit pdftk; |
546 | inherit googler; | 546 | inherit googler; |
547 | inherit jrnl; | 547 | inherit jrnl; |
548 | inherit apg; | 548 | inherit apg pwgen; |
549 | inherit newsboat; | 549 | inherit newsboat; |
550 | inherit vcsh; | 550 | inherit vcsh; |
551 | inherit xmr-stak; | 551 | inherit xmr-stak; |
@@ -579,6 +579,7 @@ in | |||
579 | inherit monero; | 579 | inherit monero; |
580 | inherit nextcloud-client; | 580 | inherit nextcloud-client; |
581 | inherit feh imagemagick; | 581 | inherit feh imagemagick; |
582 | inherit lftp; | ||
582 | stgit = gitAndTools.stgit; | 583 | stgit = gitAndTools.stgit; |
583 | # todo: lx* ?, unrar, unzip, zeromq? | 584 | # todo: lx* ?, unrar, unzip, zeromq? |
584 | #inherit nextcloud-client; | 585 | #inherit nextcloud-client; |
diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap index 561bf6e..2d61ed5 100755 --- a/nixops/scripts/nixops_wrap +++ b/nixops/scripts/nixops_wrap | |||
@@ -28,5 +28,5 @@ for file in $files; do | |||
28 | done | 28 | done |
29 | nixops set-args --argstr privateFiles "$TEMP" | 29 | nixops set-args --argstr privateFiles "$TEMP" |
30 | 30 | ||
31 | export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$HOME/.nix-defexpr/channels/immaeNixpkgs" | 31 | export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$HOME/.nix-defexpr/channels/immaeNixpkgs:immaeNixpkgsNext=$HOME/.nix-defexpr/channels/immaeNixpkgsNext" |
32 | nixops "$@" | 32 | nixops "$@" |