summary refs log tree commit diff
diff options
context:
space:
mode:
authorRory&::Emma <root@rory.gay>2023-08-17 23:48:07 +0000
committerRory&::Emma <root@rory.gay>2023-08-18 01:12:03 +0000
commit43a720aa8a85d14ed30ca8e0a5ba2f736109032a (patch)
treedf28c41d950afc7d3433a6731cfde85c3818f5e0
parentFix (diff)
downloadRory-Open-Architecture-43a720aa8a85d14ed30ca8e0a5ba2f736109032a.tar.xz
Push updates
-rw-r--r--flake.lock8
-rwxr-xr-xhost/Rory-nginx/services/matrix/synapse.nix8
-rwxr-xr-xmodules/base-server.nix2
-rwxr-xr-xmodules/users/Rory.nix3
4 files changed, 15 insertions, 6 deletions
diff --git a/flake.lock b/flake.lock
index 10f6a29..ad6828e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -24,11 +24,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1690982105,
-        "narHash": "sha256-32AzoLuwhtxBItcULRiCnxRfJcbVXbPZSH9TDVg21mU=",
+        "lastModified": 1691998815,
+        "narHash": "sha256-HuFgb+W1Dvd0mjjudpTf0hVg/YKKiMRpX14t7dJeTm8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b2ac1d2c32ac11b8d231d23622cdc4b2f28d07d2",
+        "rev": "da6874e8bb82204323b94154585a1471c739f73e",
         "type": "github"
       },
       "original": {
@@ -73,7 +73,7 @@
     "nixpkgs_3": {
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-MwJDlUWc8vybt5IAnCYzB0L/NoZLIWDYQ+9cn+MEECU=",
+        "narHash": "sha256-yHBvhXaqrOZGBYAv83CeTYIgUnMFMN1W58zSnhVf+ME=",
         "path": "/Rory-Open-Architecture/nixpkgs",
         "type": "path"
       },
diff --git a/host/Rory-nginx/services/matrix/synapse.nix b/host/Rory-nginx/services/matrix/synapse.nix
index b69af7a..7809384 100755
--- a/host/Rory-nginx/services/matrix/synapse.nix
+++ b/host/Rory-nginx/services/matrix/synapse.nix
@@ -161,6 +161,14 @@
         search_all_users = true;
         prefer_local_users = true;
       };
+
+      experimental_features = {
+        "org.matrix.msc3026.busy_presence" = true;
+        "fi.mau.msc2815" = true;
+        "org.matrix.msc3881" = true;
+        "org.matrix.msc3874" = true;
+        "org.matrix.msc3912" = true;
+      };
     };
 
     plugins = with pkgs.matrix-synapse-plugins; [
diff --git a/modules/base-server.nix b/modules/base-server.nix
index 76f5947..e579c6d 100755
--- a/modules/base-server.nix
+++ b/modules/base-server.nix
@@ -87,7 +87,7 @@
 
     useDHCP = false;
 #     nameservers = [ "1.1.1.1" "1.0.0.1" "8.8.8.8" "8.4.4.8" ];
-    nameservers = [ "10.10.0.4" "10.10.0.5" ];
+    nameservers = [ "10.10.0.4" "10.10.0.5" "1.1.1.1" "1.0.0.1" "8.8.8.8" "8.4.4.8" ];
     defaultGateway = "192.168.1.1";
   };
 
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index b9c5722..daafb15 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -4,7 +4,7 @@
 
   users.users.Rory = {
     isNormalUser = true;
-    extraGroups = [ "wheel" ];
+    extraGroups = [ "wheel" "ocp" ];
     packages = with pkgs; [
     ];
     initialPassword = "password";
@@ -14,6 +14,7 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILF2IuNu//0DP/wKMuDvBgVT3YBS2uULsipbdrhJCTM7 thearcanebrony@tab-linux-desktop"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN/kNkY/E5b6rvCQLMaSbpLQ/xoyywIwVVu9uo2j/B6p Rory@RoryNix"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICNhsYWo5pEilXQGcn2SOuvzIdy67QpdtC7vnmlJB9WX Administrator@nt-6mnnvobcjimo"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILSJYOygKJIvwhPj+SmTtzOD3eBzwf+kiLeegWQmKGmW TheArcaneBrony@w81vm"
     ];
   };