Merge branch 'zenix/master' into alpine/master

This commit is contained in:
Tristan 2025-01-18 00:25:15 +00:00
commit 2c406b36d3
38 changed files with 843 additions and 360 deletions

View file

@ -11,7 +11,7 @@ in {
nix = {
settings = {
experimental-features = ["nix-command" "flakes"];
experimental-features = ["nix-command" "flakes" "pipe-operators"];
};
settings.trusted-users = ["root" user];
@ -42,12 +42,6 @@ in {
}
];
};
networking.hosts = {
"100.65.29.110" = ["zenix"];
"100.106.241.122" = ["alpine" "tristans.cloud"];
"100.71.130.111" = ["fcs-tristan-nixbook"];
"100.69.60.83" = ["google-pixel-8"];
};
time.timeZone = lib.mkDefault "Europe/London";
@ -56,7 +50,10 @@ in {
useXkbConfig = true;
};
services.avahi.enable = true;
services.avahi = {
enable = true;
nssmdns4 = true;
};
i18n.defaultLocale = lib.mkDefault "en_GB.UTF-8";
@ -93,6 +90,11 @@ in {
unzip
fzf
sops
lsof
nix-tree
nix-index
nh
jq
];
boot.kernel.sysctl = {