summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile7
-rw-r--r--tv/2configs/bash/completion.sh (renamed from tv/2configs/bash_completion.sh)0
-rw-r--r--tv/2configs/bash/default.nix (renamed from tv/2configs/bash.nix)0
-rw-r--r--tv/2configs/default.nix2
4 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 09f6eaf..ce6205c 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,12 @@ deploy:
$(MAKE) populate debug=false
$(ssh) $(target_user)@$(target_host) -p $(target_port) \
env STOCKHOLM_VERSION="$$STOCKHOLM_VERSION" \
- nixos-rebuild $(rebuild-command) --show-trace -I $(target_path)
+ nixos-rebuild -Q $(rebuild-command) --show-trace -I $(target_path) \
+ |& if type whatsupnix 2>/dev/null; then \
+ whatsupnix $(target_user)@$(target_host):$(target_port); \
+ else \
+ cat; \
+ fi
# usage: make populate system=foo
populate: populate-target = \
diff --git a/tv/2configs/bash_completion.sh b/tv/2configs/bash/completion.sh
index 537484f..537484f 100644
--- a/tv/2configs/bash_completion.sh
+++ b/tv/2configs/bash/completion.sh
diff --git a/tv/2configs/bash.nix b/tv/2configs/bash/default.nix
index 40c0725..40c0725 100644
--- a/tv/2configs/bash.nix
+++ b/tv/2configs/bash/default.nix
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index d16ff4e..b256008 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -27,7 +27,7 @@ with import <stockholm/lib>;
<secrets>
./audit.nix
./backup.nix
- ./bash.nix
+ ./bash
./htop.nix
./nginx
./ssh.nix