patch of flake.nix,nix/modules: add package option for all the nixos modules · round #1 · pull #334 · tangled.org/core

+27 -3

flake.nix

···

       190
       190
        
             };

     

       191
       191
        
           });

     

       192
       192
        
       

     

       193
       193
       -
           nixosModules.appview = import ./nix/modules/appview.nix {inherit self;};

     

       194
       194
       -
           nixosModules.knot = import ./nix/modules/knot.nix {inherit self;};

     

       195
       195
       -
           nixosModules.spindle = import ./nix/modules/spindle.nix {inherit self;};

     

       193
       193
       +
           nixosModules.appview = {

     

       194
       194
       +
             lib,

     

       195
       195
       +
             pkgs,

     

       196
       196
       +
             ...

     

       197
       197
       +
           }: {

     

       198
       198
       +
             imports = [./nix/modules/appview.nix];

     

       199
       199
       +
       

     

       200
       200
       +
             services.tangled-appview.package = lib.mkDefault self.packages.${pkgs.system}.appview;

     

       201
       201
       +
           };

     

       202
       202
       +
           nixosModules.knot = {

     

       203
       203
       +
             lib,

     

       204
       204
       +
             pkgs,

     

       205
       205
       +
             ...

     

       206
       206
       +
           }: {

     

       207
       207
       +
             imports = [./nix/modules/knot.nix];

     

       208
       208
       +
       

     

       209
       209
       +
             services.tangled-knot.package = lib.mkDefault self.packages.${pkgs.system}.knot;

     

       210
       210
       +
           };

     

       211
       211
       +
           nixosModules.spindle = {

     

       212
       212
       +
             lib,

     

       213
       213
       +
             pkgs,

     

       214
       214
       +
             ...

     

       215
       215
       +
           }: {

     

       216
       216
       +
             imports = [./nix/modules/spindle.nix];

     

       217
       217
       +
       

     

       218
       218
       +
             services.tangled-spindle.package = lib.mkDefault self.packages.${pkgs.system}.spindle;

     

       219
       219
       +
           };

     

       196
       220
        
           nixosConfigurations.vm = import ./nix/vm.nix {inherit self nixpkgs;};

     

       197
       221
        
         };

     

       198
       222
        
       }

+40 -35

nix/modules/appview.nix

···

       1
       1
       -
       {self}: {

     

       1
       1
       +
       {

     

       2
       2
        
         config,

     

       3
       3
       -
         pkgs,

     

       4
       3
        
         lib,

     

       5
       4
        
         ...

     

       6
       6
       -
       }:

     

       7
       7
       -
       with lib; {

     

       8
       8
       -
         options = {

     

       9
       9
       -
           services.tangled-appview = {

     

       10
       10
       -
             enable = mkOption {

     

       11
       11
       -
               type = types.bool;

     

       12
       12
       -
               default = false;

     

       13
       13
       -
               description = "Enable tangled appview";

     

       14
       14
       -
             };

     

       15
       15
       -
             port = mkOption {

     

       16
       16
       -
               type = types.int;

     

       17
       17
       -
               default = 3000;

     

       18
       18
       -
               description = "Port to run the appview on";

     

       19
       19
       -
             };

     

       20
       20
       -
             cookie_secret = mkOption {

     

       21
       21
       -
               type = types.str;

     

       22
       22
       -
               default = "00000000000000000000000000000000";

     

       23
       23
       -
               description = "Cookie secret";

     

       5
       5
       +
       }: let

     

       6
       6
       +
         cfg = config.services.tangled-appview;

     

       7
       7
       +
       in

     

       8
       8
       +
         with lib; {

     

       9
       9
       +
           options = {

     

       10
       10
       +
             services.tangled-appview = {

     

       11
       11
       +
               enable = mkOption {

     

       12
       12
       +
                 type = types.bool;

     

       13
       13
       +
                 default = false;

     

       14
       14
       +
                 description = "Enable tangled appview";

     

       15
       15
       +
               };

     

       16
       16
       +
               package = mkOption {

     

       17
       17
       +
                 type = types.package;

     

       18
       18
       +
                 description = "Package to use for the appview";

     

       19
       19
       +
               };

     

       20
       20
       +
               port = mkOption {

     

       21
       21
       +
                 type = types.int;

     

       22
       22
       +
                 default = 3000;

     

       23
       23
       +
                 description = "Port to run the appview on";

     

       24
       24
       +
               };

     

       25
       25
       +
               cookie_secret = mkOption {

     

       26
       26
       +
                 type = types.str;

     

       27
       27
       +
                 default = "00000000000000000000000000000000";

     

       28
       28
       +
                 description = "Cookie secret";

     

       29
       29
       +
               };

     

       24
       30
        
             };

     

       25
       31
        
           };

     

       26
       26
       -
         };

     

       27
       32
        
       

     

       28
       28
       -
         config = mkIf config.services.tangled-appview.enable {

     

       29
       29
       -
           systemd.services.tangled-appview = {

     

       30
       30
       -
             description = "tangled appview service";

     

       31
       31
       -
             wantedBy = ["multi-user.target"];

     

       33
       33
       +
           config = mkIf cfg.enable {

     

       34
       34
       +
             systemd.services.tangled-appview = {

     

       35
       35
       +
               description = "tangled appview service";

     

       36
       36
       +
               wantedBy = ["multi-user.target"];

     

       32
       37
        
       

     

       33
       33
       -
             serviceConfig = {

     

       34
       34
       -
               ListenStream = "0.0.0.0:${toString config.services.tangled-appview.port}";

     

       35
       35
       -
               ExecStart = "${self.packages.${pkgs.system}.appview}/bin/appview";

     

       36
       36
       -
               Restart = "always";

     

       37
       37
       -
             };

     

       38
       38
       +
               serviceConfig = {

     

       39
       39
       +
                 ListenStream = "0.0.0.0:${toString cfg.port}";

     

       40
       40
       +
                 ExecStart = "${cfg.package}/bin/appview";

     

       41
       41
       +
                 Restart = "always";

     

       42
       42
       +
               };

     

       38
       43
        
       

     

       39
       39
       -
             environment = {

     

       40
       40
       -
               TANGLED_DB_PATH = "appview.db";

     

       41
       41
       -
               TANGLED_COOKIE_SECRET = config.services.tangled-appview.cookie_secret;

     

       44
       44
       +
               environment = {

     

       45
       45
       +
                 TANGLED_DB_PATH = "appview.db";

     

       46
       46
       +
                 TANGLED_COOKIE_SECRET = cfg.cookie_secret;

     

       47
       47
       +
               };

     

       42
       48
        
             };

     

       43
       49
        
           };

     

       44
       44
       -
         };

     

       45
       45
       -
       }

     

       50
       50
       +
         }

+11 -6

nix/modules/knot.nix

···

       1
       1
       -
       {self}: {

     

       1
       1
       +
       {

     

       2
       2
        
         config,

     

       3
       3
        
         pkgs,

     

       4
       4
        
         lib,

     
···

       15
       15
        
                 description = "Enable a tangled knot";

     

       16
       16
        
               };

     

       17
       17
        
       

     

       18
       18
       +
               package = mkOption {

     

       19
       19
       +
                 type = types.package;

     

       20
       20
       +
                 description = "Package to use for the knot";

     

       21
       21
       +
               };

     

       22
       22
       +
       

     

       18
       23
        
               appviewEndpoint = mkOption {

     

       19
       24
        
                 type = types.str;

     

       20
       25
        
                 default = "https://tangled.sh";

     
···

       94
       99
        
           };

     

       95
       100
        
       

     

       96
       101
        
           config = mkIf cfg.enable {

     

       97
       97
       -
             environment.systemPackages = with pkgs; [

     

       98
       98
       -
               git

     

       99
       99
       -
               self.packages."${pkgs.system}".knot

     

       102
       102
       +
             environment.systemPackages = [

     

       103
       103
       +
               pkgs.git

     

       104
       104
       +
               cfg.package

     

       100
       105
        
             ];

     

       101
       106
        
       

     

       102
       107
        
             system.activationScripts.gitConfig = ''

     
···

       135
       140
        
               mode = "0555";

     

       136
       141
        
               text = ''

     

       137
       142
        
                 #!${pkgs.stdenv.shell}

     

       138
       138
       -
                 ${self.packages.${pkgs.system}.knot}/bin/knot keys \

     

       143
       143
       +
                 ${cfg.package}/bin/knot keys \

     

       139
       144
        
                   -output authorized-keys \

     

       140
       145
        
                   -internal-api "http://${cfg.server.internalListenAddr}" \

     

       141
       146
        
                   -git-dir "${cfg.repo.scanPath}" \

     
···

       160
       165
        
                   "KNOT_SERVER_HOSTNAME=${cfg.server.hostname}"

     

       161
       166
        
                 ];

     

       162
       167
        
                 EnvironmentFile = cfg.server.secretFile;

     

       163
       163
       -
                 ExecStart = "${self.packages.${pkgs.system}.knot}/bin/knot server";

     

       168
       168
       +
                 ExecStart = "${cfg.package}/bin/knot server";

     

       164
       169
        
                 Restart = "always";

     

       165
       170
        
               };

     

       166
       171
        
             };

+6 -3

nix/modules/spindle.nix

···

       1
       1
       -
       {self}: {

     

       1
       1
       +
       {

     

       2
       2
        
         config,

     

       3
       3
       -
         pkgs,

     

       4
       3
        
         lib,

     

       5
       4
        
         ...

     

       6
       5
        
       }: let

     
···

       14
       13
        
                 default = false;

     

       15
       14
        
                 description = "Enable a tangled spindle";

     

       16
       15
        
               };

     

       16
       16
       +
               package = mkOption {

     

       17
       17
       +
                 type = types.package;

     

       18
       18
       +
                 description = "Package to use for the spindle";

     

       19
       19
       +
               };

     

       17
       20
        
       

     

       18
       21
        
               server = {

     

       19
       22
        
                 listenAddr = mkOption {

     
···

       89
       92
        
                   "SPINDLE_PIPELINES_NIXERY=${cfg.pipelines.nixery}"

     

       90
       93
        
                   "SPINDLE_PIPELINES_WORKFLOW_TIMEOUT=${cfg.pipelines.workflowTimeout}"

     

       91
       94
        
                 ];

     

       92
       92
       -
                 ExecStart = "${self.packages.${pkgs.system}.spindle}/bin/spindle";

     

       95
       95
       +
                 ExecStart = "${cfg.package}/bin/spindle";

     

       93
       96
        
                 Restart = "always";

     

       94
       97
        
               };

     

       95
       98
        
             };