uhhhh

5 files changed, 48 insertions, 71 deletions

diff --git a/flake.lock b/flake.lock
index 75ee543..c5d0ac8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1689334118,
-        "narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=",
+        "lastModified": 1690228878,
+        "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143",
+        "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792",
         "type": "github"
       },
       "original": {
@@ -64,11 +64,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1689320556,
-        "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=",
+        "lastModified": 1690704397,
+        "narHash": "sha256-sgIWjcz0e+x87xlKg324VtHgH55J5rIuFF0ZWRDvQoE=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b",
+        "rev": "96e5a0a0e8568c998135ea05575a9ed2c87f5492",
         "type": "github"
       },
       "original": {
@@ -105,11 +105,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690027126,
-        "narHash": "sha256-DeUhQQxbu41Qn0uHyNazPBiTJ0lNsf26ThFopWBRRnM=",
+        "lastModified": 1690652600,
+        "narHash": "sha256-Dy09g7mezToVwtFPyY25fAx1hzqNXv73/QmY5/qyR44=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "76dd6c66190db0d46ac6b3ca816cc17b581df42c",
+        "rev": "f58889c07efa8e1328fdf93dc1796ec2a5c47f38",
         "type": "github"
       },
       "original": {
@@ -171,11 +171,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1690031011,
-        "narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=",
+        "lastModified": 1690548937,
+        "narHash": "sha256-x3ZOPGLvtC0/+iFAg9Kvqm/8hTAIkGjc634SqtgaXTA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "12303c652b881435065a98729eb7278313041e49",
+        "rev": "2a9d660ff0f7ffde9d73be328ee6e6f10ef66b28",
         "type": "github"
       },
       "original": {
@@ -193,11 +193,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1690052568,
-        "narHash": "sha256-paHZMtaLqrwrJZnT8kHH0UXidg6Zzsp8aLGmTYCo6EE=",
+        "lastModified": 1690708944,
+        "narHash": "sha256-GQ2KQMEl0Dstia6eNu8FMqzoQn5n4gimuAGK8Q5tbbw=",
         "owner": "wamserma",
         "repo": "flake-programs-sqlite",
-        "rev": "1a3f24024fad39203e743892dad32cecd093dec4",
+        "rev": "23c8f9a189a26fd041a9e45e35aa706852b07432",
         "type": "github"
       },
       "original": {
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";
diff --git a/mixins/syncthing.nix b/mixins/syncthing.nix
index 18b8f78..8928969 100644
--- a/mixins/syncthing.nix
+++ b/mixins/syncthing.nix
@@ -5,22 +5,22 @@
 }: {
   config = {
     services.syncthing = {
-      enable = false;
+      enable = true;
       user = "tzlil";
       dataDir = "/home/tzlil/sync";
       configDir = "/home/tzlil/.config/syncthing";
       overrideDevices = true;
       overrideFolders = true;
-      #settings = {
-      devices = {
-        "phone" = {id = "UHWVTEZ-BERNFCH-3ZXQHNE-ZRBHLU6-MBAVEHB-TKLQJM7-ZGHLJ4R-6E4SAA7";};
-      };
-      folders = {
-        "passwords" = {
-          path = "/home/tzlil/sync/passwords";
-          devices = ["phone"];
+      settings = {
+        devices = {
+          "phone".id = "UHWVTEZ-BERNFCH-3ZXQHNE-ZRBHLU6-MBAVEHB-TKLQJM7-ZGHLJ4R-6E4SAA7";
+        };
+        folders = {
+          "passwords" = {
+            path = "/home/tzlil/sync/passwords";
+            devices = ["phone"];
+          };
         };
-        #};
       };
     };