commit 64a840c44f0bbc916b3ca77339dddad2361aa39d · soopy.moe/gensokyo

+2 -2

flake.nix

···

       49
       49
        
           home-manager,

     

       50
       50
        
           ...

     

       51
       51
        
         } @ inputs: let

     

       52
       52
       -
           _utils = import ./global/utils.nix {};

     

       52
       52
       +
           utils = import ./global/utils.nix;

     

       53
       53
        
           lib = nixpkgs.lib;

     

       54
       54
        
       

     

       55
       55
        
           systems = [

     
···

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

     

       62
       62
        
         in {

     

       63
       63
        
           nixosConfigurations = {

     

       64
       64
       -
             koumakan = import ./systems/koumakan {inherit _utils lib inputs;};

     

       64
       64
       +
             koumakan = import ./systems/koumakan {inherit utils lib inputs;};

     

       65
       65
        
           };

     

       66
       66
        
       

     

       67
       67
        
           devShells = forAllSystems (pkgs: {

+22 -7

global/utils.nix

···

       1
       1
        
       # see /docs/utils.md for a usage guide

     

       2
       2
       -
       {...}:

     

       3
       3
       -
       # let

     

       4
       4
       -
       #   lib = pkgs.lib;

     

       5
       5
       -
       # in

     

       6
       6
       -
       rec {

     

       7
       7
       -
         mkVhost = opts:

     

       2
       2
       +
       {

     

       3
       3
       +
         inputs,

     

       4
       4
       +
         system,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }: rec {

     

       7
       7
       +
         mkVhost = {extraConfig ? "", ...} @ opts:

     

       8
       8
        
           {

     

       9
       9
        
             # ideally mkOverride/mkDefault would be used, but i have 0 idea how it works.

     

       10
       10
        
             forceSSL = true;

     

       11
       11
        
             useACMEHost = "global.c.soopy.moe";

     

       12
       12
        
             kTLS = true;

     

       13
       13
        
           }

     

       14
       14
       -
           // opts;

     

       14
       14
       +
           // opts

     

       15
       15
       +
           // {

     

       16
       16
       +
             # we do some funny things here

     

       17
       17
       +
             locations =

     

       18
       18
       +
               opts.locations

     

       19
       19
       +
               // {

     

       20
       20
       +
                 "/_cgi/error/" = {alias = "${inputs.mystia.packages.${system}.staticly}/nginx_error_pages/";};

     

       21
       21
       +
               };

     

       22
       22
       +
             extraConfig =

     

       23
       23
       +
               ''

     

       24
       24
       +
                 error_page 503 /_cgi/error/503.html;

     

       25
       25
       +
                 error_page 502 /_cgi/error/502.html;

     

       26
       26
       +
                 error_page 404 /_cgi/error/404.html;

     

       27
       27
       +
               ''

     

       28
       28
       +
               + extraConfig;

     

       29
       29
       +
           };

     

       15
       30
        
       

     

       16
       31
        
         mkSimpleProxy = {

     

       17
       32
        
           port,

+6 -2

systems/koumakan/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         _utils,

     

       3
       3
       +
         utils,

     

       4
       4
        
         inputs,

     

       5
       5
        
         ...

     

       6
       6
        
       }:

     
···

       10
       10
        
         # see docs/tips_n_tricks.md#extra_opts for syntax

     

       11
       11
        
         # see docs/utils.md for functions

     

       12
       12
        
         specialArgs = {

     

       13
       13
       -
           inherit inputs _utils;

     

       13
       13
       +
           inherit inputs;

     

       14
       14
       +
           _utils = utils {

     

       15
       15
       +
             inherit inputs;

     

       16
       16
       +
             system = "x86_64-linux";

     

       17
       17
       +
           };

     

       14
       18
        
         };

     

       15
       19
        
       

     

       16
       20
        
         modules = [