diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index de58678..d93b66d 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -27,7 +27,7 @@ args@{
#./optional/gui/x11.nix
./optional/gui/wayland.nix
- ./printing.nix
+# ./printing.nix
# ./ollama.nix
];
@@ -105,6 +105,7 @@ args@{
'';
settings.PermitRootLogin = "yes";
};
+ pulseaudio.enable = false;
pipewire = {
enable = true;
audio.enable = true;
@@ -129,9 +130,9 @@ args@{
# - IDEs
#jetbrains-toolbox
- #jetbrains.rider
(jetbrains.plugins.addPlugins jetbrains.webstorm [ "github-copilot" ])
- (jetbrains.plugins.addPlugins jetbrains.clion [ "github-copilot" "string-manipulation" "nixidea" "visual-studio-keymap" ])
+ (jetbrains.plugins.addPlugins jetbrains.clion [ "github-copilot" "nixidea" "visual-studio-keymap" ]) #"string-manipulation"
+ #jetbrains.rider
#jetbrains.clion
#github-copilot-intellij-agent
@@ -264,10 +265,6 @@ args@{
sudo.wheelNeedsPassword = false;
};
- hardware = {
- pulseaudio.enable = false;
- };
-
programs.dconf.enable = true;
#networking.wireguard.interfaces = {
diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index d6873ee..9448569 100644
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -90,20 +90,6 @@
# conduit = conduit;
#};
- services.pgadmin = {
- enable = false;
- initialEmail = "root@localhost.localdomain";
- initialPasswordFile = "/etc/matrix-user-pass";
- };
- containers."draupnir-cme" = import ./services/containers/draupnir-cme/container.nix {
- inherit pkgs lib nixpkgs-Draupnir;
- };
- containers."draupnir-fedora" = import ./services/containers/draupnir-fedora/container.nix {
- inherit pkgs lib nixpkgs-Draupnir;
- };
-
- #containers."draupnir-linux-mint" = import ./services/containers/draupnir-linux-mint/container.nix { inherit pkgs lib nixpkgs-Draupnir; };
-
system.stateVersion = "22.11"; # DO NOT EDIT!
environment.systemPackages = with pkgs; [ waypipe ];
diff --git a/host/Rory-nginx/hooks/post-rebuild.sh b/host/Rory-nginx/hooks/post-rebuild.sh
index 9b0c17c..198b7e6 100755
--- a/host/Rory-nginx/hooks/post-rebuild.sh
+++ b/host/Rory-nginx/hooks/post-rebuild.sh
@@ -1,6 +1,7 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused nix coreutils jq openssl
#set -x
+exit
REG_KEY=`cat /var/lib/matrix-synapse/registration_shared_secret.txt`
LOCALPART='rory.gay'
REACHABLE_DOMAIN='http://localhost:8008'
diff --git a/host/Rory-nginx/services/containers/draupnir-cme/container.nix b/host/Rory-nginx/services/containers/draupnir-cme/container.nix
deleted file mode 100644
index 7b87264..0000000
--- a/host/Rory-nginx/services/containers/draupnir-cme/container.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ nixpkgs-Draupnir, ... }:
-
-{
- privateNetwork = true;
- autoStart = true;
- specialArgs = {
- inherit nixpkgs-Draupnir;
- };
- config =
- { lib, pkgs, ... }:
- {
- imports = [
- ../shared.nix
- ./root.nix
- ./services/draupnir.nix
- "${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix"
- ];
- nixpkgs.overlays = [
- (final: prev: {
- draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
- })
- ];
- };
- hostAddress = "192.168.100.1";
- localAddress = "192.168.100.17";
-
- bindMounts."draupnir-access-token" = {
- hostPath = "/etc/draupnir-cme-access-token";
- mountPoint = "/etc/draupnir-access-token";
- isReadOnly = true;
- };
-}
diff --git a/host/Rory-nginx/services/containers/draupnir-cme/root.nix b/host/Rory-nginx/services/containers/draupnir-cme/root.nix
deleted file mode 100644
index 0ebce9e..0000000
--- a/host/Rory-nginx/services/containers/draupnir-cme/root.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ ... }:
-
-{
- networking.useHostResolvConf = true;
-
- networking.hosts = {
- "192.168.100.1" = [
- "matrix.rory.gay"
- "rory.gay"
- ];
- };
-
- networking.firewall = {
- enable = true;
- };
-}
diff --git a/host/Rory-nginx/services/containers/draupnir-cme/services/draupnir.nix b/host/Rory-nginx/services/containers/draupnir-cme/services/draupnir.nix
deleted file mode 100644
index cf59809..0000000
--- a/host/Rory-nginx/services/containers/draupnir-cme/services/draupnir.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ ... }:
-
-{
- services.draupnir = {
- enable = true;
- accessTokenFile = "/etc/draupnir-access-token";
- homeserverUrl = "https://matrix.rory.gay";
-
- settings = {
- managementRoom = "#draupnir-cme:rory.gay";
- recordIgnoredInvites = true; # We want to be aware of invites
- autojoinOnlyIfManager = true; # ... but we don't want the bot to be invited to eg. Matrix HQ...
- automaticallyRedactForReasons = [ "*" ]; # Always autoredact
- fasterMembershipChecks = true;
-
- backgroundDelayMS = 10; # delay isn't needed, I don't mind the performance hit
- pollReports = false;
-
- admin.enableMakeRoomAdminCommand = false;
- commands.ban.defaultReasons = [ "spam" ];
- };
- };
-}
diff --git a/host/Rory-nginx/services/containers/draupnir-fedora/container.nix b/host/Rory-nginx/services/containers/draupnir-fedora/container.nix
deleted file mode 100644
index 82683d7..0000000
--- a/host/Rory-nginx/services/containers/draupnir-fedora/container.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ nixpkgs-Draupnir, ... }:
-
-{
- privateNetwork = true;
- autoStart = true;
- specialArgs = {
- inherit nixpkgs-Draupnir;
- };
- config =
- { lib, pkgs, ... }:
- {
- imports = [
- ../shared.nix
- ./root.nix
- ./services/draupnir.nix
- "${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix"
- ];
- nixpkgs.overlays = [
- (final: prev: {
- draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
- })
- ];
- };
- hostAddress = "192.168.100.1";
- localAddress = "192.168.100.18";
-
- bindMounts."draupnir-access-token" = {
- hostPath = "/etc/draupnir-fedora-access-token";
- mountPoint = "/etc/draupnir-access-token";
- isReadOnly = true;
- };
-}
diff --git a/host/Rory-nginx/services/containers/draupnir-fedora/root.nix b/host/Rory-nginx/services/containers/draupnir-fedora/root.nix
deleted file mode 100644
index 0ebce9e..0000000
--- a/host/Rory-nginx/services/containers/draupnir-fedora/root.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ ... }:
-
-{
- networking.useHostResolvConf = true;
-
- networking.hosts = {
- "192.168.100.1" = [
- "matrix.rory.gay"
- "rory.gay"
- ];
- };
-
- networking.firewall = {
- enable = true;
- };
-}
diff --git a/host/Rory-nginx/services/containers/draupnir-fedora/services/draupnir.nix b/host/Rory-nginx/services/containers/draupnir-fedora/services/draupnir.nix
deleted file mode 100644
index 6573f4c..0000000
--- a/host/Rory-nginx/services/containers/draupnir-fedora/services/draupnir.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ ... }:
-
-{
- services.draupnir = {
- enable = true;
- accessTokenFile = "/etc/draupnir-access-token";
- homeserverUrl = "https://matrix.rory.gay";
-
- settings = {
- managementRoom = "#draupnir-fedora-mgmt:rory.gay";
- recordIgnoredInvites = true; # We want to be aware of invites
- autojoinOnlyIfManager = true; # ... but we don't want the bot to be invited to eg. Matrix HQ...
- automaticallyRedactForReasons = [ "*" ]; # Always autoredact
- fasterMembershipChecks = true;
-
- backgroundDelayMS = 10; # delay isn't needed, I don't mind the performance hit
- pollReports = false;
-
- admin.enableMakeRoomAdminCommand = false;
- commands.ban.defaultReasons = [ "spam" ];
- };
- };
-}
diff --git a/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix b/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix
deleted file mode 100644
index 41d25c5..0000000
--- a/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ nixpkgs-Draupnir, ... }:
-
-{
- privateNetwork = true;
- autoStart = true;
- specialArgs = {
- inherit nixpkgs-Draupnir;
- };
- config =
- { lib, pkgs, ... }:
- {
- imports = [
- ../shared.nix
- ./root.nix
- ./services/draupnir.nix
- "${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix"
- ];
- nixpkgs.overlays = [
- (final: prev: {
- draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
- })
- ];
- };
- hostAddress = "192.168.100.1";
- localAddress = "192.168.100.19";
-
- bindMounts."draupnir-access-token" = {
- hostPath = "/etc/draupnir-linux-mint-access-token";
- mountPoint = "/etc/draupnir-access-token";
- isReadOnly = true;
- };
-}
diff --git a/host/Rory-nginx/services/containers/draupnir-linux-mint/root.nix b/host/Rory-nginx/services/containers/draupnir-linux-mint/root.nix
deleted file mode 100644
index 2adac62..0000000
--- a/host/Rory-nginx/services/containers/draupnir-linux-mint/root.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-
-{
- networking.useHostResolvConf = true;
-
- networking.hosts = {
- "192.168.100.18" = [
- "matrix.rory.gay"
- "rory.gay"
- ];
- };
-
- networking.firewall = {
- enable = true;
- };
-}
diff --git a/host/Rory-nginx/services/containers/draupnir-linux-mint/services/draupnir.nix b/host/Rory-nginx/services/containers/draupnir-linux-mint/services/draupnir.nix
deleted file mode 100644
index 042651a..0000000
--- a/host/Rory-nginx/services/containers/draupnir-linux-mint/services/draupnir.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ ... }:
-
-{
- services.draupnir = {
- enable = true;
- accessTokenFile = "/etc/draupnir-access-token";
- homeserverUrl = "https://matrix.rory.gay";
-
- settings = {
- managementRoom = "#draupnir-linux-mint:rory.gay";
- recordIgnoredInvites = true; # We want to be aware of invites
- autojoinOnlyIfManager = true; # ... but we don't want the bot to be invited to eg. Matrix HQ...
- automaticallyRedactForReasons = [ "*" ]; # Always autoredact
- fasterMembershipChecks = true;
-
- backgroundDelayMS = 10; # delay isn't needed, I don't mind the performance hit
- pollReports = false;
-
- admin.enableMakeRoomAdminCommand = false;
- commands.ban.defaultReasons = [
- "spam"
- "code of conduct violation"
- ];
- };
- };
-}
diff --git a/host/Rory-nginx/services/email/autoconfig.nix b/host/Rory-nginx/services/email/autoconfig.nix
deleted file mode 100644
index d258046..0000000
--- a/host/Rory-nginx/services/email/autoconfig.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ ... }:
-{
- services.go-autoconfig = {
- enable = true;
- settings = {
- service_addr = ":1323";
- domain = "autoconfig.rory.gay";
- imap = {
- server = "rory.gay";
- port = 993;
- };
- smtp = {
- server = "rory.gay";
- port = 587;
- };
- };
- };
-}
diff --git a/host/Rory-nginx/services/email/maddy.conf b/host/Rory-nginx/services/email/maddy.conf
deleted file mode 100644
index 1d3eb2f..0000000
--- a/host/Rory-nginx/services/email/maddy.conf
+++ /dev/null
@@ -1,124 +0,0 @@
-
-# Minimal configuration with TLS disabled, adapted from upstream example
-# configuration here https://github.com/foxcpp/maddy/blob/master/maddy.conf
-# Do not use this in production!
-
-auth.pass_table local_authdb {
- table sql_table {
- driver sqlite3
- dsn credentials.db
- table_name passwords
- }
-}
-
-storage.imapsql local_mailboxes {
- driver sqlite3
- dsn imapsql.db
-}
-
-table.chain local_rewrites {
- optional_step regexp "(.+)\+(.+)@(.+)" "$1@$3"
- optional_step static {
- entry postmaster root@$(primary_domain)
- }
- optional_step file /etc/maddy/aliases
-}
-
-msgpipeline local_routing {
- destination postmaster $(local_domains) {
- modify {
- replace_rcpt &local_rewrites
- }
- deliver_to &local_mailboxes
- }
- default_destination {
- reject 550 5.1.1 "User doesn't exist"
- }
-}
-
-smtp tcp://0.0.0.0:25 {
- limits {
- all rate 20 1s
- all concurrency 10
- }
- dmarc yes
- check {
- require_mx_record
- dkim
- spf
- }
- source $(local_domains) {
- reject 501 5.1.8 "Use Submission for outgoing SMTP"
- }
- default_source {
- destination postmaster $(local_domains) {
- deliver_to &local_routing
- }
- default_destination {
- reject 550 5.1.1 "User doesn't exist"
- }
- }
-}
-
-submission tls://0.0.0.0:465 tcp://0.0.0.0:587 {
- limits {
- all rate 50 1s
- }
- auth &local_authdb
- source $(local_domains) {
- check {
- authorize_sender {
- prepare_email &local_rewrites
- user_to_email identity
- }
- }
- destination postmaster $(local_domains) {
- deliver_to &local_routing
- }
- default_destination {
- modify {
- dkim $(primary_domain) $(local_domains) default
- }
- deliver_to &remote_queue
- }
- }
- default_source {
- reject 501 5.1.8 "Non-local sender domain"
- }
-}
-
-target.remote outbound_delivery {
- limits {
- destination rate 20 1s
- destination concurrency 10
- }
- mx_auth {
- dane
- mtasts {
- cache fs
- fs_dir mtasts_cache/
- }
- local_policy {
- min_tls_level encrypted
- min_mx_level none
- }
- }
-}
-
-target.queue remote_queue {
- target &outbound_delivery
- autogenerated_msg_domain $(primary_domain)
- bounce {
- destination postmaster $(local_domains) {
- deliver_to &local_routing
- }
- default_destination {
- reject 550 5.0.0 "Refusing to send DSNs to non-local addresses"
- }
- }
-}
-
-imap tls://0.0.0.0:993 tcp://0.0.0.0:143 {
- auth &local_authdb
- storage &local_mailboxes
-}
\ No newline at end of file
diff --git a/host/Rory-nginx/services/email/maddy.nix b/host/Rory-nginx/services/email/maddy.nix
deleted file mode 100644
index 07b6e72..0000000
--- a/host/Rory-nginx/services/email/maddy.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- pkgs,
- options,
- config,
- ...
-}:
-{
- services.maddy = {
- enable = true;
- primaryDomain = "rory.gay";
- hostname = "mail.rory.gay";
- ensureAccounts = [
- "root@rory.gay"
- ];
- ensureCredentials = {
- "root@rory.gay".passwordFile = "/var/lib/maddy/passwd/root";
- };
- config = builtins.readFile ./maddy.conf;
- # builtins.replaceStrings
- # [
- # "imap tcp://0.0.0.0:143"
- # "submission tcp://0.0.0.0:587"
- # "entry postmaster postmaster@$(primary_domain)"
- # ]
- # [
- # "imap tls://0.0.0.0:993 tcp://0.0.0.0:143"
- # "submission tls://0.0.0.0:465 tcp://0.0.0.0:587"
- # "entry postmaster root@$(primary_domain)"
- # ]
- # options.services.maddy.config.default;
-
- tls = {
- loader = "file";
- certificates = [
- {
- certPath = "/var/lib/acme/mail.rory.gay/fullchain.pem";
- keyPath = "/var/lib/acme/mail.rory.gay/key.pem";
- }
- ];
- };
- };
-
- networking.firewall.allowedTCPPorts = [
- 993
- 465
- ];
-
- users.users.maddy.extraGroups = [ "nginx" ];
-}
diff --git a/host/Rory-nginx/services/email/nginx.nix b/host/Rory-nginx/services/email/nginx.nix
deleted file mode 100644
index 812993a..0000000
--- a/host/Rory-nginx/services/email/nginx.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ config, ... }:
-{
- services.nginx.virtualHosts = {
- "mta-sts.rory.gay" = {
- enableACME = true;
- forceSSL = true;
- locations = {
- "/.well-known/mta-sts.txt" = {
- # age 604800
- return = ''
- 200 "version: STSv1
- mode: enforce
- max_age: 120
- mx: mail.rory.gay
- "'';
- };
- };
- };
- "mail.rory.gay" = {
- enableACME = true;
- forceSSL = true;
- locations = {
- "/".return = "200 'OK'";
- };
- };
- "autoconfig.rory.gay" = {
- enableACME = true;
- forceSSL = true;
- locations."/".proxyPass = "http://localhost:1323";
- };
- };
-}
diff --git a/host/Rory-nginx/services/email/root.nix b/host/Rory-nginx/services/email/root.nix
deleted file mode 100644
index 7db85d8..0000000
--- a/host/Rory-nginx/services/email/root.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-{
- imports = [
- ./autoconfig.nix
- ./maddy.nix
- ./nginx.nix
- ];
-}
diff --git a/host/Rory-nginx/services/matrix/coturn.nix b/host/Rory-nginx/services/matrix/coturn.nix
deleted file mode 100644
index 805faa9..0000000
--- a/host/Rory-nginx/services/matrix/coturn.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ ... }:
-
-{
- # coturn (WebRTC)
- services.coturn = {
- enable = false; # Alicia - figure out secret first...
- no-cli = true;
- no-tcp-relay = true;
- min-port = 49000;
- max-port = 50000;
- use-auth-secret = true;
- static-auth-secret = "will be world readable for local users :(";
- realm = "turn.example.com";
- # Alicia - figure out how to get this to work, since nginx runs on separate machine...
- #cert = "${config.security.acme.certs.${realm}.directory}/full.pem";
- #pkey = "${config.security.acme.certs.${realm}.directory}/key.pem";
- extraConfig = ''
- # for debugging
- verbose
- # ban private IP ranges
- no-multicast-peers
- denied-peer-ip=0.0.0.0-0.255.255.255
- denied-peer-ip=10.0.0.0-10.255.255.255
- denied-peer-ip=100.64.0.0-100.127.255.255
- denied-peer-ip=127.0.0.0-127.255.255.255
- denied-peer-ip=169.254.0.0-169.254.255.255
- denied-peer-ip=172.16.0.0-172.31.255.255
- denied-peer-ip=192.0.0.0-192.0.0.255
- denied-peer-ip=192.0.2.0-192.0.2.255
- denied-peer-ip=192.88.99.0-192.88.99.255
- denied-peer-ip=192.168.0.0-192.168.255.255
- denied-peer-ip=198.18.0.0-198.19.255.255
- denied-peer-ip=198.51.100.0-198.51.100.255
- denied-peer-ip=203.0.113.0-203.0.113.255
- denied-peer-ip=240.0.0.0-255.255.255.255
- denied-peer-ip=::1
- denied-peer-ip=64:ff9b::-64:ff9b::ffff:ffff
- denied-peer-ip=::ffff:0.0.0.0-::ffff:255.255.255.255
- denied-peer-ip=100::-100::ffff:ffff:ffff:ffff
- denied-peer-ip=2001::-2001:1ff:ffff:ffff:ffff:ffff:ffff:ffff
- denied-peer-ip=2002::-2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff
- denied-peer-ip=fc00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
- denied-peer-ip=fe80::-febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff
- '';
- };
- #services.matrix-synapse = with config.services.coturn; {
- # turn_uris = ["turn:${realm}:3478?transport=udp" "turn:${realm}:3478?transport=tcp"];
- # turn_shared_secret = static-auth-secret;
- # turn_user_lifetime = "1h";
- #};
-
-}
diff --git a/host/Rory-nginx/services/matrix/draupnir.nix b/host/Rory-nginx/services/matrix/draupnir.nix
deleted file mode 100644
index 40d1489..0000000
--- a/host/Rory-nginx/services/matrix/draupnir.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ pkgs, draupnirSrc, ... }:
-
-{
- services.draupnir = {
- #package = (pkgs.draupnir.overrideAttrs (oldAttrs: {
- # src = draupnirSrc;
- # version = draupnirSrc.rev;
- #}));
-
- enable = true;
- homeserverUrl = "https://matrix.rory.gay";
- accessTokenFile = "/etc/draupnir-access-token";
-
- #pantalaimon = {
- # enable = false;
- # username = "draupnir";
- # passwordFile = "/etc/draupnir-password";
- # options = {
- #homeserver = "http://localhost:8008";
- #ssl = false;
- # };
- #};
- settings = {
- managementRoom = "#draupnir-mgmt:rory.gay";
- verboseLogging = false;
- recordIgnoredInvites = true; # Let's log ignored invites, just incase
- autojoinOnlyIfManager = true; # Let's not open ourselves up to DoS attacks
- automaticallyRedactForReasons = [ "*" ]; # I always want autoredact
- fasterMembershipChecks = true;
- #roomStateBackingStore.enabled = true; # broken under nix.
-
- backgroundDelayMS = 10; # delay isn't needed, I don't mind the performance hit
- pollReports = false; # this is a single person homeserver... let's save ourself the work
-
- admin.enableMakeRoomAdminCommand = true;
- commands.ban.defaultReasons = [
- "spam"
- "harassment"
- "transphobia"
- "scam"
- ];
- protections = {
- wordlist = {
- words = [
- "tranny"
- "faggot"
- "ywnbaw"
- "nigger"
- ];
- minutesBeforeTrusting = 0;
- };
- };
- };
- };
-}
diff --git a/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix b/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix
deleted file mode 100644
index 3041aaa..0000000
--- a/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ ... }:
-
-{
- # Discord bridge
- services.matrix-appservice-discord = {
- enable = false; # Alicia - figure out secret first...
- environmentFile = /etc/keyring/matrix-appservice-discord/tokens.env;
- # The appservice is pre-configured to use SQLite by default.
- # It's also possible to use PostgreSQL.
- settings = {
- bridge = {
- domain = "rory.gay";
- homeserverUrl = "https://matrix.rory.gay";
- };
-
- # The service uses SQLite by default, but it's also possible to use
- # PostgreSQL instead:
- database = {
- # filename = ""; # empty value to disable sqlite
- connString = "postgres://postgres@127.0.0.1/matrix-appservice-discord";
- };
- };
- };
-
-}
diff --git a/host/Rory-nginx/services/matrix/sliding-sync.nix b/host/Rory-nginx/services/matrix/sliding-sync.nix
deleted file mode 100644
index a8fbd0c..0000000
--- a/host/Rory-nginx/services/matrix/sliding-sync.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ ... }:
-{
- services.matrix-sliding-sync = {
- enable = true;
- settings = {
- "SYNCV3_SERVER" = "http://matrix.rory.gay";
- "SYNCV3_DB" = "postgresql://%2Frun%2Fpostgresql/syncv3";
- "SYNCV3_BINDADDR" = "0.0.0.0:8100";
- };
- environmentFile = "/etc/sliding-sync.env";
- };
-}
diff --git a/host/Rory-ovh/hooks/post-rebuild.sh b/host/Rory-ovh/hooks/post-rebuild.sh
index fcab049..f4f5896 100755
--- a/host/Rory-ovh/hooks/post-rebuild.sh
+++ b/host/Rory-ovh/hooks/post-rebuild.sh
@@ -1,6 +1,7 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused nix coreutils jq openssl
#set -x
+exit
REG_KEY=`cat /var/lib/matrix-synapse/registration_shared_secret.txt`
LOCALPART='rory.gay'
REACHABLE_DOMAIN='http://localhost:8008'
|
