commit 7b05921dc47248b4a87cba67a1e53a642adee1fc · ryan.freumh.org/eilean-nix

+4 -4

flake.lock

···

       160
       160
        
           },

     

       161
       161
        
           "nixpkgs_2": {

     

       162
       162
        
             "locked": {

     

       163
       163
       -
               "lastModified": 1717952948,

     

       164
       164
       -
               "narHash": "sha256-mJi4/gjiwQlSaxjA6AusXBN/6rQRaPCycR7bd8fydnQ=",

     

       163
       163
       +
               "lastModified": 1732981179,

     

       164
       164
       +
               "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",

     

       165
       165
        
               "owner": "nixos",

     

       166
       166
        
               "repo": "nixpkgs",

     

       167
       167
       -
               "rev": "2819fffa7fa42156680f0d282c60d81e8fb185b7",

     

       167
       167
       +
               "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",

     

       168
       168
        
               "type": "github"

     

       169
       169
        
             },

     

       170
       170
        
             "original": {

     

       171
       171
        
               "owner": "nixos",

     

       172
       172
       -
               "ref": "nixos-24.05",

     

       172
       172
       +
               "ref": "nixos-24.11",

     

       173
       173
        
               "repo": "nixpkgs",

     

       174
       174
        
               "type": "github"

     

       175
       175
        
             }

+4 -4

flake.nix

···

       1
       1
        
       {

     

       2
       2
        
         inputs = {

     

       3
       3
       -
           nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";

     

       3
       3
       +
           nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";

     

       4
       4
        
           nixos-mailserver.url = "gitlab:RyanGibb/nixos-mailserver/fork-24.05";

     

       5
       5
        
           eon.url = "github:RyanGibb/eon";

     

       6
       6
        
           eon.inputs.nixpkgs.follows = "nixpkgs";

     

       7
       7
        
         };

     

       8
       8
        
       

     

       9
       9
       -
         outputs = { self, nixpkgs, nixos-mailserver, eon, ... }: rec {

     

       9
       9
       +
         outputs = { nixpkgs, nixos-mailserver, eon, ... }: {

     

       10
       10
        
           packages = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system:

     

       11
       11
        
             let pkgs = nixpkgs.legacyPackages.${system};

     

       12
       12
        
             in { manpage = import ./man { inherit pkgs system nixos-mailserver; }; });

     
···

       17
       17
        
               nixos-mailserver.nixosModule

     

       18
       18
        
               eon.nixosModules.default

     

       19
       19
        
               eon.nixosModules.acme

     

       20
       20
       -
               ({ pkgs, config, ... }: {

     

       20
       20
       +
               {

     

       21
       21
        
                 nixpkgs.overlays = [

     

       22
       22
        
                   (final: prev: {

     

       23
       23
        
                     mautrix-meta = (prev.callPackage ./pkgs/mautrix-meta.nix { });

     

       24
       24
        
                   })

     

       25
       25
        
                 ];

     

       26
       26
       -
               })

     

       26
       26
       +
               }

     

       27
       27
        
             ];

     

       28
       28
        
           };

     

       29
       29
        
           defaultTemplate.path = ./template;

-5

modules/headscale.nix

···

       30
       30
        
               server_url = "https://${cfg.headscale.domain}";

     

       31
       31
        
               logtail.enabled = false;

     

       32
       32
        
               ip_prefixes = [ "100.64.0.0/10" "fd7a:115c:a1e0::/48" ];

     

       33
       33
       -
               dns_config = {

     

       34
       34
       -
                 # magicDns = true;

     

       35
       35
       -
                 nameservers = config.networking.nameservers;

     

       36
       36
       -
                 base_domain = "${cfg.headscale.zone}";

     

       37
       37
       -
               };

     

       38
       33
        
             };

     

       39
       34
        
           };

     

       40
       35

-23

modules/matrix/synapse.nix

···

       39
       39
        
               description = "Enable Facebook Messenger bridge.";

     

       40
       40
        
             };

     

       41
       41
        
           };

     

       42
       42
       -
           slidingSync = {

     

       43
       43
       -
             enable = mkEnableOption "sliding-sync";

     

       44
       44
       -
             secretFile = mkOption {

     

       45
       45
       -
               type = types.nullOr types.str;

     

       46
       46
       -
               default = null;

     

       47
       47
       -
             };

     

       48
       48
       -
           };

     

       49
       42
        
         };

     

       50
       43
        
       

     

       51
       44
        
         config = mkIf cfg.matrix.enable {

     
···

       90
       83
        
                   client = {

     

       91
       84
        
                     "m.homeserver" = { "base_url" = "https://${subdomain}"; };

     

       92
       85
        
                     "m.identity_server" = { "base_url" = "https://vector.im"; };

     

       93
       93
       -
                     "org.matrix.msc3575.proxy" = if cfg.matrix.slidingSync.enable then {

     

       94
       94
       -
                       "url" = "https://${subdomain}";

     

       95
       95
       -
                     } else

     

       96
       96
       -
                       { };

     

       97
       86
        
                   };

     

       98
       87
        
                   # ACAO required to allow element-web on any URL to request this json file

     

       99
       88
        
                   # set other headers due to https://github.com/yandex/gixy/blob/master/docs/en/plugins/addheaderredefinition.md

     
···

       124
       113
        
                 locations."~ ^(\\/_matrix|\\/_synapse\\/client)" = {

     

       125
       114
        
                   proxyPass = "http://127.0.0.1:8008";

     

       126
       115
        
                 };

     

       127
       127
       -
                 # forward all sliding sync API calls to the sliding sync server

     

       128
       128
       -
                 locations."~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync)" =

     

       129
       129
       -
                   mkIf cfg.matrix.slidingSync.enable {

     

       130
       130
       -
                     priority = 100;

     

       131
       131
       -
                     proxyPass = "http://127.0.0.1:8009";

     

       132
       132
       -
                   };

     

       133
       116
        
               };

     

       134
       117
        
             };

     

       135
       118
        
           };

     
···

       264
       247
        
             type = "CNAME";

     

       265
       248
        
             value = cfg.domainName;

     

       266
       249
        
           }];

     

       267
       267
       -
       

     

       268
       268
       -
           services.matrix-sliding-sync = mkIf cfg.matrix.slidingSync.enable {

     

       269
       269
       -
             enable = true;

     

       270
       270
       -
             environmentFile = cfg.matrix.slidingSync.secretFile;

     

       271
       271
       -
             settings = { SYNCV3_SERVER = "https://${subdomain}"; };

     

       272
       272
       -
           };

     

       273
       250
        
         };

     

       274
       251
        
       }