commit 4f7c3f334f978ebdee24f0f4c343453753d0f5a9 · soopy.moe/gensokyo

+4 -1

flake.nix

···

       63
       63
        
           ];

     

       64
       64
        
           forAllSystems = fn: lib.genAttrs systems (s: fn nixpkgs.legacyPackages.${s});

     

       65
       65
        
         in {

     

       66
       66
       -
           lib.x86_64-linux = import ./global/utils.nix {inherit inputs; system = "x86_64-linux";};

     

       66
       66
       +
           lib.x86_64-linux = import ./global/utils.nix {

     

       67
       67
       +
             inherit inputs;

     

       68
       68
       +
             system = "x86_64-linux";

     

       69
       69
       +
           };

     

       67
       70
        
       

     

       68
       71
        
           nixosConfigurations = {

     

       69
       72
        
             koumakan = import ./systems/koumakan {

+10 -5

global/utils.nix

···

       66
       66
        
             map (x: namespace + lib.optionalString (lib.stringLength namespace != 0) "/" + x) files

     

       67
       67
        
           ) (_: value);

     

       68
       68
        
       

     

       69
       69
       -
         mkNginxFile = {filename ? "index.html", content, status ? 200}: let

     

       69
       69
       +
         mkNginxFile = {

     

       70
       70
       +
           filename ? "index.html",

     

       71
       71
       +
           content,

     

       72
       72
       +
           status ? 200,

     

       73
       73
       +
         }: let

     

       70
       74
        
           contentDir =

     

       71
       75
        
             if (builtins.typeOf content) == "string"

     

       72
       76
        
             then builtins.toString (pkgs.writeTextDir filename content) + "/"

     
···

       79
       83
        
         mkNginxJSON = filename: attrset:

     

       80
       84
        
           if (builtins.typeOf attrset) != "set"

     

       81
       85
        
           then throw "attrset: expected argument type `set`, got `${builtins.typeOf attrset}` instead."

     

       82
       82
       -
           else mkNginxFile {

     

       83
       83
       -
             inherit filename;

     

       84
       84
       -
             content = builtins.toJSON attrset;

     

       85
       85
       -
           };

     

       86
       86
       +
           else

     

       87
       87
       +
             mkNginxFile {

     

       88
       88
       +
               inherit filename;

     

       89
       89
       +
               content = builtins.toJSON attrset;

     

       90
       90
       +
             };

     

       86
       91
        
       }

+1 -1

systems/koumakan/services/matrix/synapse.nix

···

       113
       113
        
       

     

       114
       114
        
         services.nginx.virtualHosts."nue.soopy.moe" = _utils.mkVhost {

     

       115
       115
        
           locations."= /.well-known/matrix/server" = _utils.mkNginxJSON "server" {

     

       116
       116
       -
               "m.server" = "nue.soopy.moe:443";

     

       116
       116
       +
             "m.server" = "nue.soopy.moe:443";

     

       117
       117
        
           };

     

       118
       118
        
       

     

       119
       119
        
           locations."~ ^(/_matrix|/_synapse/client)" = {

+1 -4

systems/koumakan/services/proxies/nitter.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         _utils,

     

       3
       3
       -
         ...

     

       4
       4
       -
       }: {

     

       1
       1
       +
       {_utils, ...}: {

     

       5
       2
        
         services.nginx.virtualHosts."nitter.soopy.moe" = _utils.mkVhost {

     

       6
       3
        
           locations."/" = _utils.mkNginxFile {

     

       7
       4
        
             content = ''