aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix2
-rw-r--r--hosts/laurel/configuration.nix18
-rw-r--r--scripts/record.nix4
3 files changed, 21 insertions, 3 deletions
diff --git a/flake.nix b/flake.nix
index ff479f9..55ed146 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,6 +53,8 @@
53 flaresolverr = flaresolverr.overlays.default; 53 flaresolverr = flaresolverr.overlays.default;
54 }; 54 };
55 55
56 formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".nixpkgs-fmt;
57
56 nixosConfigurations = { 58 nixosConfigurations = {
57 olive = nixpkgs.lib.nixosSystem { 59 olive = nixpkgs.lib.nixosSystem {
58 system = "x86_64-linux"; 60 system = "x86_64-linux";
diff --git a/hosts/laurel/configuration.nix b/hosts/laurel/configuration.nix
index 541f185..29864cf 100644
--- a/hosts/laurel/configuration.nix
+++ b/hosts/laurel/configuration.nix
@@ -20,7 +20,7 @@
20 # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. 20 # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
21 # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. 21 # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
22 networking.hostName = "laurel"; 22 networking.hostName = "laurel";
23 networking.firewall.allowedTCPPorts = [ 80 443 ]; 23 networking.firewall.allowedTCPPorts = [ 80 443 6197 ];
24 24
25 time.timeZone = "Europe/London"; 25 time.timeZone = "Europe/London";
26 i18n.defaultLocale = "en_US.UTF-8"; 26 i18n.defaultLocale = "en_US.UTF-8";
@@ -140,6 +140,22 @@
140 }; 140 };
141 }; 141 };
142 142
143 services.matrix-conduit = {
144 enable = true;
145 settings = {
146 global = {
147 allow_encryption = true;
148 allow_federation = true;
149 allow_registration = false;
150 database_backend = "rocksdb";
151 server_name = "oppi.li";
152 address = "0.0.0.0";
153 port = 6197;
154 enable_lightning_bolt = false;
155 };
156 };
157 };
158
143 159
144 nix.settings.experimental-features = [ "nix-command" "flakes" ]; 160 nix.settings.experimental-features = [ "nix-command" "flakes" ];
145 161
diff --git a/scripts/record.nix b/scripts/record.nix
index d5bfff5..a86d4cd 100644
--- a/scripts/record.nix
+++ b/scripts/record.nix
@@ -1,11 +1,11 @@
1{ pkgs, ...}: 1{ pkgs, ... }:
2 2
3let 3let
4 name = "record"; 4 name = "record";
5 slop = "${pkgs.slop}/bin/slop"; 5 slop = "${pkgs.slop}/bin/slop";
6 ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; 6 ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg";
7in 7in
8 pkgs.writeScriptBin name 8pkgs.writeScriptBin name
9 '' 9 ''
10 echo starting recording ... 10 echo starting recording ...
11 coords=$(${slop} -f "%x %y %w %h %g %i") || exit 1 11 coords=$(${slop} -f "%x %y %w %h %g %i") || exit 1