back round 0 view raw

nix: break out vm configuration into separate file #216

merged

opened by

oppi.li 6 months ago targeting master from push-mlxxvvqpzvlw

Signed-off-by: oppiliappan me@oppi.li

options

unified split

Changed files

+37 -32

flake.nix

nix

vm.nix

+1 -32

flake.nix

···

       200
        
             };

     

       201
        
           });

     

       202
        
       

     

       203
       -
           nixosConfigurations.knotVM = nixpkgs.lib.nixosSystem {

     

       204
       -
             system = "x86_64-linux";

     

       205
       -
             modules = [

     

       206
       -
               self.nixosModules.knot

     

       207
       -
               ({

     

       208
       -
                 config,

     

       209
       -
                 pkgs,

     

       210
       -
                 ...

     

       211
       -
               }: {

     

       212
       -
                 virtualisation.memorySize = 2048;

     

       213
       -
                 virtualisation.diskSize = 10 * 1024;

     

       214
       -
                 virtualisation.cores = 2;

     

       215
       -
                 services.getty.autologinUser = "root";

     

       216
       -
                 environment.systemPackages = with pkgs; [curl vim git];

     

       217
       -
                 systemd.tmpfiles.rules = let

     

       218
       -
                   u = config.services.tangled-knot.gitUser;

     

       219
       -
                   g = config.services.tangled-knot.gitUser;

     

       220
       -
                 in [

     

       221
       -
                   "d /var/lib/knot 0770 ${u} ${g} - -" # Create the directory first

     

       222
       -
                   "f+ /var/lib/knot/secret 0660 ${u} ${g} - KNOT_SERVER_SECRET=38a7c3237c2a585807e06a5bcfac92eb39442063f3da306b7acb15cfdc51d19d"

     

       223
       -
                 ];

     

       224
       -
                 services.tangled-knot = {

     

       225
       -
                   enable = true;

     

       226
       -
                   server = {

     

       227
       -
                     secretFile = "/var/lib/knot/secret";

     

       228
       -
                     hostname = "localhost:6000";

     

       229
       -
                     listenAddr = "0.0.0.0:6000";

     

       230
       -
                   };

     

       231
       -
                 };

     

       232
       -
               })

     

       233
       -
             ];

     

       234
       -
           };

     

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

     

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

     

       0
        
       
     

       237
        
         };

     

       238
        
       }

···

       200
        
             };

     

       201
        
           });

     

       202
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

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

     

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

     

       205
       +
           nixosConfigurations.knotVM = import ./nix/vm.nix {inherit self nixpkgs;};

     

       206
        
         };

     

       207
        
       }

+36

nix/vm.nix

···

       1
       +
       {

     

       2
       +
         nixpkgs,

     

       3
       +
         self,

     

       4
       +
       }:

     

       5
       +
       nixpkgs.lib.nixosSystem {

     

       6
       +
         system = "x86_64-linux";

     

       7
       +
         modules = [

     

       8
       +
           self.nixosModules.knot

     

       9
       +
           ({

     

       10
       +
             config,

     

       11
       +
             pkgs,

     

       12
       +
             ...

     

       13
       +
           }: {

     

       14
       +
             virtualisation.memorySize = 2048;

     

       15
       +
             virtualisation.diskSize = 10 * 1024;

     

       16
       +
             virtualisation.cores = 2;

     

       17
       +
             services.getty.autologinUser = "root";

     

       18
       +
             environment.systemPackages = with pkgs; [curl vim git];

     

       19
       +
             systemd.tmpfiles.rules = let

     

       20
       +
               u = config.services.tangled-knot.gitUser;

     

       21
       +
               g = config.services.tangled-knot.gitUser;

     

       22
       +
             in [

     

       23
       +
               "d /var/lib/knot 0770 ${u} ${g} - -" # Create the directory first

     

       24
       +
               "f+ /var/lib/knot/secret 0660 ${u} ${g} - KNOT_SERVER_SECRET=38a7c3237c2a585807e06a5bcfac92eb39442063f3da306b7acb15cfdc51d19d"

     

       25
       +
             ];

     

       26
       +
             services.tangled-knot = {

     

       27
       +
               enable = true;

     

       28
       +
               server = {

     

       29
       +
                 secretFile = "/var/lib/knot/secret";

     

       30
       +
                 hostname = "localhost:6000";

     

       31
       +
                 listenAddr = "0.0.0.0:6000";

     

       32
       +
               };

     

       33
       +
             };

     

       34
       +
           })

     

       35
       +
         ];

     

       36
       +
       }