gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 20:39:18 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updates

Browse source
This commit is contained in:
kat witch 2022-03-23 11:41:52 +00:00 • committed by kat
parent ff1d56277f
commit e38bb2407d
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
9 changed files with 64 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config/hosts/goliath.nix
View file

@ -3,6 +3,7 @@
profiles.hardware.ms-7b86
profiles.hardware.razer
profiles.hardware.bamboo
profiles.hardware.networkmanager
profiles.gui
profiles.x11
profiles.vfio
@ -282,13 +283,14 @@
hostId = "617050fc";
useDHCP = false;
/*useNetworkd = true;*/
interfaces = {
enp34s0.ipv4.addresses = singleton {
/*interfaces = {
enp34s0 = {
/*ipv4.addresses = singleton {
inherit (config.network.addresses.private.nixos.ipv4) address;
prefixLength = 24;
};
};
defaultGateway = config.network.privateGateway;
defaultGateway = config.network.privateGateway;*/
firewall.allowPing = true;
};

7
config/hosts/yukari.nix
View file

@ -5,6 +5,7 @@
profiles.gui
users.kat.guiFull
services.jellyfin
services.ha
services.nextcloud
services.kattv-ingest
services.kattv2-ingest
@ -88,11 +89,11 @@
networking = {
hostId = "3ef9a419";
useDHCP = false;
interfaces.eno1.ipv4.addresses = singleton {
interfaces.eno1.useDHCP = true; /*.ipv4.addresses = singleton {
inherit (config.network.addresses.private.nixos.ipv4) address;
prefixLength = 24;
};
defaultGateway = config.network.privateGateway;
defaultGateway = config.network.privateGateway; */
};
network = {
@ -100,7 +101,7 @@
private = {
enable = true;
nixos = {
ipv4.address = "192.168.1.2";
ipv4.address = "192.168.1.154";
# TODO ipv6.address
};
};

2
config/modules/nixos/wireguard-tf.nix
View file

@ -14,7 +14,7 @@ in {
type = "resource";
provisioners = singleton {
local-exec.command = let
wg = "${pkgs.buildPackages.wireguard}/bin/wg";
wg = "${pkgs.buildPackages.wireguard-tools}/bin/wg";
in "${wg} genkey | tee ${dataDir + "/wg-private-${terraformSelf "id"}"} | ${wg} pubkey > ${dataDir + "/wg-public-${terraformSelf "id"}"}";
};
};

2
config/profiles/base/nix.nix
View file

@ -19,7 +19,7 @@
};
settings = {
experimental-features = lib.optional (lib.versionAtLeast config.nix.package.version "2.4") "nix-command flakes";
substituters = [ "https://arc.cachix.org" "https://kittywitch.cachix.org" "https://nix-community.cachix.org" "https://nixcache.reflex-frp.org" ];
substituters = [ "https://arc.cachix.org" "https://kittywitch.cachix.org" "https://nix-community.cachix.org" ];
trusted-public-keys =
[ "arc.cachix.org-1:DZmhclLkB6UO0rc0rBzNpwFbbaeLfyn+fYccuAy7YVY=" "kittywitch.cachix.org-1:KIzX/G5cuPw5WgrXad6UnrRZ8UDr7jhXzRTK/lmqyK0=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI=" ];
auto-optimise-store = true;

2
config/profiles/gui/filesystems.nix
View file

@ -1,5 +1,5 @@
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [ ntfs3g exfat-utils ];
environment.systemPackages = with pkgs; [ ntfs3g exfat ];
}

21
config/services/ha.nix Normal file
View file

@ -0,0 +1,21 @@
{ config, ... }: {
services.home-assistant = {
enable = true;
config = null;
extraComponents = [
"zha"
"esphome"
"met"
"default_config"
"google"
"google_assistant"
"google_cloud"
"google_translate"
"homekit"
"zeroconf"
"luci"
];
};
network.firewall.public.tcp.ports = [ 8123 ];
}

56
config/services/synapse.nix
View file

@ -154,7 +154,6 @@ CONFIG = {
config.secrets.files.mautrix-telegram-env.path;
services.matrix-synapse = {
enable = true;
max_upload_size = "512M";
logConfig = ''
version: 1
formatters:
@ -180,21 +179,35 @@ CONFIG = {
level: WARNING
handlers: [console]
'';
server_name = config.network.dns.domain;
app_service_config_files = [
"/var/lib/matrix-synapse/telegram-registration.yaml"
"/var/lib/matrix-synapse/discord-registration.yaml"
"/var/lib/matrix-synapse/whatsapp-registration.yaml"
];
rc_messages_per_second = mkDefault "0.1";
rc_message_burst_count = mkDefault "25.0";
public_baseurl = "https://${config.network.dns.domain}";
url_preview_enabled = mkDefault true;
enable_registration = mkDefault false;
enable_metrics = mkDefault false;
report_stats = mkDefault false;
dynamic_thumbnails = mkDefault true;
allow_guest_access = mkDefault true;
settings = {
server_name = config.network.dns.domain;
app_service_config_files = [
"/var/lib/matrix-synapse/telegram-registration.yaml"
"/var/lib/matrix-synapse/discord-registration.yaml"
"/var/lib/matrix-synapse/whatsapp-registration.yaml"
];
max_upload_size = "512M";
rc_messages_per_second = mkDefault "0.1";
rc_message_burst_count = mkDefault "25.0";
public_baseurl = "https://${config.network.dns.domain}";
url_preview_enabled = mkDefault true;
enable_registration = mkDefault false;
enable_metrics = mkDefault false;
report_stats = mkDefault false;
dynamic_thumbnails = mkDefault true;
allow_guest_access = mkDefault true;
listeners = [{
port = 8008;
bind_address = "::1";
type = "http";
tls = false;
x_forwarded = true;
resources = [{
names = [ "client" "federation" ];
compress = false;
}];
}];
};
extraConfig = ''
suppress_key_server_warning: true
saml2_config:
@ -208,17 +221,6 @@ CONFIG = {
password_config:
enabled: false
'';
listeners = [{
port = 8008;
bind_address = "::1";
type = "http";
tls = false;
x_forwarded = true;
resources = [{
names = [ "client" "federation" ];
compress = false;
}];
}];
};
services.mautrix-telegram = {

2
config/tf

@ -1 +1 @@
Subproject commit 1b7ca814a7cb07f6bbf168f6ec234c4421adcfe3
Subproject commit 1c019e026cb270aec9471aba005a7e46dddb985c

2
config/users/kat/gui/konawall.nix
View file

@ -10,7 +10,7 @@ with lib;
commonTags = [ "width:>=1600" ];
tagList = map (toList) [
(["score:>=50"
"touhou" "rating:s"]) #++ optional (nixos.networking.hostName == "koishi") "rating:s")
"touhou"]) #++ optional (nixos.networking.hostName == "koishi") "rating:s")
];
};
}