fix(server): nixpkgs config; migrate to new frp module

This commit is contained in:
2025-11-24 18:04:11 +08:00
parent 4509f9edf5
commit f4c1b313ce
7 changed files with 279 additions and 273 deletions

View File

@@ -176,6 +176,7 @@
]; ];
services.frp = { services.frp = {
enable = true; enable = true;
instances."" = {
role = "client"; role = "client";
settings = { settings = {
serverAddr = "{{ .Envs.FRP_SERVER_ADDR }}"; serverAddr = "{{ .Envs.FRP_SERVER_ADDR }}";
@@ -294,21 +295,6 @@
customDomains = [ "coder.imxyy.top" ]; customDomains = [ "coder.imxyy.top" ];
} }
{
name = "ai-http";
type = "http";
localIP = "127.0.0.1";
localPort = 80;
customDomains = [ "ai.imxyy.top" ];
}
{
name = "ai-https";
type = "https";
localIP = "127.0.0.1";
localPort = 443;
customDomains = [ "ai.imxyy.top" ];
}
{ {
name = "grafana-http"; name = "grafana-http";
type = "http"; type = "http";
@@ -398,6 +384,7 @@
customDomains = [ "memo.imxyy.top" ]; customDomains = [ "memo.imxyy.top" ];
} }
{ {
name = "efl-matrix-http"; name = "efl-matrix-http";
type = "http"; type = "http";
@@ -429,6 +416,7 @@
]; ];
}; };
}; };
};
sops.secrets.et-imxyy-nix-server = { sops.secrets.et-imxyy-nix-server = {
sopsFile = secrets.et-imxyy-nix-server; sopsFile = secrets.et-imxyy-nix-server;
@@ -523,7 +511,6 @@
"oidc" "oidc"
"mc" "mc"
"music" "music"
"ai"
"sy" "sy"
"immich" "immich"
]; ];

View File

@@ -55,7 +55,7 @@ in
} }
''; '';
}; };
services.frp.settings.proxies = [ services.frp.instances."".settings.proxies = [
{ {
name = "plant-http"; name = "plant-http";
type = "http"; type = "http";

View File

@@ -36,7 +36,7 @@ in
reverse_proxy :8100 reverse_proxy :8100
''; '';
}; };
services.frp.settings.proxies = [ services.frp.instances."".settings.proxies = [
{ {
name = "rsshub-http"; name = "rsshub-http";
type = "http"; type = "http";

View File

@@ -30,7 +30,7 @@
reverse_proxy :8101 reverse_proxy :8101
''; '';
}; };
services.frp.settings.proxies = [ services.frp.instances."".settings.proxies = [
{ {
name = "sshwifty-http"; name = "sshwifty-http";
type = "http"; type = "http";

View File

@@ -42,7 +42,9 @@ local servers = {
command = { "nixfmt" }, command = { "nixfmt" },
}, },
nixpkgs = { nixpkgs = {
-- language=nix
expr = [[ expr = [[
if builtins.pathExists ./flake.lock then
let let
lock = builtins.fromJSON (builtins.readFile ./flake.lock); lock = builtins.fromJSON (builtins.readFile ./flake.lock);
nodeName = lock.nodes.root.inputs.nixpkgs; nodeName = lock.nodes.root.inputs.nixpkgs;
@@ -51,6 +53,8 @@ local servers = {
url = lock.nodes.${nodeName}.locked.url or "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz"; url = lock.nodes.${nodeName}.locked.url or "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz";
sha256 = lock.nodes.${nodeName}.locked.narHash; sha256 = lock.nodes.${nodeName}.locked.narHash;
}) { } }) { }
else
import <nixpkgs> { }
]], ]],
}, },
}, },

View File

@@ -1,8 +1,8 @@
{ {
self, self,
withSystem,
lib, lib,
inputs, inputs,
pkgsParams,
... ...
}: }:
let let
@@ -15,9 +15,11 @@ let
); );
pkgsModule = pkgsModule =
{ config, ... }: { config, ... }:
withSystem config.nixpkgs.hostPlatform.system (perSystem: { {
nixpkgs.pkgs = perSystem.pkgs; nixpkgs = pkgsParams // {
}); inherit (config.nixpkgs.hostPlatform) system;
};
};
hmModule = { hmModule = {
home-manager = { home-manager = {
sharedModules = [ sharedModules = [
@@ -26,6 +28,10 @@ let
inputs.stylix.homeModules.stylix inputs.stylix.homeModules.stylix
inputs.noctalia.homeModules.default inputs.noctalia.homeModules.default
inputs.zen.homeModules.beta inputs.zen.homeModules.beta
{
nixpkgs = lib.mkForce { };
}
]; ];
useGlobalPkgs = true; useGlobalPkgs = true;
}; };

View File

@@ -2,14 +2,12 @@
inputs, inputs,
lib, lib,
config, config,
pkgsParams,
... ...
}: }:
{ {
perSystem = _module.args = {
{ system, pkgs, ... }: pkgsParams = {
{
_module.args.pkgs = import inputs.nixpkgs {
inherit system;
overlays = builtins.attrValues config.flake.overlays ++ [ overlays = builtins.attrValues config.flake.overlays ++ [
inputs.go-musicfox.overlays.default inputs.go-musicfox.overlays.default
inputs.niri.overlays.niri inputs.niri.overlays.niri
@@ -25,6 +23,17 @@
config.allowUnfree = true; config.allowUnfree = true;
flake.setNixPath = false; flake.setNixPath = false;
}; };
};
perSystem =
{
system,
pkgs,
...
}:
let
in
{
_module.args.pkgs = import inputs.nixpkgs (pkgsParams // { inherit system; });
legacyPackages = pkgs; legacyPackages = pkgs;