pazpi/nix
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Huge Typo!!!

Browse source
This commit is contained in:
pazpi 2025-03-20 21:57:35 +01:00
parent 830670c8f0
commit abbad538be
6 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hosts/default.nix
View file

@ -200,12 +200,12 @@ in
# specialArgs = { }; # specialArgs = { };
}; };
shadowshocks = nixpkgs.lib.nixosSystem { shadowsocks = nixpkgs.lib.nixosSystem {
pkgs = pkgs "x86_64-linux"; pkgs = pkgs "x86_64-linux";
modules = [ modules = [
myModules myModules
proxmoxModule proxmoxModule
./shadowshocks ./shadowsocks
agenix.nixosModules.default agenix.nixosModules.default
]; ];
# specialArgs = { }; # specialArgs = { };

6
hosts/deployments.nix
View file

@ -116,12 +116,12 @@ in
]; ];
}; };
shadowshocks.deployment = { shadowsocks.deployment = {
targetHost = hosts.shadowshocks; targetHost = hosts.shadowsocks;
tags = [ tags = [
"lxc" "lxc"
"bacco" "bacco"
"shadowshocks" "shadowsocks"
]; ];
}; };

2
hosts/parameters.nix
View file

@ -14,7 +14,7 @@
pve02 = "node.internal"; pve02 = "node.internal";
dns01 = "192.168.1.2"; dns01 = "192.168.1.2";
dns02 = "192.168.1.3"; dns02 = "192.168.1.3";
shadowshocks = "shadowshocks.internal"; shadowsocks = "shadowsocks.internal";
mpd = "192.168.1.7"; mpd = "192.168.1.7";
librechat = "librechat.internal"; librechat = "librechat.internal";
}; };

10
hosts/shadowshocks/default.nix → hosts/shadowsocks/default.nix
View file

@ -5,13 +5,13 @@
... ...
}: }:
let let
shadowshocks-port = 8388; shadowsocks-port = 8388;
p = import ../parameters.nix; p = import ../parameters.nix;
in in
{ {
age.secrets = { age.secrets = {
shadowshocks-password.file = ../../secrets/shadowshocks-password.age; shadowsocks-password.file = ../../secrets/shadowsocks-password.age;
tailscale-authKey.file = ../../secrets/tailscale-authKey.age; tailscale-authKey.file = ../../secrets/tailscale-authKey.age;
}; };
@ -19,10 +19,10 @@ in
networking = { networking = {
shadowshocks = { shadowsocks = {
enable = true; enable = true;
port = shadowshocks-port; port = shadowsocks-port;
passwordFile = config.age.secrets.shadowshocks-password.path; passwordFile = config.age.secrets.shadowsocks-password.path;
}; };
tailscale = { tailscale = {

2
secrets.nix
View file

@ -26,7 +26,7 @@ let
dns01-admin-password = [ machines.dns01 ]; dns01-admin-password = [ machines.dns01 ];
dns02-admin-password = [ machines.dns02 ]; dns02-admin-password = [ machines.dns02 ];
dns02-dhcp-failover = [ machines.dns02 ]; dns02-dhcp-failover = [ machines.dns02 ];
shadowshocks-password = [ machines.shadowshocks ]; shadowsocks-password = [ machines.shadowsocks ];
}; };
in in
builtins.listToAttrs ( builtins.listToAttrs (

2
ssh-keys.nix
View file

@ -19,7 +19,7 @@ rec {
auth = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFsSQbXHRt+MpUh+YQxd5p6YPnbbWR/4ylz/pXjdZ9Bs"; auth = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFsSQbXHRt+MpUh+YQxd5p6YPnbbWR/4ylz/pXjdZ9Bs";
dns01 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII7BdiP/dCE6FHoJylcBKQ5AXz06UpLHNyeuvfLVccSi"; dns01 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII7BdiP/dCE6FHoJylcBKQ5AXz06UpLHNyeuvfLVccSi";
dns02 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ+HIq6/ebjiv71xDozdOTn5AdnXgr1fGqIzXnH7Not+"; dns02 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ+HIq6/ebjiv71xDozdOTn5AdnXgr1fGqIzXnH7Not+";
shadowshocks = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINQ4qYaS5ccciH7BNyrF5+J3d4JtHJNr1R256/ulEtxl"; shadowsocks = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINQ4qYaS5ccciH7BNyrF5+J3d4JtHJNr1R256/ulEtxl";
}; };
# Machines able to provision other machines # Machines able to provision other machines