update deps
This commit is contained in:
		
							parent
							
								
									5908bc1952
								
							
						
					
					
						commit
						bf272f6607
					
				
					 2 changed files with 91 additions and 72 deletions
				
			
		
							
								
								
									
										75
									
								
								flake.nix
									
										
									
									
									
								
							
							
						
						
									
										75
									
								
								flake.nix
									
										
									
									
									
								
							|  | @ -2,50 +2,51 @@ | |||
|   description = "Clan services for use with Amarth Cloud"; | ||||
| 
 | ||||
|   inputs = { | ||||
|     clan-core.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; | ||||
| 
 | ||||
|     nixpkgs.follows = "clan-core/nixpkgs"; | ||||
|     nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; | ||||
| 
 | ||||
|     flake-parts = { | ||||
|       url = "github:hercules-ci/flake-parts"; | ||||
|       inputs.nixpkgs-lib.follows = "nixpkgs"; | ||||
|     }; | ||||
|   }; | ||||
| 
 | ||||
|   outputs = inputs@{ self, flake-parts, clan-core, nixpkgs, ... }: | ||||
|   let | ||||
|     # clan = clan-core.lib.clan { | ||||
|     #   inherit self; | ||||
|     #   imports = []; | ||||
|     #   specialArgs = { inherit inputs; }; | ||||
|     # }; | ||||
|   in | ||||
|   { | ||||
|     # inherit (clan.config) nixosConfigurations nixosModules clanInternals; | ||||
|     # clan = clan.config; | ||||
| 
 | ||||
|     imports = [ | ||||
|       clan-core.flakeModules.default | ||||
|       # ./clanServices/flake-module.nix | ||||
|     ]; | ||||
| 
 | ||||
|     clan.modules = { | ||||
|       "@amarth/zitadel" = flake-parts.lib.importApply ./modules/service/zitadel/default.nix {}; | ||||
|       "@amarth/k3s" = flake-parts.lib.importApply ./clanServices/k3s/default.nix {}; | ||||
|     clan-core = { | ||||
|       url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; | ||||
|       inputs.nixpkgs.follows = "nixpkgs"; | ||||
|       inputs.flake-parts.follows = "flake-parts"; | ||||
|     }; | ||||
| 
 | ||||
|     devShells = | ||||
|       nixpkgs.lib.genAttrs | ||||
|         [ | ||||
|           "x86_64-linux" | ||||
|           "aarch64-linux" | ||||
|           "aarch64-darwin" | ||||
|           "x86_64-darwin" | ||||
|         ] | ||||
|         (system: { | ||||
|           default = clan-core.inputs.nixpkgs.legacyPackages.${system}.mkShell { | ||||
|             packages = [ clan-core.packages.${system}.clan-cli ]; | ||||
|           }; | ||||
|         }); | ||||
|     devshell = { | ||||
|       url = "github:numtide/devshell"; | ||||
|     }; | ||||
|   }; | ||||
| 
 | ||||
|   outputs = | ||||
|     inputs@{ flake-parts, ... }: | ||||
|     flake-parts.lib.mkFlake { inherit inputs; } ({ self, pkgs, ... }: { | ||||
|       systems = [ | ||||
|         "x86_64-linux" | ||||
|       ]; | ||||
| 
 | ||||
|       imports = [ | ||||
|         inputs.clan-core.flakeModules.default | ||||
|         inputs.devshell.flakeModule | ||||
|       ]; | ||||
| 
 | ||||
|       clan = { | ||||
|         meta.name = "amarth-services"; | ||||
| 
 | ||||
|         modules = { | ||||
|           "@amarth/zitadel" = flake-parts.lib.importApply ./modules/service/zitadel/default.nix {}; | ||||
|           "@amarth/k3s" = flake-parts.lib.importApply ./clanServices/k3s/default.nix {}; | ||||
|         }; | ||||
|       }; | ||||
| 
 | ||||
|       perSystem = { system, ... }: { | ||||
|         devshells = { | ||||
|           default = { | ||||
|             packages = [ inputs.clan-core.packages.${system}.clan-cli ]; | ||||
|           }; | ||||
|         }; | ||||
|       }; | ||||
|     }); | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue