got a bunch of shit fixed
This commit is contained in:
@@ -66,6 +66,10 @@
|
||||
address = "192.168.1.240";
|
||||
prefixLength = 24;
|
||||
}];
|
||||
ipv6.addresses = [{
|
||||
address = "fd7d:587a:4300:1::240";
|
||||
prefixLength = 64;
|
||||
}];
|
||||
ipv4.routes = [{ address = "192.168.1.0"; prefixLength = 24; via = "192.168.1.1"; }];
|
||||
useDHCP = false;
|
||||
};
|
||||
|
||||
+4
-11
@@ -56,17 +56,10 @@
|
||||
# seafile
|
||||
};
|
||||
|
||||
|
||||
services.nginx.virtualHosts."mast.mossnet.lan" = {
|
||||
enableACME = false;
|
||||
forceSSL = false;
|
||||
|
||||
locations."/" = {
|
||||
extraConfig = ''
|
||||
proxy_pass http://localhost:5731/;
|
||||
proxy_set_header X-Forwarded-Host $host;
|
||||
'';
|
||||
};
|
||||
environment.systemPackages = with pkgs; [ lm_sensors ];
|
||||
hardware.fancontrol = {
|
||||
enable = false;
|
||||
config = '''';
|
||||
};
|
||||
|
||||
age.secrets.box-wg.file = "${self}/secrets/box-wg.age";
|
||||
|
||||
@@ -38,8 +38,7 @@
|
||||
pkgs.lib.mkForce [ ]; # Normally ["network-online.target"]
|
||||
};
|
||||
|
||||
programs.gnupg.agent.enable = true;
|
||||
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3;
|
||||
|
||||
|
||||
fileSystems."/mnt/ftp" = {
|
||||
device = "192.168.1.240:/home/ftp";
|
||||
|
||||
@@ -220,6 +220,8 @@ in {
|
||||
siji
|
||||
font-awesome
|
||||
proggyfonts
|
||||
(nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "Iosevka" ]; })
|
||||
nerd-fonts.fira-code
|
||||
nerd-fonts.droid-sans-mono
|
||||
nerd-fonts.iosevka
|
||||
];
|
||||
}
|
||||
|
||||
@@ -53,9 +53,9 @@ in {
|
||||
# private-address = "192.168.1.0/24";
|
||||
cache-min-ttl = 0;
|
||||
serve-expired = "yes";
|
||||
interface = [ "0.0.0.0" ];
|
||||
interface = [ "0.0.0.0" "::" ];
|
||||
access-control =
|
||||
[ "127.0.0.0/8 allow" "192.168.1.0/24 allow" "10.0.69.0/24 allow" ];
|
||||
[ "127.0.0.0/8 allow" "192.168.1.0/24 allow" "10.0.69.0/24 allow" "::1 allow" "fd7d:587a:4300:1::/64 allow" ];
|
||||
access-control-view = "10.0.69.0/24 wireguard";
|
||||
# so-reuseport = "yes";
|
||||
tls-upstream = "yes";
|
||||
|
||||
@@ -47,9 +47,9 @@
|
||||
# The registration file is automatically generated after starting the appservice for the first time.
|
||||
# cp /var/lib/matrix-appservice-discord/discord-registration.yaml /var/lib/matrix-synapse/
|
||||
# chown matrix-synapse:matrix-synapse /var/lib/matrix-synapse/discord-registration.yaml
|
||||
"/var/lib/matrix-synapse/telegram-registration.yaml"
|
||||
# "/var/lib/matrix-synapse/telegram-registration.yaml"
|
||||
"/var/lib/matrix-synapse/signal-registration.yaml"
|
||||
"/var/lib/matrix-as-whatsapp/whatsapp-registration.yaml"
|
||||
#"/var/lib/matrix-as-whatsapp/whatsapp-registration.yaml"
|
||||
"/var/lib/matrix-as-discord/discord-registration.yaml"
|
||||
# "/var/lib/matrix-synapse/slack-registration.yaml"
|
||||
# "/var/lib/matrix-synapse/discord-registration.yaml"
|
||||
|
||||
@@ -2,17 +2,17 @@
|
||||
|
||||
{
|
||||
# Mautrix-signal settings
|
||||
services.signald.enable = true;
|
||||
systemd.services.matrix-as-signal = {
|
||||
requires = [ "signald.service" ];
|
||||
after = [ "signald.service" ];
|
||||
unitConfig = {
|
||||
JoinsNamespaceOf = "signald.service";
|
||||
};
|
||||
path = [
|
||||
pkgs.ffmpeg # voice messages need `ffmpeg`
|
||||
];
|
||||
};
|
||||
# services.signald.enable = true;
|
||||
# systemd.services.matrix-as-signal = {
|
||||
# requires = [ "signald.service" ];
|
||||
# after = [ "signald.service" ];
|
||||
# unitConfig = {
|
||||
# JoinsNamespaceOf = "signald.service";
|
||||
# };
|
||||
# path = [
|
||||
# pkgs.ffmpeg # voice messages need `ffmpeg`
|
||||
# ];
|
||||
# };
|
||||
|
||||
services.matrix-appservices = {
|
||||
addRegistrationFiles = false;
|
||||
@@ -25,28 +25,28 @@
|
||||
# package = pkgs.mautrix-whatsapp;
|
||||
# };
|
||||
|
||||
# discord = {
|
||||
# port = 29188;
|
||||
# format = "mautrix-go";
|
||||
# package = pkgs.unstable.mautrix-discord;
|
||||
# };
|
||||
|
||||
signal = {
|
||||
port = 29184;
|
||||
format = "mautrix-python";
|
||||
package = pkgs.mautrix-signal;
|
||||
serviceConfig = {
|
||||
StateDirectory = [ "matrix-as-signal" "signald" ];
|
||||
SupplementaryGroups = [ "signald" ];
|
||||
TimeoutStopSec = 1; # work around the service ignoring SIGTERM, see https://gitlab.com/coffeetables/nix-matrix-appservices/-/issues/12
|
||||
User = lib.mkForce config.services.signald.user;
|
||||
Group = lib.mkForce config.services.signald.group;
|
||||
};
|
||||
settings.signal = {
|
||||
socket_path = config.services.signald.socketPath;
|
||||
outgoing_attachment_dir = "/var/lib/signald/tmp";
|
||||
};
|
||||
discord = {
|
||||
port = 29188;
|
||||
format = "mautrix-go";
|
||||
package = pkgs.mautrix-discord;
|
||||
};
|
||||
|
||||
# signal = {
|
||||
# port = 29184;
|
||||
# format = "mautrix-python";
|
||||
# package = pkgs.mautrix-signal;
|
||||
# serviceConfig = {
|
||||
# # StateDirectory = [ "matrix-as-signal" "signald" ];
|
||||
# # SupplementaryGroups = [ "signald" ];
|
||||
# TimeoutStopSec = 1; # work around the service ignoring SIGTERM, see https://gitlab.com/coffeetables/nix-matrix-appservices/-/issues/12
|
||||
# # User = lib.mkForce config.services.signald.user;
|
||||
# # Group = lib.mkForce config.services.signald.group;
|
||||
# };
|
||||
# # settings.signal = {
|
||||
# # socket_path = config.services.signald.socketPath;
|
||||
# # outgoing_attachment_dir = "/var/lib/signald/tmp";
|
||||
# # };
|
||||
# };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,7 +22,8 @@
|
||||
bespokesynth
|
||||
lsp-plugins
|
||||
helio-workstation
|
||||
projectm # milkdrop visualizer
|
||||
# projectm # milkdrop visualizer
|
||||
# i think it's projectm-sdl-cpp now
|
||||
|
||||
# DAWs
|
||||
# ardour
|
||||
@@ -30,7 +31,7 @@
|
||||
# renoise
|
||||
];
|
||||
|
||||
hardware.pulseaudio.enable = lib.mkForce false;
|
||||
services.pulseaudio.enable = false;
|
||||
security.rtkit.enable = false;
|
||||
|
||||
services.pipewire = {
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
package = pkgs.radicale;
|
||||
settings = {
|
||||
server.hosts = [ "0.0.0.0:5252" ];
|
||||
auth.type = "none";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user