Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2018-11-10 20:19:20 +01:00
commit ee8196c20f
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
krebs/3modules/default.nix
View File

@ -201,6 +201,7 @@ let
"cfp@eloop.org" = eloop-ml; "cfp@eloop.org" = eloop-ml;
"kontakt@eloop.org" = eloop-ml; "kontakt@eloop.org" = eloop-ml;
"root@eloop.org" = eloop-ml; "root@eloop.org" = eloop-ml;
"youtube@eloop.org" = eloop-ml;
"eloop2016@krebsco.de" = eloop-ml; "eloop2016@krebsco.de" = eloop-ml;
"eloop2017@krebsco.de" = eloop-ml; "eloop2017@krebsco.de" = eloop-ml;
"postmaster@krebsco.de" = spam-ml; # RFC 822 "postmaster@krebsco.de" = spam-ml; # RFC 822

13
tv/1systems/mu/config.nix
View File

@ -15,7 +15,7 @@ with import <stockholm/lib>;
# hardware configuration # hardware configuration
boot.initrd.luks.devices.muca = { 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.luks.cryptoModules = [ "aes" "sha512" "xts" ];
boot.initrd.availableKernelModules = [ "ahci" ]; boot.initrd.availableKernelModules = [ "ahci" ];
@ -25,16 +25,17 @@ with import <stockholm/lib>;
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/mapper/muvga-root"; device = "/dev/mapper/muvga-root";
fsType = "btrfs"; fsType = "ext4";
options = ["defaults" "noatime" "ssd" "compress=lzo"]; options = [ "defaults" "discard" ];
}; };
"/home" = { "/home" = {
device = "/dev/mapper/muvga-home"; device = "/dev/mapper/muvga-home";
fsType = "btrfs"; fsType = "ext4";
options = ["defaults" "noatime" "ssd" "compress=lzo"]; options = [ "defaults" "discard" ];
}; };
"/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/DC38-F165"; device = "/dev/disk/by-uuid/CEB1-9743";
fsType = "vfat";
}; };
}; };

6
tv/5pkgs/simple/q/default.nix
View File

@ -71,6 +71,11 @@ let
'+%Y-%m-%dT%H:%M:%S%:z' '+%Y-%m-%dT%H:%M:%S%:z'
''; '';
q-utcdate = ''
${pkgs.coreutils}/bin/date -u \
'+%Y-%m-%dT%H:%M:%S%:z'
'';
q-gitdir = '' q-gitdir = ''
if test -d .git; then if test -d .git; then
#git status --porcelain #git status --porcelain
@ -295,6 +300,7 @@ pkgs.writeBashBin "q" ''
set -eu set -eu
export PATH=/var/empty export PATH=/var/empty
${q-cal} ${q-cal}
${q-utcdate}
${q-isodate} ${q-isodate}
${q-sgtdate} ${q-sgtdate}
(${q-gitdir}) & (${q-gitdir}) &