diff options
| author | lassulus <lass@blue.r> | 2018-11-10 20:19:20 +0100 |
|---|---|---|
| committer | lassulus <lass@blue.r> | 2018-11-10 20:19:20 +0100 |
| commit | ee8196c20f5fad3ff640ca5484f6a24ff304c444 (patch) | |
| tree | a4e82ab8fce2c30c1dbb6e13c541fa7882bab79f /tv | |
| parent | cd720e1a9ed12413504ddae2d381279ec30ce24a (diff) | |
| parent | dfb9c237607b73f00cd52ca5c5b731f45d83f932 (diff) | |
Merge remote-tracking branch 'ni/master'prism/master
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/1systems/mu/config.nix | 13 | ||||
| -rw-r--r-- | tv/5pkgs/simple/q/default.nix | 6 |
2 files changed, 13 insertions, 6 deletions
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"; }; }; 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 '+[1m%Y-%m-%d[;30mT[;38;5;088m%H:%M[m:%S%:z' ''; + q-utcdate = '' + ${pkgs.coreutils}/bin/date -u \ + '+[1m%Y-%m-%d[;30mT[;38;5;065m%H:%M[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}) & |