Tweaks to try to get this building...

This commit is contained in:
niten 2021-10-05 10:18:54 -07:00
parent 2ea4f6be5a
commit 70b19b8c85
4 changed files with 52 additions and 52 deletions

View File

@ -10,19 +10,19 @@ in {
console.font = "VGA"; console.font = "VGA";
fudo.secrets = { # fudo.secrets = {
host-secrets.plato = { # host-secrets.plato = {
host-keytab = { # host-keytab = {
source-file = /state/secrets/kerberos/plato.keytab; # source-file = /state/secrets/kerberos/plato.keytab;
target-file = "/etc/krb5.keytab"; # target-file = "/etc/krb5.keytab";
user = "root"; # user = "root";
}; # };
}; # };
secret-group = "fudo-secrets"; # secret-group = "fudo-secrets";
secret-users = [ "niten" ]; # secret-users = [ "niten" ];
secret-paths = [ "/state/secrets" ]; # secret-paths = [ "/state/secrets" ];
}; # };
systemd = let secrets-watcher-name = "secrets-ownership-fixer"; systemd = let secrets-watcher-name = "secrets-ownership-fixer";
in { in {

View File

@ -101,40 +101,40 @@ in {
ucsFonts ucsFonts
ultimate-oldschool-pc-font-pack ultimate-oldschool-pc-font-pack
unifont unifont
xlibs.fontadobe100dpi xorg.fontadobe100dpi
xlibs.fontadobe75dpi xorg.fontadobe75dpi
xlibs.fontadobeutopia100dpi xorg.fontadobeutopia100dpi
xlibs.fontadobeutopia75dpi xorg.fontadobeutopia75dpi
xlibs.fontadobeutopiatype1 xorg.fontadobeutopiatype1
xlibs.fontarabicmisc xorg.fontarabicmisc
xlibs.fontbh100dpi xorg.fontbh100dpi
xlibs.fontbh75dpi xorg.fontbh75dpi
xlibs.fontbhlucidatypewriter100dpi xorg.fontbhlucidatypewriter100dpi
xlibs.fontbhlucidatypewriter75dpi xorg.fontbhlucidatypewriter75dpi
xlibs.fontbhttf xorg.fontbhttf
xlibs.fontbhtype1 xorg.fontbhtype1
xlibs.fontbitstream100dpi xorg.fontbitstream100dpi
xlibs.fontbitstream75dpi xorg.fontbitstream75dpi
xlibs.fontbitstreamtype1 xorg.fontbitstreamtype1
xlibs.fontcronyxcyrillic xorg.fontcronyxcyrillic
xlibs.fontcursormisc xorg.fontcursormisc
xlibs.fontdaewoomisc xorg.fontdaewoomisc
xlibs.fontdecmisc xorg.fontdecmisc
xlibs.fontibmtype1 xorg.fontibmtype1
xlibs.fontisasmisc xorg.fontisasmisc
xlibs.fontjismisc xorg.fontjismisc
xlibs.fontmicromisc xorg.fontmicromisc
xlibs.fontmisccyrillic xorg.fontmisccyrillic
xlibs.fontmiscethiopic xorg.fontmiscethiopic
xlibs.fontmiscmeltho xorg.fontmiscmeltho
xlibs.fontmiscmisc xorg.fontmiscmisc
xlibs.fontmuttmisc xorg.fontmuttmisc
xlibs.fontschumachermisc xorg.fontschumachermisc
xlibs.fontscreencyrillic xorg.fontscreencyrillic
xlibs.fontsonymisc xorg.fontsonymisc
xlibs.fontsunmisc xorg.fontsunmisc
xlibs.fontwinitzkicyrillic xorg.fontwinitzkicyrillic
xlibs.fontxfree86type1 xorg.fontxfree86type1
]; ];
}; };
} }

View File

@ -223,7 +223,7 @@
"niten-doom-config": "niten-doom-config" "niten-doom-config": "niten-doom-config"
}, },
"locked": { "locked": {
"narHash": "sha256-bUeeulkb1X9oZu8fOM35ABq/ib/aJMOoRLJkJ3ww0wM=", "narHash": "sha256-7vxYISWq8BAp88ej37PCdv9Rg6+WgTtFxcOVBH6C1Sw=",
"path": "./nix-home", "path": "./nix-home",
"type": "path" "type": "path"
}, },
@ -242,7 +242,7 @@
"ssh-keypairs": "ssh-keypairs" "ssh-keypairs": "ssh-keypairs"
}, },
"locked": { "locked": {
"narHash": "sha256-WK+CxCQwHe1o90s0VLiYRQ62KPiDVf3HSpvt8MOBW8o=", "narHash": "sha256-cCvorbK8puCKs25oad9l11xveVq2UfKcAs+FJ4LD8r0=",
"path": "/state/secrets", "path": "/state/secrets",
"type": "path" "type": "path"
}, },
@ -332,11 +332,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1633372662, "lastModified": 1633381874,
"narHash": "sha256-/SNblv/N9m+We6/GSyu2KU+U+5Ze5FsLkjJEE9lnhaA=", "narHash": "sha256-RkoVeo4K1IKqQzCI9W28UOyw4ic3Lhb3XoMDFDp7X74=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0699530f08290f34c532beedd66046825d9756fa", "rev": "35b808214a1ca158a04d6980cb95cc1a77ce1f94",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -38,7 +38,7 @@ in {
}; };
local-hosts = mkOption { local-hosts = mkOption {
type = listOf (submodule host.hostOpts); type = attrsOf (submodule host.hostOpts);
description = "List of hosts that should be considered local to the current host."; description = "List of hosts that should be considered local to the current host.";
}; };