back round 0 view raw
simplify flake.nix and dedupe #4

open
opened by
anirudh.fi 1 week ago targeting master from push-oqkkllmzurup
Signed-off-by: Anirudh Oppiliappan anirudh@tangled.org
options
unified split
Changed files
+64 -75
flake.nix
+64 -75
flake.nix
···

       1
       1
        
       {

     

       2
       2
        
         description = "nix infra for tangled";

     

       3
       3
       +
       

     

       3
       4
        
         inputs = {

     

       4
       5
        
           nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";

     

       5
       6
        
           tangled.url = "git+https://tangled.org/@tangled.org/core";

     
···

       16
       17
        
           };

     

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       19
       -
         outputs =

     

       20
       20
       -
           { nixpkgs, disko, colmena, nixery-flake, tangled, ... }:

     

       21
       21
       -
           {

     

       22
       22
       -
             nixosConfigurations.nixery = nixpkgs.lib.nixosSystem {

     

       23
       23
       -
               system = "x86_64-linux";

     

       24
       24
       -
               modules = [

     

       25
       25
       -
                 disko.nixosModules.disko

     

       26
       26
       -
                 tangled.nixosModules.spindle

     

       27
       27
       -
                 ./hosts/nixery/configuration.nix

     

       28
       28
       -
               ];

     

       29
       29
       -
             };

     

       30
       30
       -
             nixosConfigurations.pds = nixpkgs.lib.nixosSystem {

     

       31
       31
       -
               system = "x86_64-linux";

     

       32
       32
       -
               specialArgs = {

     

       33
       33
       -
                 commonArgs = import ./common/ssh.nix;

     

       34
       34
       -
               };

     

       35
       35
       -
               modules = [

     

       36
       36
       -
                 disko.nixosModules.disko

     

       37
       37
       -
                 ./hosts/pds/configuration.nix

     

       38
       38
       -
               ];

     

       39
       39
       -
             };

     

       40
       40
       -
             nixosConfigurations.appview = nixpkgs.lib.nixosSystem {

     

       41
       41
       -
               system = "x86_64-linux";

     

       42
       42
       -
               specialArgs = {

     

       43
       43
       -
                 commonArgs = import ./common/ssh.nix;

     

       44
       44
       -
               };

     

       45
       45
       -
               modules = [

     

       46
       46
       -
                 disko.nixosModules.disko

     

       47
       47
       -
                 ./hosts/appview/configuration.nix

     

       48
       48
       -
               ];

     

       49
       49
       -
             };

     

       20
       20
       +
         outputs = { nixpkgs, disko, colmena, nixery-flake, tangled, ... }:

     

       21
       21
       +
           let

     

       22
       22
       +
             system = "x86_64-linux";

     

       23
       23
       +
             commonArgs = import ./common/ssh.nix;

     

       50
       24
        
       

     

       51
       51
       -
             colmenaHive = colmena.lib.makeHive {

     

       52
       52
       -
               meta = {

     

       53
       53
       -
                 nixpkgs = nixpkgs.legacyPackages.x86_64-linux;

     

       54
       54
       -
                 specialArgs = {

     

       55
       55
       -
                   nixery-pkgs = import nixery-flake.outPath {

     

       56
       56
       -
                     pkgs = import nixpkgs { system = "x86_64-linux"; };

     

       57
       57
       -
                   };

     

       58
       58
       -
                   commonArgs = import ./common/ssh.nix;

     

       59
       59
       -
                 };

     

       25
       25
       +
             # Helper function to create nixosConfiguration

     

       26
       26
       +
             mkHost = hostname: extraModules:

     

       27
       27
       +
               nixpkgs.lib.nixosSystem {

     

       28
       28
       +
                 inherit system;

     

       29
       29
       +
                 specialArgs = { inherit commonArgs; };

     

       30
       30
       +
                 modules = [

     

       31
       31
       +
                   disko.nixosModules.disko

     

       32
       32
       +
                   ./hosts/${hostname}/configuration.nix

     

       33
       33
       +
                 ] ++ extraModules;

     

       60
       34
        
               };

     

       61
       35
        
       

     

       62
       62
       -
               defaults = { pkgs, ... }: {

     

       63
       63
       -
                 environment.systemPackages = [

     

       64
       64
       -
                   pkgs.curl

     

       65
       65
       -
                 ];

     

       66
       66
       -
               };

     

       67
       67
       -
               appview = { pkgs, ... }: {

     

       36
       36
       +
             # Helper function to create colmena host

     

       37
       37
       +
             mkColmenaHost = hostname: targetHost: extraModules:

     

       38
       38
       +
               {

     

       68
       39
        
                 deployment = {

     

       69
       69
       -
                   targetHost = "alpha.tangled.sh";

     

       40
       40
       +
                   inherit targetHost;

     

       70
       41
        
                   targetPort = 22;

     

       71
       42
        
                   targetUser = "tangler";

     

       72
       43
        
                   buildOnTarget = true;

     

       73
       44
        
                 };

     

       74
       74
       -
                 nixpkgs.system = "x86_64-linux";

     

       45
       45
       +
                 nixpkgs.system = system;

     

       46
       46
       +
                 time.timeZone = "Europe/Helsinki";

     

       75
       47
        
                 imports = [

     

       76
       48
        
                   disko.nixosModules.disko

     

       49
       49
       +
                   ./hosts/${hostname}/configuration.nix

     

       50
       50
       +
                 ] ++ extraModules;

     

       51
       51
       +
               };

     

       52
       52
       +
       

     

       53
       53
       +
             # Host configurations

     

       54
       54
       +
             hosts = {

     

       55
       55
       +
               appview = {

     

       56
       56
       +
                 modules = [

     

       77
       57
        
                   tangled.nixosModules.appview

     

       78
       78
       -
                   ./hosts/appview/configuration.nix

     

       79
       58
        
                   ./hosts/appview/services/appview.nix

     

       80
       59
        
                   ./hosts/appview/services/nginx-alpha.nix

     

       81
       60
        
                 ];

     

       82
       82
       -
                 time.timeZone = "Europe/Helsinki";

     

       61
       61
       +
                 target = "alpha.tangled.sh";

     

       83
       62
        
               };

     

       84
       84
       -
               pds = { pkgs, ... }: {

     

       85
       85
       -
                 deployment = {

     

       86
       86
       -
                   targetHost = "tngl.sh";

     

       87
       87
       -
                   targetPort = 22;

     

       88
       88
       -
                   targetUser = "tangler";

     

       89
       89
       -
                   buildOnTarget = true;

     

       90
       90
       -
                 };

     

       91
       91
       -
                 nixpkgs.system = "x86_64-linux";

     

       92
       63
        
       

     

       93
       93
       -
                 imports = [

     

       94
       94
       -
                   disko.nixosModules.disko

     

       95
       95
       -
                   ./hosts/pds/configuration.nix

     

       64
       64
       +
               pds = {

     

       65
       65
       +
                 modules = [

     

       96
       66
        
                   ./hosts/pds/services/nginx.nix

     

       97
       67
        
                   ./hosts/pds/services/pds.nix

     

       98
       68
        
                 ];

     

       99
       99
       -
                 time.timeZone = "Europe/Helsinki";

     

       69
       69
       +
                 target = "tngl.sh";

     

       100
       70
        
               };

     

       101
       71
        
       

     

       102
       102
       -
               nixery = { pkgs, ... }: {

     

       103
       103
       -
                 deployment = {

     

       104
       104
       -
                   targetHost = "nixery.tangled.sh";

     

       105
       105
       -
                   targetPort = 22;

     

       106
       106
       -
                   targetUser = "tangler";

     

       107
       107
       -
                   buildOnTarget = true;

     

       108
       108
       -
                 };

     

       109
       109
       -
                 nixpkgs.system = "x86_64-linux";

     

       110
       110
       -
       

     

       111
       111
       -
                 imports = [

     

       112
       112
       -
                   disko.nixosModules.disko

     

       72
       72
       +
               nixery = {

     

       73
       73
       +
                 modules = [

     

       113
       74
        
                   tangled.nixosModules.spindle

     

       114
       114
       -
                   ./hosts/nixery/configuration.nix

     

       115
       75
        
                   ./hosts/nixery/services/nginx.nix

     

       116
       76
        
                   ./hosts/nixery/services/openbao/openbao.nix

     

       117
       77
        
                   ./hosts/nixery/services/openbao/proxy.nix

     

       118
       78
        
                   ./hosts/nixery/services/nixery.nix

     

       119
       79
        
                 ];

     

       120
       120
       -
                 time.timeZone = "Europe/Helsinki";

     

       80
       80
       +
                 target = "nixery.tangled.sh";

     

       81
       81
       +
               };

     

       82
       82
       +
             };

     

       83
       83
       +
           in

     

       84
       84
       +
           {

     

       85
       85
       +
             # nixos-anywhere and nixos-rebuild use these

     

       86
       86
       +
             nixosConfigurations = {

     

       87
       87
       +
               appview = mkHost "appview" hosts.appview.modules;

     

       88
       88
       +
               pds = mkHost "pds" hosts.pds.modules;

     

       89
       89
       +
               nixery = mkHost "nixery" hosts.nixery.modules;

     

       90
       90
       +
             };

     

       91
       91
       +
       

     

       92
       92
       +
             # colmena uses this

     

       93
       93
       +
             colmenaHive = colmena.lib.makeHive {

     

       94
       94
       +
               meta = {

     

       95
       95
       +
                 nixpkgs = nixpkgs.legacyPackages.${system};

     

       96
       96
       +
                 specialArgs = {

     

       97
       97
       +
                   inherit commonArgs;

     

       98
       98
       +
                   nixery-pkgs = import nixery-flake.outPath {

     

       99
       99
       +
                     pkgs = import nixpkgs { inherit system; };

     

       100
       100
       +
                   };

     

       101
       101
       +
                 };

     

       102
       102
       +
               };

     

       103
       103
       +
       

     

       104
       104
       +
               defaults = { pkgs, ... }: {

     

       105
       105
       +
                 environment.systemPackages = [ pkgs.curl ];

     

       121
       106
        
               };

     

       107
       107
       +
       

     

       108
       108
       +
               appview = mkColmenaHost "appview" hosts.appview.target hosts.appview.modules;

     

       109
       109
       +
               pds = mkColmenaHost "pds" hosts.pds.target hosts.pds.modules;

     

       110
       110
       +
               nixery = mkColmenaHost "nixery" hosts.nixery.target hosts.nixery.modules;

     

       122
       111
        
             };

     

       123
       112
        
           };

     

       124
       113
        
       }