idk conduit und ricing und caddyfile

This commit is contained in:
xqtc 2024-09-09 20:41:48 +02:00
parent ef54cb23bf
commit 870755f79b
7 changed files with 116 additions and 62 deletions

View file

@ -94,7 +94,7 @@
lib, lib,
... ...
}: { }: {
services.proxmox-ve.enable = true; services.proxmox-ve.enable = false;
nixpkgs.overlays = [ nixpkgs.overlays = [
proxmox-nixos.overlays.${system} proxmox-nixos.overlays.${system}
]; ];

View file

@ -19,10 +19,10 @@ exec-once = waybar & swww init & mako & kwalletd6 & nextcloud
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
input { input {
kb_layout = us kb_layout = us,de
kb_variant = kb_variant =
kb_model = kb_model =
kb_options = kb_options = grp:win_space_toggle
kb_rules = kb_rules =
follow_mouse = 1 follow_mouse = 1

View file

@ -15,7 +15,11 @@
extraConfig = builtins.readFile ../config-files/hyprland.conf; extraConfig = builtins.readFile ../config-files/hyprland.conf;
}; };
programs.waybar = /* lib.mkIf (pkgs.system == "x86_64-linux") */ { programs.waybar =
/*
lib.mkIf (pkgs.system == "x86_64-linux")
*/
{
enable = true; enable = true;
settings = { settings = {
mainBar = { mainBar = {

View file

@ -0,0 +1,26 @@
{
config,
lib,
inputs,
...
}: {
services.matrix-conduit = {
enable = true;
settings = {
global = {
server_name = "matrix.heroin.trade";
allow_federation = true;
allow_encryption = true;
allow_registration = false;
max_request_size = 20000000;
port = 6167;
database_backend = "sqlite";
};
extraEnvironment = {
CONDUIT_MAX_CONCURRENT_REQUESTS = "100";
};
};
};
networking.firewall.allowedTCPPorts = [config.services.matrix-conduit.settings.global.port];
}

View file

@ -15,6 +15,7 @@ with lib; {
./fail2ban.nix ./fail2ban.nix
./lanrarari.nix ./lanrarari.nix
# ./hydra.nix # ./hydra.nix
./conduit.nix
./uptime.nix ./uptime.nix
./networking.nix ./networking.nix
./git.nix ./git.nix
@ -44,6 +45,11 @@ with lib; {
file_server file_server
''; '';
}; };
"matrix.heroin.trade" = {
extraConfig = ''
reverse_proxy /_matrix/* 127.0.0.1:${builtins.toString config.services.matrix-conduit.settings.global.port}
'';
};
"hydra.heroin.trade" = { "hydra.heroin.trade" = {
extraConfig = '' extraConfig = ''
reverse_proxy http://localhost:${builtins.toString config.services.hydra.port} reverse_proxy http://localhost:${builtins.toString config.services.hydra.port}
@ -123,6 +129,12 @@ with lib; {
reverse_proxy http://127.0.0.1:8085 reverse_proxy http://127.0.0.1:8085
''; '';
}; };
"marie.software" = {
extraConfig = ''
root * /var/www/marie-website/
file_server
'';
};
"servers" = { "servers" = {
extraConfig = '' extraConfig = ''
metrics metrics
@ -169,6 +181,18 @@ with lib; {
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJYa+LoHGGvu12iBufUcr3GD8tsq4LuJdwLjaDkTr0SL xqtc@lilith" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJYa+LoHGGvu12iBufUcr3GD8tsq4LuJdwLjaDkTr0SL xqtc@lilith"
]; ];
}; };
users.users.marie = {
isNormalUser = true;
packages = with pkgs; [
git
wget
];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN0mGd4YS4f3Wy+a4PBXbie42C5Qo4H0uWsN7joaK27h marie@titania"
];
};
users.users.root.openssh.authorizedKeys.keys = [ users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJTLJqIVwnqFO64rnc66d234TFOdFXpDS9fJUA4/f4in xqtc@alastor" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJTLJqIVwnqFO64rnc66d234TFOdFXpDS9fJUA4/f4in xqtc@alastor"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7UkcmSVo+SeB5Obevz3mf3UHruYxn0UHUzoOs2gDBy xqtc@asmodeus" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7UkcmSVo+SeB5Obevz3mf3UHruYxn0UHUzoOs2gDBy xqtc@asmodeus"