diff --git a/config/headless.nix b/config/headless.nix index 7804616..ac0ae52 100644 --- a/config/headless.nix +++ b/config/headless.nix @@ -1,4 +1,3 @@ { config, lib, ... }: with lib; { services.openssh.enable = mkDefault true; - } diff --git a/config/hosts/web02/configuration.nix b/config/hosts/web02/configuration.nix index 64a6582..856558c 100644 --- a/config/hosts/web02/configuration.nix +++ b/config/hosts/web02/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, fernglas, ... }: +{ config, pkgs, lib, inputs, ... }: let bmpPort = 11019; autoIndex = '' @@ -8,6 +8,9 @@ let autoindex_localtime on; ''; in { + imports = [ + inputs.fernglas.nixosModules.default + ]; networking = { hostName = "web02"; firewall.allowedTCPPorts = [ 80 443 bmpPort ]; @@ -82,7 +85,7 @@ in { }; "lg.kyouma.net" = { useACMEHost = "kyouma.net"; - locations."/".root = fernglas.packages.${config.nixpkgs.hostPlatform.system}.fernglas-frontend; + locations."/".root = inputs.fernglas.packages.${config.nixpkgs.hostPlatform.system}.fernglas-frontend; locations."/api/".proxyPass = "http://${config.services.fernglas.settings.api.bind}"; }; }; diff --git a/flake.lock b/flake.lock index 15f7366..caee0e9 100644 --- a/flake.lock +++ b/flake.lock @@ -72,13 +72,13 @@ "locked": { "lastModified": 1704722960, "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" diff --git a/flake.nix b/flake.nix index b0a99ff..74d36a4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,23 +1,17 @@ { description = "emilys config hell"; inputs = { - nixpkgs = { - type = "github"; - owner = "NixOS"; - repo = "nixpkgs"; - ref = "nixos-unstable"; - }; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:nixos/nixos-hardware"; fernglas.url = "github:wobcom/fernglas"; }; - outputs = { self, nixpkgs, nixos-hardware, fernglas, ... }@attrs: { + outputs = { self, nixpkgs, nixos-hardware, ... }@attrs: { nixosConfigurations = { web02 = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; modules = [ - fernglas.nixosModules.default ./config/common ./config/common-lxc.nix ./config/common-nginx.nix