summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-13 21:59:56 +0200
committerlassulus <lass@aidsballs.de>2016-10-13 21:59:56 +0200
commit52f50275651f0c762b7f9712cd6cc31077950421 (patch)
tree37df95c25251e1de010a260e73d6dd24038fdb73 /tv
parentc419b951efaac4773954e547cf7c1af70a999396 (diff)
parent9fb29a7030a168046983457f6f7cf9d943661c06 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/xu.nix5
-rw-r--r--tv/5pkgs/q/default.nix9
2 files changed, 10 insertions, 4 deletions
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 119399ac2..85ac23e9d 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -138,6 +138,11 @@ with config.krebs.lib;
fsType = "btrfs";
options = ["defaults" "noatime" "ssd" "compress=lzo"];
};
+ "/bku" = {
+ device = "/dev/mapper/xuvga-bku";
+ fsType = "btrfs";
+ options = ["defaults" "noatime" "ssd" "compress=lzo"];
+ };
"/home" = {
device = "/dev/mapper/xuvga-home";
fsType = "btrfs";
diff --git a/tv/5pkgs/q/default.nix b/tv/5pkgs/q/default.nix
index b19402fa4..f923950f0 100644
--- a/tv/5pkgs/q/default.nix
+++ b/tv/5pkgs/q/default.nix
@@ -178,6 +178,11 @@ in
pkgs.writeBashBin "q" ''
set -eu
export PATH=/var/empty
+ (${q-todo}) || :
+ if [ "$PWD" != "$HOME" ]; then
+ (HOME=$PWD; ${q-todo}) || :
+ fi
+ echo
${q-cal}
echo
${q-isodate}
@@ -189,8 +194,4 @@ pkgs.writeBashBin "q" ''
(${q-online}) &
(${q-thermal_zone}) &
wait
- ${q-todo}
- if [ "$PWD" != "$HOME" ]; then
- (HOME=$PWD; ${q-todo})
- fi
''