liv/nixos-config
1
0
Fork 0
mirror of https://github.com/Ahwxorg/nixos-config.git synced 2025-12-04 15:00:13 +01:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

chore: remove agenix because i cant get it to work (2)

Browse source
This commit is contained in:
Ahwx 2024-07-16 23:13:13 +02:00
parent 302ee11e53
commit 8b5787e109
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
flake.nix
View file

@ -29,15 +29,12 @@
flake = false; flake = false;
}; };
agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs";
iceshrimp = { iceshrimp = {
url = "git+https://iceshrimp.dev/iceshrimp/packaging"; url = "git+https://iceshrimp.dev/iceshrimp/packaging";
}; };
}; };
outputs = { nixpkgs, self, iceshrimp, agenix, catppuccin, ...} @ inputs: outputs = { nixpkgs, self, iceshrimp, catppuccin, ...} @ inputs:
let let
selfPkgs = import ./pkgs; selfPkgs = import ./pkgs;
username = "liv"; username = "liv";
@ -71,7 +68,7 @@
modules = [( modules = [(
import ./hosts/violet import ./hosts/violet
)]; )];
specialArgs = { host="violet"; inherit self inputs username agenix iceshrimp ; }; specialArgs = { host="violet"; inherit self inputs username iceshrimp ; };
}; };
vm = nixpkgs.lib.nixosSystem { vm = nixpkgs.lib.nixosSystem {

3
hosts/violet/default.nix
View file

@ -1,11 +1,10 @@
{ pkgs, config, iceshrimp, agenix, ... }: { pkgs, config, iceshrimp, ... }:
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./../../modules/core ./../../modules/core
./../../modules/services/violet.nix ./../../modules/services/violet.nix
iceshrimp.nixosModules.default iceshrimp.nixosModules.default
agenix.nixosModules.default
]; ];
networking.hostName = "violet"; networking.hostName = "violet";

6
modules/services/matrix/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, agenix, ... }: { pkgs, lib, config, ... }:
let let
fqdn = "liv.town"; fqdn = "liv.town";
baseUrl = "https://${fqdn}"; baseUrl = "https://${fqdn}";
@ -15,8 +15,6 @@ in {
defaults.email = "ahwx@ahwx.org"; defaults.email = "ahwx@ahwx.org";
}; };
age.secrets.matrix-synapse.file = ../../../secrets/matrix-synapse.age;
services = { services = {
# postgresql.enable = true; # postgresql.enable = true;
# postgresql.initialScript = pkgs.writeText "synapse-init.sql" '' # postgresql.initialScript = pkgs.writeText "synapse-init.sql" ''
@ -118,7 +116,7 @@ in {
server_name = "${fqdn}"; server_name = "${fqdn}";
public_baseurl = "https://${fqdn}"; public_baseurl = "https://${fqdn}";
enable_registration = false; enable_registration = false;
extraConfig = config.age.secrets.matrix-synapse.file; extraConfig = ./secrets.yaml;
listeners = [ listeners = [
{ port = 8008; { port = 8008;
bind_addresses = [ "::1" ]; bind_addresses = [ "::1" ];