diff options
Diffstat (limited to 'flake.nix')
| -rw-r--r-- | flake.nix | 35 |
1 files changed, 18 insertions, 17 deletions
@@ -1,15 +1,15 @@ { description = "CrashOverBurn.com"; -# TODO: cgit, ejabber signup + # TODO: cgit, ejabber signup inputs = { nixinate.url = "github:DarthPJB/nixinate"; secrix.url = "github:platonic-systems/secrix"; - nixpkgs_unstable.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; + #nixpkgs_unstable.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-25.05"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; }; - outputs = inputs@{ self, nixpkgs, secrix, nixinate, nixpkgs_unstable, simple-nixos-mailserver }: + outputs = inputs@{ self, nixpkgs, secrix, nixinate, simple-nixos-mailserver }: let inherit (inputs.secrix) secrix; pkgs = nixpkgs.legacyPackages.x86_64-linux; @@ -19,7 +19,7 @@ in { formatter.x86_64-linux = pkgs.nixpkgs-fmt; - apps.x86_64-linux = (inputs.nixinate.nixinate.x86_64-linux inputs.self).nixinate // ({ secrix = secrix self; }); + apps.x86_64-linux = (nixinate.nixinate.x86_64-linux inputs.self).nixinate // ({ secrix = secrix self; }); devShell.x86_64-linux = pkgs.mkShell { buildInputs = with pkgs; [ figlet tmux ]; @@ -67,31 +67,32 @@ ./users/commander.nix (import ./services/cgit.nix { fqdn = "code.${fqdn}"; }) (import ./services/murmur.nix { fqdn = "mumble.${fqdn}"; }) - (import ./services/movim.nix { fqdn = "mumble.${fqdn}"; }) + (import ./services/movim.nix { fqdn = "social.${fqdn}"; }) (import ./services/website.nix { inherit webroot; }) (import ./services/ejabberd.nix { inherit fqdn; }) (import ./services/mailserver.nix { inherit hashedPasswordFile; }) ./machines/overburn-1.nix - { + { secrix.hostPubKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII3ElH/WQjW3B2yUBFFPpF8IIHsYrHODwTid6YM2npiw root@web-crash-over-burn"; secrix.defaultEncryptKeys = { - crash = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhzz/CAb74rLQkDF2weTCb0DICw1oyXNv6XmdLfEsT5 crash@crashoverburn.com" ]; + crash = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhzz/CAb74rLQkDF2weTCb0DICw1oyXNv6XmdLfEsT5 crash@crashoverburn.com" ]; }; imports = [ - "${nixpkgs}/nixos/modules/virtualisation/openstack-config.nix" + "${nixpkgs}/nixos/modules/virtualisation/openstack-config.nix" ]; - _module.args = - { + _module.args = + { inherit self inputs; nixinate = { - host = "193.16.42.36"; - sshUser = "commander"; - substituteOnTarget = true; - hermetic = true; - buildOn = "local"; + host = "193.16.42.36"; + port = 1108; + sshUser = "commander"; + substituteOnTarget = false; + hermetic = true; + buildOn = "local"; }; - }; - } + }; + } ]; }; }; |