diff --git a/flake.lock b/flake.lock index 19897ff..47f7738 100644 --- a/flake.lock +++ b/flake.lock @@ -389,16 +389,16 @@ }, "nixpkgsOld": { "locked": { - "lastModified": 1685573264, - "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "380be19fbd2d9079f677978361792cb25e8a3635", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 2c61090..d797d1c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,67 +1,81 @@ { inputs = { nixpkgsOld.url = "github:NixOS/nixpkgs/nixos-22.11"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable"; #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; arion.url = "github:hercules-ci/arion"; mms.url = "github:mkaito/nixos-modded-minecraft-servers"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05"; conduit = { - url = "gitlab:famedly/conduit"; + url = "gitlab:famedly/conduit"; }; }; - outputs = { self, nixpkgsOld, nixpkgs, nixpkgsUnstable, ... }@inputs: - let - hostPkgs = import nixpkgs { system = "x86_64-linux"; }; - in { - devShell."x86_64-linux" = with hostPkgs; mkShell { - buildInputs = [ colmena pass ]; + outputs = { + self, + nixpkgsOld, + nixpkgs, + nixpkgsUnstable, + ... + } @ inputs: let + hostPkgs = import nixpkgs {system = "x86_64-linux";}; + in { + devShell."x86_64-linux" = with hostPkgs; + mkShell { + buildInputs = [colmena pass]; }; - colmena = { - meta = { - nixpkgs = import nixpkgs { + colmena = { + meta = { + nixpkgs = import nixpkgs { + system = "aarch64-linux"; + overlays = []; + }; + specialArgs = { + inherit inputs nixpkgsUnstable; + pkgsUnstable = import nixpkgsUnstable { system = "aarch64-linux"; overlays = []; }; - specialArgs = { - inherit inputs; - pkgsUnstable = import nixpkgsUnstable { - system = "aarch64-linux"; - overlays = []; - }; - pkgsOld = import nixpkgsOld { - system = "aarch64-linux"; - overlays = []; - }; + pkgsOld = import nixpkgsOld { + system = "aarch64-linux"; + overlays = []; }; }; - - katzencafe = { name, nodes, pkgs, pkgsUnstable, inputs, ... }: { - deployment = { - targetHost = "katzen.cafe"; - buildOnTarget = true; - }; - imports = [ - ./modules/base-stuff.nix - ./modules/proxy.nix - ./modules/postgres.nix - ./modules/jitsi.nix - ./modules/containers - ./modules/conduit.nix - ./modules/keycloak.nix - ./modules/forgejo.nix - ./modules/mumble.nix - ./modules/modded-mc.nix - ./modules/monitoring.nix - ./modules/mailserver.nix - ./modules/vaultwarden.nix - ./modules/hedgedoc.nix - ]; - - system.stateVersion = "22.11"; - }; + }; + + katzencafe = { + name, + nodes, + pkgs, + pkgsUnstable, + inputs, + ... + }: { + deployment = { + targetHost = "katzen.cafe"; + buildOnTarget = true; + }; + imports = [ + ./modules/base-stuff.nix + ./modules/proxy.nix + ./modules/postgres.nix + ./modules/jitsi.nix + ./modules/containers + ./modules/conduit.nix + ./modules/keycloak.nix + ./modules/forgejo.nix + ./modules/mumble.nix + ./modules/modded-mc.nix + ./modules/monitoring.nix + ./modules/mailserver.nix + ./modules/vaultwarden.nix + ./modules/hedgedoc.nix + ./modules/invidious.nix + ]; + + system.stateVersion = "22.11"; }; }; + }; }