WIP: update to 23.11

This commit is contained in:
Filippo Berto 2023-12-01 15:24:25 +01:00
parent ab9c5297fc
commit 330d7c2338
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
22 changed files with 765 additions and 835 deletions

View file

@ -1,7 +1,7 @@
{ config, ... }: {
programs.hyprland = {
enable = true;
nvidiaPatches = builtins.elem "nvidia" config.services.xserver.videoDrivers;
enableNvidiaPatches = builtins.elem "nvidia" config.services.xserver.videoDrivers;
xwayland.enable = true;
};

View file

@ -17,21 +17,23 @@
hostName = "my-nextcloud.bertof.net";
maxUploadSize = "24G";
caching.apcu = true;
config.trustedProxies = [ "172.23.4.159" "fd80:56c2:e21c:f9c7:5399:93be:21a9:9fa0" "fe80::3079:d8ff:feb5:7d62" ];
config.extraTrustedDomains = [ config.services.nextcloud.hostName "freya.local" ];
config.adminpassFile = config.age.secrets.nextcloud_admin_secret.path;
config.overwriteProtocol = "https";
config.objectstore.s3 = {
enable = true;
bucket = "nextcloud-storage";
autocreate = false;
key = "GK622e38479552cbbbba48fd04";
secretFile = config.age.secrets.nextcloud_bucket_secret.path;
hostname = "localhost";
port = 3900;
useSsl = false;
region = "garage";
usePathStyle = true;
config = {
trustedProxies = [ "172.23.4.159" "fd80:56c2:e21c:f9c7:5399:93be:21a9:9fa0" "fe80::3079:d8ff:feb5:7d62" ];
extraTrustedDomains = [ config.services.nextcloud.hostName "freya.local" ];
adminpassFile = config.age.secrets.nextcloud_admin_secret.path;
overwriteProtocol = "https";
objectstore.s3 = {
enable = true;
bucket = "nextcloud-storage";
autocreate = false;
key = "GK622e38479552cbbbba48fd04";
secretFile = config.age.secrets.nextcloud_bucket_secret.path;
hostname = "localhost";
port = 3900;
useSsl = false;
region = "garage";
usePathStyle = true;
};
};
};

View file

@ -1,43 +0,0 @@
{ config, lib, ... }:
let
user_keys = user:
lib.optionals (builtins.hasAttr "bertof" config.users.users)
config.users.users.${user}.openssh.authorizedKeys.keys;
in
{
# nix.buildMachines
nix.distributedBuilds = true;
nix.sshServe = {
enable = true;
keys = user_keys "bertof";
write = true;
protocol = "ssh-ng";
};
services.nix-serve = {
enable = true;
openFirewall = true;
secretKeyFile = "/etc/nix/serve";
};
nix.settings = {
trusted-users = [ "root" "nix-ssh" "@wheel" ];
trusted-public-keys = [
"odin:ukZZy//P0nBAcy4ycX8eYCByRJFOfJRlfW4sYjP/rGE="
"loki:jVAH1bQugXdQ1w29lvVknyPqWwmAn7WhjKf7z4t+q7E="
];
substituters = [
# "https://192.168.0.10"
# "https://192.168.0.100"
# "ssh-ng://loki.local"
# "ssh-ng://odin.local"
# "ssh-ng://192.168.0.10"
# "ssh-ng://192.168.0.100"
];
# trusted-substituters = [
# ];
};
}