fruchti/hosts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: fruchti:038a0c8176b2979067709364298893ce136f89fd
Branches Tags
fruchti:prod
fruchti:jupyter_disable
..
compare: fruchti:2fda9075b06512c5f47ca2a7c0187412504c1860
Branches Tags
fruchti:prod
fruchti:jupyter_disable

No commits in common. "038a0c8176b2979067709364298893ce136f89fd" and "2fda9075b06512c5f47ca2a7c0187412504c1860" have entirely different histories.
038a0c8176 ... 2fda9075b0

4 changed files with 10 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

1
base/defaults.nix
View file

@ -9,7 +9,6 @@
settings = { settings = {
PasswordAuthentication = false; PasswordAuthentication = false;
KbdInteractiveAuthentication = false; KbdInteractiveAuthentication = false;
X11Forwarding = true;
}; };
}; };

17
hosts/Rupert.nix
View file

@ -17,16 +17,13 @@ in
# ./open-pgsql.nix # ./open-pgsql.nix
]; ];
nixpkgs.overlays = let nixpkgs.overlays = [
libbluray = pkgs.libbluray.override { (
self: super: {
libbluray = super.libbluray.override {
withAACS = true; withAACS = true;
withBDplus = true; withBDplus = true;
}; };
in
[
(
self: super: {
vlc = super.vlc.override { inherit libbluray; };
} }
) )
]; ];
@ -42,7 +39,7 @@ in
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-vaapi-driver (if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then vaapiIntel else intel-vaapi-driver)
libvdpau-va-gl libvdpau-va-gl
vaapiVdpau vaapiVdpau
# intel-media-driver # intel-media-driver
@ -106,9 +103,8 @@ in
services.openssh = { services.openssh = {
enable = true; enable = true;
settings = { settings = {
# ForwardX11 = true;
PasswordAuthentication = false; PasswordAuthentication = false;
KbdInteractiveAuthentication = false;
X11Forwarding = true;
}; };
}; };
@ -169,7 +165,6 @@ in
}; };
# Don’t start automatically # Don’t start automatically
systemd.services."beesd@backup-disk".wantedBy = lib.mkForce []; systemd.services."beesd@backup-disk".wantedBy = lib.mkForce [];
systemd.services."beesd@data".serviceConfig.CPUQuota = "10%";
security.acme = { security.acme = {
defaults = { defaults = {

2
hosts/mpd.nix
View file

@ -38,7 +38,7 @@ in
''; '';
}; };
services.pulseaudio = { hardware.pulseaudio = {
enable = true; enable = true;
systemWide = true; systemWide = true;
tcp.enable = true; tcp.enable = true;

33
hosts/nextcloud.nix
View file

@ -6,7 +6,7 @@ in
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
https = true; https = true;
package = pkgs.nextcloud31; package = pkgs.nextcloud30;
hostName = hostName; hostName = hostName;
datadir = "/data/nextcloud"; datadir = "/data/nextcloud";
settings = { settings = {
@ -16,7 +16,6 @@ in
]; ];
blacklisted_files = []; blacklisted_files = [];
trashbin_retention_obligation = "auto, 14"; trashbin_retention_obligation = "auto, 14";
"simpleSignUpLink.shown" = false;
}; };
config = { config = {
dbtype = "pgsql"; dbtype = "pgsql";
@ -49,41 +48,13 @@ in
after = ["postgresql.service"]; after = ["postgresql.service"];
}; };
networking.firewall.allowedTCPPorts = [ 80 443 4431 ]; networking.firewall.allowedTCPPorts = [ 80 443 ];
services.nginx = { services.nginx = {
virtualHosts.${hostName} = { virtualHosts.${hostName} = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
}; };
defaultListen = [
{
addr = "[::]";
port = 443;
ssl = true;
}
{
addr = "0.0.0.0";
port = 443;
ssl = true;
}
{
addr = "[::]";
port = 80;
ssl = false;
}
{
addr = "0.0.0.0";
port = 80;
ssl = false;
}
{
addr = "[::]";
port = 4431;
ssl = true;
proxyProtocol = true;
}
];
}; };
users.extraGroups.music = { users.extraGroups.music = {