From 70b19b8c85fb12a769d9519caee8e1e1f8d68ea8 Mon Sep 17 00:00:00 2001
From: niten <niten@fudo.org>
Date: Tue, 5 Oct 2021 10:18:54 -0700
Subject: [PATCH] Tweaks to try to get this building...
---
config/host-config/plato.nix | 24 +++++-----
config/profile-config/common-ui.nix | 68 ++++++++++++++---------------
flake.lock | 10 ++---
lib/instance.nix | 2 +-
4 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/config/host-config/plato.nix b/config/host-config/plato.nix
index df45c51..d519347 100644
--- a/config/host-config/plato.nix
+++ b/config/host-config/plato.nix
@@ -10,19 +10,19 @@ in {
console.font = "VGA";
- fudo.secrets = {
- host-secrets.plato = {
- host-keytab = {
- source-file = /state/secrets/kerberos/plato.keytab;
- target-file = "/etc/krb5.keytab";
- user = "root";
- };
- };
+ # fudo.secrets = {
+ # host-secrets.plato = {
+ # host-keytab = {
+ # source-file = /state/secrets/kerberos/plato.keytab;
+ # target-file = "/etc/krb5.keytab";
+ # user = "root";
+ # };
+ # };
- secret-group = "fudo-secrets";
- secret-users = [ "niten" ];
- secret-paths = [ "/state/secrets" ];
- };
+ # secret-group = "fudo-secrets";
+ # secret-users = [ "niten" ];
+ # secret-paths = [ "/state/secrets" ];
+ # };
systemd = let secrets-watcher-name = "secrets-ownership-fixer";
in {
diff --git a/config/profile-config/common-ui.nix b/config/profile-config/common-ui.nix
index 9c46276..5a512f5 100644
--- a/config/profile-config/common-ui.nix
+++ b/config/profile-config/common-ui.nix
@@ -101,40 +101,40 @@ in {
ucsFonts
ultimate-oldschool-pc-font-pack
unifont
- xlibs.fontadobe100dpi
- xlibs.fontadobe75dpi
- xlibs.fontadobeutopia100dpi
- xlibs.fontadobeutopia75dpi
- xlibs.fontadobeutopiatype1
- xlibs.fontarabicmisc
- xlibs.fontbh100dpi
- xlibs.fontbh75dpi
- xlibs.fontbhlucidatypewriter100dpi
- xlibs.fontbhlucidatypewriter75dpi
- xlibs.fontbhttf
- xlibs.fontbhtype1
- xlibs.fontbitstream100dpi
- xlibs.fontbitstream75dpi
- xlibs.fontbitstreamtype1
- xlibs.fontcronyxcyrillic
- xlibs.fontcursormisc
- xlibs.fontdaewoomisc
- xlibs.fontdecmisc
- xlibs.fontibmtype1
- xlibs.fontisasmisc
- xlibs.fontjismisc
- xlibs.fontmicromisc
- xlibs.fontmisccyrillic
- xlibs.fontmiscethiopic
- xlibs.fontmiscmeltho
- xlibs.fontmiscmisc
- xlibs.fontmuttmisc
- xlibs.fontschumachermisc
- xlibs.fontscreencyrillic
- xlibs.fontsonymisc
- xlibs.fontsunmisc
- xlibs.fontwinitzkicyrillic
- xlibs.fontxfree86type1
+ xorg.fontadobe100dpi
+ xorg.fontadobe75dpi
+ xorg.fontadobeutopia100dpi
+ xorg.fontadobeutopia75dpi
+ xorg.fontadobeutopiatype1
+ xorg.fontarabicmisc
+ xorg.fontbh100dpi
+ xorg.fontbh75dpi
+ xorg.fontbhlucidatypewriter100dpi
+ xorg.fontbhlucidatypewriter75dpi
+ xorg.fontbhttf
+ xorg.fontbhtype1
+ xorg.fontbitstream100dpi
+ xorg.fontbitstream75dpi
+ xorg.fontbitstreamtype1
+ xorg.fontcronyxcyrillic
+ xorg.fontcursormisc
+ xorg.fontdaewoomisc
+ xorg.fontdecmisc
+ xorg.fontibmtype1
+ xorg.fontisasmisc
+ xorg.fontjismisc
+ xorg.fontmicromisc
+ xorg.fontmisccyrillic
+ xorg.fontmiscethiopic
+ xorg.fontmiscmeltho
+ xorg.fontmiscmisc
+ xorg.fontmuttmisc
+ xorg.fontschumachermisc
+ xorg.fontscreencyrillic
+ xorg.fontsonymisc
+ xorg.fontsunmisc
+ xorg.fontwinitzkicyrillic
+ xorg.fontxfree86type1
];
};
}
diff --git a/flake.lock b/flake.lock
index 97e2db8..6e1cd72 100644
--- a/flake.lock
+++ b/flake.lock
@@ -223,7 +223,7 @@
"niten-doom-config": "niten-doom-config"
},
"locked": {
- "narHash": "sha256-bUeeulkb1X9oZu8fOM35ABq/ib/aJMOoRLJkJ3ww0wM=",
+ "narHash": "sha256-7vxYISWq8BAp88ej37PCdv9Rg6+WgTtFxcOVBH6C1Sw=",
"path": "./nix-home",
"type": "path"
},
@@ -242,7 +242,7 @@
"ssh-keypairs": "ssh-keypairs"
},
"locked": {
- "narHash": "sha256-WK+CxCQwHe1o90s0VLiYRQ62KPiDVf3HSpvt8MOBW8o=",
+ "narHash": "sha256-cCvorbK8puCKs25oad9l11xveVq2UfKcAs+FJ4LD8r0=",
"path": "/state/secrets",
"type": "path"
},
@@ -332,11 +332,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1633372662,
- "narHash": "sha256-/SNblv/N9m+We6/GSyu2KU+U+5Ze5FsLkjJEE9lnhaA=",
+ "lastModified": 1633381874,
+ "narHash": "sha256-RkoVeo4K1IKqQzCI9W28UOyw4ic3Lhb3XoMDFDp7X74=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0699530f08290f34c532beedd66046825d9756fa",
+ "rev": "35b808214a1ca158a04d6980cb95cc1a77ce1f94",
"type": "github"
},
"original": {
diff --git a/lib/instance.nix b/lib/instance.nix
index 03e2a22..951cfb7 100644
--- a/lib/instance.nix
+++ b/lib/instance.nix
@@ -38,7 +38,7 @@ in {
};
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.";
};