diff --git a/flake.lock b/flake.lock index cf0fa40..95227ba 100644 --- a/flake.lock +++ b/flake.lock @@ -102,6 +102,22 @@ "type": "github" } }, + "homepage": { + "flake": false, + "locked": { + "lastModified": 1671712043, + "narHash": "sha256-/vXNV0mnDjLsHq26wnneivKmKIpb/3Yv7n95k3LIuK8=", + "owner": "baduhai", + "repo": "homepage", + "rev": "d9f2b593d2a51d4111cece5d781c23774c8a3adb", + "type": "github" + }, + "original": { + "owner": "baduhai", + "repo": "homepage", + "type": "github" + } + }, "kmonad": { "inputs": { "nixpkgs": [ @@ -213,6 +229,7 @@ "deploy-rs": "deploy-rs", "home-manager": "home-manager", "home-manager-stable": "home-manager-stable", + "homepage": "homepage", "kmonad": "kmonad", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 13e5dc0..b16aca4 100644 --- a/flake.nix +++ b/flake.nix @@ -5,40 +5,23 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.11"; - home-manager = { - url = "github:nix-community/home-manager/master"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - home-manager-stable = { - url = "github:nix-community/home-manager/release-22.11"; - inputs.nixpkgs.follows = "nixpkgs-stable"; - }; + home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; + home-manager-stable = { url = "github:nix-community/home-manager/release-22.11"; inputs.nixpkgs.follows = "nixpkgs-stable"; }; nur.url = "github:nix-community/nur"; - kmonad = { - url = "github:kmonad/kmonad?dir=nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + kmonad = { url = "github:kmonad/kmonad?dir=nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - deploy-rs = { - url = "github:serokell/deploy-rs"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; }; - agenix = { - url = "github:ryantm/agenix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-generators = { - url = "github:nix-community/nixos-generators"; - inputs.nixpkgs.follows = "nixpkgs-stable"; - }; + nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgs-stable"; }; + + homepage = { url = "github:baduhai/homepage"; flake = false; }; }; - outputs = inputs @ { self, nixpkgs, home-manager, nur, kmonad, nixpkgs-stable, home-manager-stable, deploy-rs, agenix, nixos-generators, ... }: { + outputs = inputs @ { self, nixpkgs, home-manager, nur, kmonad, nixpkgs-stable, home-manager-stable, deploy-rs, agenix, nixos-generators, homepage, ... }: { nixosConfigurations = { io = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; diff --git a/hosts/servers/alexandria/hosted-services.nix b/hosts/servers/alexandria/hosted-services.nix index 0854df7..4918852 100644 --- a/hosts/servers/alexandria/hosted-services.nix +++ b/hosts/servers/alexandria/hosted-services.nix @@ -1,4 +1,4 @@ -{ config, pkgs, libs, ... }: +{ inputs, config, pkgs, libs, ... }: { users.users.nginx.extraGroups = [ "acme" ]; @@ -11,7 +11,7 @@ recommendedProxySettings = true; recommendedTlsSettings = true; virtualHosts = { - "baduhai.me" = { useACMEHost = "baduhai.me"; forceSSL = true; kTLS = true; locations."/".proxyPass = "http://127.0.0.1:8000/"; }; + "baduhai.me" = { useACMEHost = "baduhai.me"; forceSSL = true; kTLS = true; root = inputs.homepage; }; "detect.baduhai.me" = { useACMEHost = "baduhai.me"; forceSSL = true; kTLS = true; locations."/".proxyPass = "http://127.0.0.1:8001/"; }; "cinny.baduhai.me" = { useACMEHost = "baduhai.me"; forceSSL = true; kTLS = true; locations."/".proxyPass = "http://127.0.0.1:8002/"; }; "jellyfin.baduhai.me" = { useACMEHost = "baduhai.me"; forceSSL = true; kTLS = true; locations."/".proxyPass = "http://127.0.0.1:8003/"; }; @@ -31,19 +31,6 @@ oci-containers = { backend = "docker"; containers = { - "homarr" = { - image = "ghcr.io/ajnart/homarr:latest"; - volumes = [ - "/data/homarr/configs:/app/data/configs" - "/var/run/docker.sock:/var/run/docker.sock:ro" - ]; - ports = [ - "8000:7575" - ]; - extraOptions = [ - "--pull=always" - ]; - }; "changedetection" = { image = "lscr.io/linuxserver/changedetection.io:latest"; environment = {