Various changes...

This commit is contained in:
niten 2024-05-24 08:51:54 -07:00
parent 8e184394f2
commit f176509154
7 changed files with 48 additions and 28 deletions

View File

@ -95,12 +95,18 @@ in {
toString config.services.immichContainer.port toString config.services.immichContainer.port
}/"; }/";
recommendedProxySettings = true; recommendedProxySettings = true;
extraConfig = ''
client_max_body_size 1024M;
'';
}; };
"pics.fudo.ninja".locations."/" = mkIf (hostname == immichHost) { "pics.fudo.ninja".locations."/" = mkIf (hostname == immichHost) {
proxyPass = "http://127.0.0.1:${ proxyPass = "http://127.0.0.1:${
toString config.services.immichContainer.port toString config.services.immichContainer.port
}/"; }/";
recommendedProxySettings = true; recommendedProxySettings = true;
extraConfig = ''
client_max_body_size 1024M;
'';
}; };
}; };
}; };

View File

@ -259,6 +259,9 @@ in {
proxyPass = "http://immich.sea.fudo.org/"; proxyPass = "http://immich.sea.fudo.org/";
proxyWebsockets = true; proxyWebsockets = true;
recommendedProxySettings = true; recommendedProxySettings = true;
extraConfig = ''
client_max_body_size 1024M;
'';
}; };
}; };
}; };

View File

@ -10,12 +10,6 @@ in {
firewall.enable = false; firewall.enable = false;
}; };
systemd.tmpfiles.rules = [
"L /etc/adjtime - - - - ${stateDir}/etc/adjtime"
"d ${stateDir}/lib/cups 755 root root - -"
"d ${stateDir}/lib/flatpak 755 root root - -"
];
services.xserver = { services.xserver = {
layout = "us"; layout = "us";
xkbVariant = mkForce ""; xkbVariant = mkForce "";
@ -47,13 +41,21 @@ in {
nixos.source = "/etc/nixos-live"; nixos.source = "/etc/nixos-live";
NIXOS.source = "${stateDir}/etc/NIXOS"; NIXOS.source = "${stateDir}/etc/NIXOS";
}; };
systemPackages = with pkgs; [ bluez-tools ]; systemPackages = with pkgs; [ bluez-tools steam-run ];
}; };
systemd.targets = { systemd = {
sleep.enable = false; tmpfiles.rules = [
suspend.enable = false; "L /etc/adjtime - - - - ${stateDir}/etc/adjtime"
hibernate.enable = false; "d ${stateDir}/lib/cups 755 root root - -"
hybrid-sleep.enable = false; "d ${stateDir}/lib/flatpak 755 root root - -"
];
targets = {
sleep.enable = false;
suspend.enable = false;
hibernate.enable = false;
hybrid-sleep.enable = false;
};
}; };
} }

View File

@ -79,7 +79,7 @@ in {
hardware = { hardware = {
nvidia = { nvidia = {
nvidiaSettings = true; nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.production; package = config.boot.kernelPackages.nvidiaPackages.beta;
}; };
opengl = { opengl = {
enable = true; enable = true;
@ -90,19 +90,18 @@ in {
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
virtualisation = { virtualisation = {
podman = { docker = {
enable = true; enable = true;
autoPrune.enable = true; autoPrune.enable = true;
dockerSocket.enable = true; # dockerSocket.enable = true;
dockerCompat = true; # dockerCompat = true;
enableNvidia = true; enableNvidia = true;
defaultNetwork.settings = { # defaultNetwork.settings = {
dns_enabled = true; # dns_enabled = true;
network_dns_servers = [ "1.1.1.1" "8.8.4.4" ]; # network_dns_servers = [ "1.1.1.1" "8.8.4.4" ];
}; # };
}; };
oci-containers.backend = "podman"; oci-containers.backend = "docker";
arion.backend = "podman-socket";
}; };
systemd.targets = { systemd.targets = {

View File

@ -57,8 +57,15 @@ in {
"When host keytab is available or changed, activate copy job."; "When host keytab is available or changed, activate copy job.";
path = with pkgs; [ systemd ]; path = with pkgs; [ systemd ];
serviceConfig = { Type = "oneshot"; }; serviceConfig = { Type = "oneshot"; };
# after = [ "fudo-secrets.target" ]; serviceConfig = {
script = "systemctl restart ${hostname}-copy-keytab.service"; ExecStartPre = pkgs.writeShellScript "await-keytab.sh" ''
while [ ! -f /etc/krb5.keytab ]; do
sleep 5
done
exit 0
'';
ExecStart = "systemctl restart ${hostname}-copy-keytab.service";
};
}; };
"${hostname}-copy-keytab" = { "${hostname}-copy-keytab" = {

View File

@ -5707,11 +5707,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716347973, "lastModified": 1716501010,
"narHash": "sha256-Mbmxitjy0xKPBWPOFv92+IV3AJ8uBFzPmpYNjPakO9c=", "narHash": "sha256-WkyaJuIrtln77oDfW5WpCaQ9M79/gC7+ZOCNnViLt18=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "8ac74302282ae0227a433ac2f6ebc508d7ca4a5f", "rev": "183544485546e9464d6a68cf5038e43ab1bd0613",
"revCount": 21, "revCount": 38,
"type": "git", "type": "git",
"url": "https://fudo.dev/public/immich-ml-container.git" "url": "https://fudo.dev/public/immich-ml-container.git"
}, },

View File

@ -235,6 +235,9 @@
unstable.factorio-headless-experimental; unstable.factorio-headless-experimental;
}) })
(final: prev: { inherit textfiles; }) (final: prev: { inherit textfiles; })
(final: prev: {
nvidia-container-toolkit = unstable.nvidia-container-toolkit;
})
]; ];
}; };