commit d8ec973712025037e0412123bb451aeacf5d3e9d · pyrox.dev/nix

+27 -23

hosts/marvin/services/tangled.nix

···

       5
       5
        
         ...

     

       6
       6
        
       }:

     

       7
       7
        
       let

     

       8
       8
       -
         cfg = config.services.tangled-knot;

     

       8
       8
       +
         cfg = config.services.tangled.knot;

     

       9
       9
        
         dk = self.lib.data.services.tangled-knot;

     

       10
       10
        
         ds = self.lib.data.services.tangled-spindle;

     

       11
       11
        
       in

     

       12
       12
        
       {

     

       13
       13
        
         services = {

     

       14
       14
       -
           tangled-knot = {

     

       15
       15
       -
             enable = true;

     

       16
       16
       -
             gitUser = "git";

     

       17
       17
       -
             stateDir = "/var/lib/tangled-knot";

     

       18
       18
       -
             repo.scanPath = "${cfg.stateDir}/repos";

     

       19
       19
       -
             server = {

     

       20
       20
       -
               listenAddr = "0.0.0.0:${toString dk.port}";

     

       21
       21
       -
               hostname = dk.extUrl;

     

       22
       22
       -
               internalListenAddr = "127.0.0.1:${toString dk.intListenPort}";

     

       23
       23
       -
               owner = "did:plc:5cqzysioqzttihsnbsaxrggu";

     

       14
       14
       +
           tangled = {

     

       15
       15
       +
             knot = {

     

       16
       16
       +
               enable = true;

     

       17
       17
       +
               gitUser = "git";

     

       18
       18
       +
               stateDir = "/var/lib/tangled-knot";

     

       19
       19
       +
               repo.scanPath = "${cfg.stateDir}/repos";

     

       20
       20
       +
               server = {

     

       21
       21
       +
                 listenAddr = "0.0.0.0:${toString dk.port}";

     

       22
       22
       +
                 hostname = dk.extUrl;

     

       23
       23
       +
                 internalListenAddr = "127.0.0.1:${toString dk.intListenPort}";

     

       24
       24
       +
                 owner = "did:plc:5cqzysioqzttihsnbsaxrggu";

     

       25
       25
       +
               };

     

       24
       26
        
             };

     

       25
       25
       -
           };

     

       26
       26
       -
           tangled-spindle = {

     

       27
       27
       -
             enable = true;

     

       28
       28
       -
             server = {

     

       29
       29
       -
               listenAddr = "0.0.0.0:${toString ds.port}";

     

       30
       30
       -
               hostname = ds.extUrl;

     

       31
       31
       -
               owner = "did:plc:5cqzysioqzttihsnbsaxrggu";

     

       27
       27
       +
             spindle = {

     

       28
       28
       +
               enable = true;

     

       29
       29
       +
               server = {

     

       30
       30
       +
                 listenAddr = "0.0.0.0:${toString ds.port}";

     

       31
       31
       +
                 hostname = ds.extUrl;

     

       32
       32
       +
                 owner = "did:plc:5cqzysioqzttihsnbsaxrggu";

     

       33
       33
       +
               };

     

       34
       34
       +
               pipelines.workflowTimeout = "10m";

     

       32
       35
        
             };

     

       33
       33
       -
             pipelines.workflowTimeout = "10m";

     

       34
       36
        
           };

     

       35
       35
       -
           openssh.enable = lib.mkForce cfg.enable;

     

       36
       36
       -
           openssh.ports = [ 2222 ];

     

       37
       37
       -
           openssh.settings.AllowUsers = [ "git" ];

     

       38
       38
       -
           openssh.settings.AllowGroups = [ "git" ];

     

       37
       37
       +
           openssh = {

     

       38
       38
       +
             enable = lib.mkForce cfg.enable;

     

       39
       39
       +
             ports = [ 2222 ];

     

       40
       40
       +
             settings.AllowUsers = [ "git" ];

     

       41
       41
       +
             settings.AllowGroups = [ "git" ];

     

       42
       42
       +
           };

     

       39
       43
        
         };

     

       40
       44
        
       }

+2 -2

hosts/zaphod/packages.nix

···

       1
       1
        
       {

     

       2
       2
        
         pkgs,

     

       3
       3
       -
         inputs,

     

       3
       3
       +
         inputs',

     

       4
       4
        
         ...

     

       5
       5
        
       }:

     

       6
       6
        
       {

     

       7
       7
        
         environment.systemPackages = [

     

       8
       8
       -
           inputs.agenix.packages.${pkgs.system}.default

     

       8
       8
       +
           inputs'.agenix.packages.default

     

       9
       9
        
           pkgs.deadnix

     

       10
       10
        
           pkgs.file

     

       11
       11
        
           pkgs.gamescope