From 69adc5dc17d9f9b9df605eada6a433545ff987dc Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 8 Nov 2018 19:09:11 +0100
Subject: tv q: add utcdate

---
 tv/5pkgs/simple/q/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'tv')

diff --git a/tv/5pkgs/simple/q/default.nix b/tv/5pkgs/simple/q/default.nix
index 655c75e1b..cbcec1bae 100644
--- a/tv/5pkgs/simple/q/default.nix
+++ b/tv/5pkgs/simple/q/default.nix
@@ -71,6 +71,11 @@ let
         '+%Y-%m-%dT%H:%M:%S%:z'
   '';
 
+  q-utcdate = ''
+    ${pkgs.coreutils}/bin/date -u \
+        '+%Y-%m-%dT%H:%M:%S%:z'
+  '';
+
   q-gitdir = ''
     if test -d .git; then
       #git status --porcelain
@@ -295,6 +300,7 @@ pkgs.writeBashBin "q" ''
   set -eu
   export PATH=/var/empty
   ${q-cal}
+  ${q-utcdate}
   ${q-isodate}
   ${q-sgtdate}
   (${q-gitdir}) &
-- 
cgit v1.2.3


From 9a801fa642a60a2c46240670b4e3ad66ea77d995 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 8 Nov 2018 19:25:24 +0100
Subject: tv mu: replace disk

---
 tv/1systems/mu/config.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'tv')

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index c26d4ab30..a653ce40d 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -15,7 +15,7 @@ with import <stockholm/lib>;
 
   # hardware configuration
   boot.initrd.luks.devices.muca = {
-    device = "/dev/disk/by-uuid/a8796bb3-6c03-4ddf-b2e4-c2e44c51d352";
+    device = "/dev/disk/by-uuid/7b24a931-40b6-44a6-ba22-c805cf164e91";
   };
   boot.initrd.luks.cryptoModules = [ "aes" "sha512" "xts" ];
   boot.initrd.availableKernelModules = [ "ahci" ];
@@ -25,16 +25,17 @@ with import <stockholm/lib>;
   fileSystems = {
     "/" = {
       device = "/dev/mapper/muvga-root";
-      fsType = "btrfs";
-      options = ["defaults" "noatime" "ssd" "compress=lzo"];
+      fsType = "ext4";
+      options = [ "defaults" "discard" ];
     };
     "/home" = {
       device = "/dev/mapper/muvga-home";
-      fsType = "btrfs";
-      options = ["defaults" "noatime" "ssd" "compress=lzo"];
+      fsType = "ext4";
+      options = [ "defaults" "discard" ];
     };
     "/boot" = {
-      device = "/dev/disk/by-uuid/DC38-F165";
+      device = "/dev/disk/by-uuid/CEB1-9743";
+      fsType = "vfat";
     };
   };
 
-- 
cgit v1.2.3