format tree

This commit is contained in:
zowoq 2024-07-24 19:05:26 +10:00 committed by Jörg Thalheim
parent 24547fcd6c
commit 92c55595d0
43 changed files with 476 additions and 357 deletions

View file

@ -1,10 +1,10 @@
{
imports = [
../shared/builder.nix
];
imports = [ ../shared/builder.nix ];
# https://github.com/LnL7/nix-darwin/blob/230a197063de9287128e2c68a7a4b0cd7d0b50a7/modules/nix/default.nix#L201
nix.daemonProcessType = "Interactive";
nix.gc.interval = { Minute = 15; };
nix.gc.interval = {
Minute = 15;
};
}

View file

@ -21,7 +21,9 @@ in
# TODO: refactor this to share /users with nixos
users.users = {
customer.openssh = { inherit authorizedKeys; };
customer.openssh = {
inherit authorizedKeys;
};
};
services.nix-daemon.enable = true;
@ -32,9 +34,7 @@ in
programs.info.enable = false;
nix.settings.trusted-users = [
"@admin"
];
nix.settings.trusted-users = [ "@admin" ];
# shouldn't need to set this for a nix multi-user install
nix.gc.user = "root";
@ -48,9 +48,7 @@ in
"flakes"
];
environment.systemPackages = with pkgs; [
htop
];
environment.systemPackages = with pkgs; [ htop ];
system.includeUninstaller = false;

View file

@ -1,8 +1,6 @@
{ pkgs, ... }:
{
imports = [
../../shared/telegraf.nix
];
imports = [ ../../shared/telegraf.nix ];
services.telegraf = {
enable = true;
@ -14,8 +12,22 @@
mem = { };
swap = { };
disk.tagdrop = {
fstype = [ "tmpfs" "ramfs" "devtmpfs" "devfs" "iso9660" "overlay" "aufs" "squashfs" ];
device = [ "rpc_pipefs" "lxcfs" "nsfs" "borgfs" ];
fstype = [
"tmpfs"
"ramfs"
"devtmpfs"
"devfs"
"iso9660"
"overlay"
"aufs"
"squashfs"
];
device = [
"rpc_pipefs"
"lxcfs"
"nsfs"
"borgfs"
];
};
diskio = { };
internal = { };

View file

@ -287,20 +287,18 @@ let
];
in
{
users.users = builtins.listToAttrs (builtins.map
(u: {
users.users = builtins.listToAttrs (
builtins.map (u: {
inherit (u) name;
value = {
inherit (u) uid;
home = "/Users/${u.name}";
createHome = true;
shell = "/bin/zsh";
openssh.authorizedKeys.keyFiles = [
u.keys
];
openssh.authorizedKeys.keyFiles = [ u.keys ];
};
})
users);
}) users
);
users.knownUsers = builtins.map (u: u.name) users;

View file

@ -1,7 +1,5 @@
{
imports = [
../shared/remote-builder.nix
];
imports = [ ../shared/remote-builder.nix ];
users.knownUsers = [ "nix" ];