summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-06-15 20:02:20 +0200
committerlassulus <lass@lassul.us>2017-06-15 20:02:20 +0200
commitfde07d4e5ed92309ca1c7570c936ec3d324ca2f3 (patch)
treec65814c4caecab5bf833dca05477e622c86b93d5 /tv
parente0f2449d526ba0f6a5bb8feebb8ca67bbc822554 (diff)
parentea468604d36257d182580d689035379b7ff8d78e (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv')
-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
3 files changed, 1 insertions, 1 deletions
diff --git a/tv/2configs/bash_completion.sh b/tv/2configs/bash/completion.sh
index 537484fb9..537484fb9 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 40c0725ed..40c0725ed 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 d16ff4eb5..b2560084d 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