From 8b5787e109d8d3b6cc2e6387b2f265e8c972a804 Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Tue, 16 Jul 2024 23:13:13 +0200
Subject: [PATCH] chore: remove agenix because i cant get it to work (2)

---
 flake.nix                           | 7 ++-----
 hosts/violet/default.nix            | 3 +--
 modules/services/matrix/default.nix | 6 ++----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index da203c2..b927bfb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,15 +29,12 @@
       flake = false;
     };
 
-    agenix.url = "github:ryantm/agenix";
-    agenix.inputs.nixpkgs.follows = "nixpkgs";
-
     iceshrimp = {
       url = "git+https://iceshrimp.dev/iceshrimp/packaging";
     };
   };
 
-  outputs = { nixpkgs, self, iceshrimp, agenix, catppuccin, ...} @ inputs:
+  outputs = { nixpkgs, self, iceshrimp, catppuccin, ...} @ inputs:
   let
     selfPkgs = import ./pkgs;
     username = "liv";
@@ -71,7 +68,7 @@
         modules = [(
           import ./hosts/violet
         )];
-        specialArgs = { host="violet"; inherit self inputs username agenix iceshrimp ; };
+        specialArgs = { host="violet"; inherit self inputs username iceshrimp ; };
       };
 
       vm = nixpkgs.lib.nixosSystem {
diff --git a/hosts/violet/default.nix b/hosts/violet/default.nix
index 9369fcf..953a68c 100644
--- a/hosts/violet/default.nix
+++ b/hosts/violet/default.nix
@@ -1,11 +1,10 @@
-{ pkgs, config, iceshrimp, agenix, ... }: 
+{ pkgs, config, iceshrimp, ... }: 
 {
   imports = [
     ./hardware-configuration.nix
     ./../../modules/core
     ./../../modules/services/violet.nix
     iceshrimp.nixosModules.default
-    agenix.nixosModules.default
   ];
 
   networking.hostName = "violet";
diff --git a/modules/services/matrix/default.nix b/modules/services/matrix/default.nix
index a245075..4ae31ce 100644
--- a/modules/services/matrix/default.nix
+++ b/modules/services/matrix/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, agenix, ... }:
+{ pkgs, lib, config, ... }:
 let
   fqdn = "liv.town";
   baseUrl = "https://${fqdn}";
@@ -15,8 +15,6 @@ in {
     defaults.email = "ahwx@ahwx.org";
   };
 
-  age.secrets.matrix-synapse.file = ../../../secrets/matrix-synapse.age;
-
   services = {
     # postgresql.enable = true;
     # postgresql.initialScript = pkgs.writeText "synapse-init.sql" ''
@@ -118,7 +116,7 @@ in {
         server_name = "${fqdn}";
         public_baseurl = "https://${fqdn}";
         enable_registration = false;
-        extraConfig = config.age.secrets.matrix-synapse.file;
+        extraConfig = ./secrets.yaml;
         listeners = [
           { port = 8008;
             bind_addresses = [ "::1" ];