diff --git a/modules/base.nix b/modules/base.nix
index 44909aa..386ba73 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -175,10 +175,10 @@
virtualisation = {
memorySize = 8192;
cores = 6;
- msize = 1*1024*1024;
+ msize = 1 * 1024 * 1024;
bios = pkgs.qboot;
};
-
+
monitoring.monitorAll = lib.mkForce false;
services.promtail.enable = lib.mkForce false;
networking.useDHCP = lib.mkOverride 51 true;
diff --git a/modules/software-templates/steam.nix b/modules/software-templates/steam.nix
index ac548a7..2054b7d 100644
--- a/modules/software-templates/steam.nix
+++ b/modules/software-templates/steam.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
programs.steam = {
enable = true;
gamescopeSession.enable = true;
@@ -7,9 +8,9 @@
proton-ge-bin
];
};
-
+
environment.systemPackages = with pkgs; [
steam-run
steam-acf
];
-}
\ No newline at end of file
+}
diff --git a/modules/software-templates/synapse-workers/generic.nix b/modules/software-templates/synapse-workers/generic.nix
index 7fa3967..899f156 100644
--- a/modules/software-templates/synapse-workers/generic.nix
+++ b/modules/software-templates/synapse-workers/generic.nix
@@ -29,8 +29,8 @@ let
++ lib.optional (lib.elem "stream_events" tasks) "events";
# recursive update list of attrs
-# recursiveMerge = list: lib.foldl (a: b: lib.recursiveUpdate a b) (lib.head list) (lib.tail list);
-# workerRoutes = recursiveMerge (lib.map (type: workerLib.workerRoutes.${type}) streamTypes);
+ # recursiveMerge = list: lib.foldl (a: b: lib.recursiveUpdate a b) (lib.head list) (lib.tail list);
+ # workerRoutes = recursiveMerge (lib.map (type: workerLib.workerRoutes.${type}) streamTypes);
in
{
config = lib.mkIf (cfg.accountDataStreamWriters > 0) {
@@ -84,7 +84,9 @@ in
];
}) enabledResources;
database = lib.recursiveUpdate (lib.recursiveUpdate config.services.matrix-synapse.settings.database {
- application_name = "matrix-synapse (${config.services.matrix-synapse.settings.server_name}) - ${if workerName == null then throw "synapse/db.nix: workerName unspecified" else workerName}";
+ application_name = "matrix-synapse (${config.services.matrix-synapse.settings.server_name}) - ${
+ if workerName == null then throw "synapse/db.nix: workerName unspecified" else workerName
+ }";
}) dbOverrides;
#region Media
diff --git a/modules/software-templates/synapse-workers/generic/auth.nix b/modules/software-templates/synapse-workers/generic/auth.nix
index 47064be..2ba5901 100644
--- a/modules/software-templates/synapse-workers/generic/auth.nix
+++ b/modules/software-templates/synapse-workers/generic/auth.nix
@@ -23,7 +23,7 @@ in
};
}) workers
);
-
+
media_instance_running_background_jobs = lib.mkIf (lib.elem "media_repo_background" tasks) "${workerName}";
enable_media_repo = lib.mkIf (lib.elem "media_repo" tasks) false;
};
diff --git a/modules/software-templates/synapse-workers/generic/client-reader.nix b/modules/software-templates/synapse-workers/generic/client-reader.nix
index 9072988..3192860 100644
--- a/modules/software-templates/synapse-workers/generic/client-reader.nix
+++ b/modules/software-templates/synapse-workers/generic/client-reader.nix
@@ -23,7 +23,7 @@ in
};
}) workers
);
-
+
media_instance_running_background_jobs = lib.mkIf (lib.elem "media_repo_background" tasks) "${workerName}";
enable_media_repo = lib.mkIf (lib.elem "media_repo" tasks) false;
};
diff --git a/modules/software-templates/synapse-workers/generic/event-creator.nix b/modules/software-templates/synapse-workers/generic/event-creator.nix
index e035405..6f1f4b3 100644
--- a/modules/software-templates/synapse-workers/generic/event-creator.nix
+++ b/modules/software-templates/synapse-workers/generic/event-creator.nix
@@ -23,7 +23,7 @@ in
};
}) workers
);
-
+
media_instance_running_background_jobs = lib.mkIf (lib.elem "media_repo_background" tasks) "${workerName}";
enable_media_repo = lib.mkIf (lib.elem "media_repo" tasks) false;
};
diff --git a/modules/software-templates/synapse-workers/generic/federation-inbound.nix b/modules/software-templates/synapse-workers/generic/federation-inbound.nix
index af18e8e..8fa991d 100644
--- a/modules/software-templates/synapse-workers/generic/federation-inbound.nix
+++ b/modules/software-templates/synapse-workers/generic/federation-inbound.nix
@@ -23,7 +23,7 @@ in
};
}) workers
);
-
+
media_instance_running_background_jobs = lib.mkIf (lib.elem "media_repo_background" tasks) "${workerName}";
enable_media_repo = lib.mkIf (lib.elem "media_repo" tasks) false;
};
diff --git a/modules/software-templates/synapse-workers/generic/federation-reader.nix b/modules/software-templates/synapse-workers/generic/federation-reader.nix
index 09e8419..acedf32 100644
--- a/modules/software-templates/synapse-workers/generic/federation-reader.nix
+++ b/modules/software-templates/synapse-workers/generic/federation-reader.nix
@@ -23,7 +23,7 @@ in
};
}) workers
);
-
+
media_instance_running_background_jobs = lib.mkIf (lib.elem "media_repo_background" tasks) "${workerName}";
enable_media_repo = lib.mkIf (lib.elem "media_repo" tasks) false;
};
diff --git a/modules/software-templates/synapse-workers/generic/federation-sender.nix b/modules/software-templates/synapse-workers/generic/federation-sender.nix
index bf6cf51..ce4e75d 100644
--- a/modules/software-templates/synapse-workers/generic/federation-sender.nix
+++ b/modules/software-templates/synapse-workers/generic/federation-sender.nix
@@ -5,7 +5,7 @@ let
workers = lib.range 0 (cfg.federationSenders - 1);
workerName = "federation_sender";
tasks = [ ];
- workerRoutes = {};
+ workerRoutes = { };
enabledResources = lib.attrNames workerRoutes;
in
{
@@ -21,16 +21,16 @@ in
};
}) workers
);
-
+
# Federation sender
send_federation = lib.mkIf (lib.elem "federation_sender" tasks) false;
federation_sender_instances = lib.mkIf (lib.elem "federation_sender" tasks) [ workerName ];
outbound_federation_restricted_to = lib.mkIf (lib.elem "federation_sender" tasks) [ workerName ];
worker_replication_secret = "${workerName}_secret";
-
+
# Pusher
pusher_instances = lib.optional (lib.elem "pusher" tasks) "${workerName}";
-
+
# Media repo
media_instance_running_background_jobs = lib.mkIf (lib.elem "media_repo_background" tasks) "${workerName}";
enable_media_repo = lib.mkIf (lib.elem "media_repo" tasks) false;
@@ -71,7 +71,7 @@ in
workerName = "${workerName}-${toString index}";
}
);
-
+
# Media repo
enable_media_repo = lib.elem "media_repo" tasks;
rc_federation = {
diff --git a/modules/software-templates/synapse-workers/generic/pusher.nix b/modules/software-templates/synapse-workers/generic/pusher.nix
index 8c6b697..5d5b4ff 100644
--- a/modules/software-templates/synapse-workers/generic/pusher.nix
+++ b/modules/software-templates/synapse-workers/generic/pusher.nix
@@ -5,7 +5,7 @@ let
workers = lib.range 0 (cfg.pushers - 1);
workerName = "pusher";
tasks = [ ];
- workerRoutes = {};
+ workerRoutes = { };
enabledResources = lib.attrNames workerRoutes;
in
{
diff --git a/modules/software-templates/synapse-workers/generic/sync.nix b/modules/software-templates/synapse-workers/generic/sync.nix
index eb47e59..cafe4e2 100644
--- a/modules/software-templates/synapse-workers/generic/sync.nix
+++ b/modules/software-templates/synapse-workers/generic/sync.nix
@@ -23,7 +23,7 @@ in
};
}) workers
);
-
+
media_instance_running_background_jobs = lib.mkIf (lib.elem "media_repo_background" tasks) "${workerName}";
enable_media_repo = lib.mkIf (lib.elem "media_repo" tasks) false;
};
diff --git a/modules/software-templates/synapse-workers/lib.nix b/modules/software-templates/synapse-workers/lib.nix
index c99e2ef..010ff8a 100644
--- a/modules/software-templates/synapse-workers/lib.nix
+++ b/modules/software-templates/synapse-workers/lib.nix
@@ -129,16 +129,16 @@
presence.client = [
"~ ^/_matrix/client/(api/v1|r0|v3|unstable)/presence/"
];
-
+
accountData.client = [
"~ ^/_matrix/client/(r0|v3|unstable)/account_data"
"~ ^/_matrix/client/(r0|v3|unstable)/rooms/.*/account_data"
"~ ^/_matrix/client/(r0|v3|unstable)/rooms/.*/tags"
];
-
+
userDirectory.client = [
"~ ^/_matrix/client/(api/v1|r0|v3|unstable)/user_directory/search$"
-
+
#profile
"~ ^/_matrix/client/v3/profile/.*$"
"~ ^/_matrix/client/v3/profile/.*/(displayname|avatar_url)$"
diff --git a/modules/software-templates/synapse-workers/single/appservice.nix b/modules/software-templates/synapse-workers/single/appservice.nix
index 03a080b..871a7c1 100644
--- a/modules/software-templates/synapse-workers/single/appservice.nix
+++ b/modules/software-templates/synapse-workers/single/appservice.nix
@@ -6,7 +6,7 @@ let
dbGroup = "small";
workerName = "appservice";
tasks = [ "appservice" ];
- workerRoutes = {};
+ workerRoutes = { };
enabledResources = lib.attrNames workerRoutes;
in
{
diff --git a/modules/software-templates/synapse-workers/stream-writers/account_data-stream-writer.nix b/modules/software-templates/synapse-workers/stream-writers/account_data-stream-writer.nix
index 3f8363a..33ccc25 100644
--- a/modules/software-templates/synapse-workers/stream-writers/account_data-stream-writer.nix
+++ b/modules/software-templates/synapse-workers/stream-writers/account_data-stream-writer.nix
@@ -4,7 +4,7 @@ let
cfg = config.services.matrix-synapse;
workerLib = import ../lib.nix;
dbGroup = "medium";
-# streamWriterType = "account_data";
+ # streamWriterType = "account_data";
workers = lib.range 0 (cfg.accountDataStreamWriters - 1);
workerName = "account_data_stream_writer";
tasks = [ "stream_account_data" ];
@@ -12,7 +12,8 @@ let
in
let
enabledResources = lib.attrNames workerRoutes;
- streamTypes = []
+ streamTypes =
+ [ ]
++ lib.optional (lib.elem "stream_account_data" tasks) "account_data"
++ lib.optional (lib.elem "stream_presence" tasks) "presence"
++ lib.optional (lib.elem "stream_push_rules" tasks) "push_rules"
@@ -36,7 +37,7 @@ in
);
#stream_writers.${streamWriterType} = lib.map (index: "${workerName}-${toString index}") workers;
-# stream_writers = lib.listToA
+ # stream_writers = lib.listToA
# map `streams` to `workers`
stream_writers = lib.listToAttrs (
lib.map (stream: {
diff --git a/modules/software-templates/synapse-workers/stream-writers/event-stream-writer.nix b/modules/software-templates/synapse-workers/stream-writers/event-stream-writer.nix
index 6abce3f..3c72d46 100644
--- a/modules/software-templates/synapse-workers/stream-writers/event-stream-writer.nix
+++ b/modules/software-templates/synapse-workers/stream-writers/event-stream-writer.nix
@@ -7,8 +7,8 @@ let
workers = lib.range 0 (cfg.eventStreamWriters - 1);
workerName = "event_stream_writer";
tasks = [ ];
- workerRoutes = {};
- enabledResources = [];
+ workerRoutes = { };
+ enabledResources = [ ];
in
{
config = lib.mkIf (cfg.eventStreamWriters > 0) {
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index 9667a3b..dbb2c4a 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -133,7 +133,7 @@
alias ytdl='nix run ${pkgs.path}\#yt-dlp -- -k --console-title --print-traffic'
alias ytdl-mp3='nix run ${pkgs.path}\#yt-dlp -- -k --console-title --print-traffic -x --audio-quality 0 --audio-format mp3 -i'
alias ytdl-mp3l='nix run ${pkgs.path}\#yt-dlp -- --console-title -x --audio-quality 0 --audio-format mp3 -o "%%(playlist)s/%%(playlist_index)s. %%(title)s.%%(ext)s" --download-archive archive.txt --embed-thumbnail --add-metadata -R 100 --http-chunk-size 64M --buffer-size 64M -i'
-
+
[ -f "$HOME/.profile" ] && . $HOME/.profile
'';
#alias knconfig='cp .config ../$(date ''+%Y%m%d_%k%M%S\'').config -v; make CC=clang LLVM=1 nconfig'
|
