uhhhh

3 files changed, 23 insertions, 46 deletions

diff --git a/hosts/vps/default.nix b/hosts/vps/default.nix
index 4741374..2c39141 100644
--- a/hosts/vps/default.nix
+++ b/hosts/vps/default.nix
@@ -31,7 +31,6 @@
 
     time.timeZone = lib.mkDefault "Frankfurt";
 
-
     networking.networkmanager.enable = lib.mkForce false;
 
     nixpkgs.config.allowUnfree = true;
diff --git a/hosts/vps/hardware-configuration.nix b/hosts/vps/hardware-configuration.nix
index 2d9a5fa..a39dc64 100644
--- a/hosts/vps/hardware-configuration.nix
+++ b/hosts/vps/hardware-configuration.nix
@@ -5,32 +5,30 @@
   config,
   ...
 }: {
-     fileSystems = {
-      "/" = {
-        device = "none";
-        fsType = "tmpfs";
-        options = ["noexec" "defaults" "size=2G" "mode=755"];
-      };
-      "/nix" = {
-        device = "/dev/disk/by-uuid/e4c4735d-bfdd-477f-bc43-d07510cb6a9a";
-        fsType = "btrfs";
-      };
-      "/boot" = {
-        device = "/dev/disk/by-uuid/7ea63707-099d-4c21-90eb-a51bfa6d8ba5";
-        fsType = "ext4";
-      };
+  fileSystems = {
+    "/" = {
+      device = "none";
+      fsType = "tmpfs";
+      options = ["noexec" "defaults" "size=2G" "mode=755"];
     };
-
-    swapDevices = [{device = "/dev/disk/by-uuid/00eb2d2e-4d7c-4e95-804d-e9ecb22679d4";}];
-
-    zramSwap = {
-      enable = true;
-      algorithm = "zstd";
+    "/nix" = {
+      device = "/dev/disk/by-uuid/e4c4735d-bfdd-477f-bc43-d07510cb6a9a";
+      fsType = "btrfs";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/7ea63707-099d-4c21-90eb-a51bfa6d8ba5";
+      fsType = "ext4";
     };
+  };
 
+  swapDevices = [{device = "/dev/disk/by-uuid/00eb2d2e-4d7c-4e95-804d-e9ecb22679d4";}];
 
-    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-    hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    virtualisation.hypervGuest.enable = true;
+  zramSwap = {
+    enable = true;
+    algorithm = "zstd";
+  };
 
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  virtualisation.hypervGuest.enable = true;
 }
diff --git a/hosts/vps/services/matrix.nix b/hosts/vps/services/matrix.nix
index e2aa1a5..005040f 100644
--- a/hosts/vps/services/matrix.nix
+++ b/hosts/vps/services/matrix.nix
@@ -2,32 +2,12 @@
   pkgs,
   config,
   lib,
+  inputs,
   ...
 }: {
   config = {
-    # services.matrix-synapse = {
-    #   enable = true;
-    #   settings.server_name = config.networking.domain;
-    #   settings.listeners = [
-    #     {
-    #       port = 8008;
-    #       bind_addresses = ["::1"];
-    #       type = "http";
-    #       tls = false;
-    #       x_forwarded = true;
-    #       resources = [
-    #         {
-    #           names = ["client" "federation"];
-    #           compress = true;
-    #         }
-    #       ];
-    #     }
-    #   ];
-    # };
-    # networking.firewall.allowedTCPPorts = [80 443];
-
     age.secrets.matrix = {
-      file = ../../secrets/matrix.age;
+      file = "${inputs.self}/secrets/matrix.age";
       mode = "600";
       owner = "root";
       group = "root";