samhain: reformat + mako fix + secrets handling

This commit is contained in:
kat witch 2021-08-24 03:59:49 +01:00
parent 160d4d2b6c
commit b12e853b31
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
4 changed files with 21 additions and 15 deletions

View file

@ -5,9 +5,9 @@ with lib;
let
hexchen = (import sources.hexchen) { };
hexYgg = filterAttrs (_: c: c.enable)
(mapAttrs (_: host: host.config.network.yggdrasil) hexchen.hosts);
(mapAttrs (_: host: host.config.network.yggdrasil) hexchen.hosts);
in
{
{
# Imports
imports = with meta; [
@ -88,12 +88,18 @@ in
};
home-manager.users.kat = {
secrets = {
persistentRoot = mkForce "/persist/home/.cache/kat/secrets";
};
home.persistence."/persist/home" = {
allowOther = true;
directories = [
".local/share/dino"
".local/share/weechat"
".local/share/Mumble"
".config/Mumble"
".config/Element"
".password-store"
".gnupg"
".mozilla"
@ -143,12 +149,12 @@ in
mkIf (vfio-pci-ids != [ ]) {
options.ids = concatStringsSep "," vfio-pci-ids;
};
};
};
services.udev.extraRules = ''
SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1532", ATTRS{idProduct}=="0067", GROUP="vfio"
SUBSYSTEM=="block", ACTION=="add", ATTRS{model}=="HFS256G32TNF-N3A", ATTRS{wwid}=="t10.ATA HFS256G32TNF-N3A0A MJ8BN15091150BM1Z ", OWNER="kat"
'';
services.udev.extraRules = ''
SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1532", ATTRS{idProduct}=="0067", GROUP="vfio"
SUBSYSTEM=="block", ACTION=="add", ATTRS{model}=="HFS256G32TNF-N3A", ATTRS{wwid}=="t10.ATA HFS256G32TNF-N3A0A MJ8BN15091150BM1Z ", OWNER="kat"
'';
# TODO: Replace this drive forward with one half of the 1.82TiB drive.
# SUBSYSTEM=="block", ACTION=="add", ATTR{partition}=="2", ATTR{size}=="1953503232", ATTRS{wwid}=="naa.5000039fe6e8614e", OWNER="kat"

View file

@ -2,7 +2,7 @@
{
secrets = {
persistentRoot = config.xdg.cacheHome + "/kat/secrets";
persistentRoot = lib.mkDefault "${config.xdg.cacheHome}/kat/secrets";
external = true;
};
}

View file

@ -24,7 +24,7 @@ in
font = "${config.kw.font.name} ${toString config.kw.font.size}";
defaultTimeout = 3000;
borderColor = base16.base08;
backgroundColor = lib.hextorgba base16.base00 0.75;
backgroundColor = "${base16.base00}BF";
textColor = base16.base05;
};
}

View file

@ -5,10 +5,10 @@
"homepage": null,
"owner": "arcnmx",
"repo": "nixexprs",
"rev": "281df8466c07ffb0cb6e4e8582f0b84ccd501ec6",
"sha256": "0pnwas0zx1rar0gxjvk5f7d3skws74maib01mzlygzhgfi6njgpv",
"rev": "62a97942182b0ab36cd31efe0c206f4f56f3b508",
"sha256": "04g89cisbd4x9jhck0d64k8mr0w0nni09wh0y6bwy3nq8f0z6cdy",
"type": "tarball",
"url": "https://github.com/arcnmx/nixexprs/archive/281df8466c07ffb0cb6e4e8582f0b84ccd501ec6.tar.gz",
"url": "https://github.com/arcnmx/nixexprs/archive/62a97942182b0ab36cd31efe0c206f4f56f3b508.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"ci": {
@ -77,10 +77,10 @@
"homepage": null,
"owner": "kittywitch",
"repo": "nixexprs",
"rev": "e5a141c691a46d3867682ebe31e7feebcd8a8926",
"sha256": "1zw2fjad46q9pb5lg74nncijhbxjxrgyhxi8p7rp29bmm1ig5z1q",
"rev": "e19d26c73b1a6f73598ce7eb26d557b6d2f8c913",
"sha256": "0g154hqqkq76rxp5jbfcwzp50ywf56cy1bwkc25acl0zqf8xgr0m",
"type": "tarball",
"url": "https://github.com/kittywitch/nixexprs/archive/e5a141c691a46d3867682ebe31e7feebcd8a8926.tar.gz",
"url": "https://github.com/kittywitch/nixexprs/archive/e19d26c73b1a6f73598ce7eb26d557b6d2f8c913.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"niv": {