Revert "server down migrate website"
about time This reverts commit 8e187e6b3a7cb1d45d5502b520f67c39401330e1.
This commit is contained in:
parent
558d518286
commit
401c5b35c7
5 changed files with 37 additions and 34 deletions
23
flake.lock
generated
23
flake.lock
generated
|
@ -1,5 +1,21 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
|
"chromium": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1734083684,
|
||||||
|
"narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -22,11 +38,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734119587,
|
"lastModified": 1733940404,
|
||||||
"narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
|
"narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
|
"rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -38,6 +54,7 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"chromium": "chromium",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"sops-nix": "sops-nix"
|
"sops-nix": "sops-nix"
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
chromium.url = "github:NixOS/nixpkgs/314e12ba369ccdb9b352a4db26ff419f7c49fa84";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {
|
outputs = {
|
||||||
|
|
|
@ -57,7 +57,8 @@
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
firefox
|
firefox
|
||||||
ungoogled-chromium
|
inputs.chromium.legacyPackages.${system}.ungoogled-chromium
|
||||||
|
# ungoogled-chromium
|
||||||
librewolf
|
librewolf
|
||||||
bitwarden-desktop
|
bitwarden-desktop
|
||||||
bitwarden-cli
|
bitwarden-cli
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
cything.io {
|
|
||||||
uri strip_prefix /blog
|
|
||||||
reverse_proxy localhost:8084
|
|
||||||
}
|
|
||||||
|
|
||||||
www.cything.io {
|
|
||||||
redir https://cything.io{uri} permanent
|
|
||||||
}
|
|
|
@ -51,12 +51,10 @@
|
||||||
dns = "none";
|
dns = "none";
|
||||||
wifi.backend = "iwd";
|
wifi.backend = "iwd";
|
||||||
};
|
};
|
||||||
# nameservers = ["31.59.129.225" "2a0f:85c1:840:2bfb::1"];
|
nameservers = ["31.59.129.225" "2a0f:85c1:840:2bfb::1"];
|
||||||
nameservers = ["1.1.1.1"];
|
|
||||||
resolvconf.enable = true;
|
resolvconf.enable = true;
|
||||||
firewall = {
|
firewall = {
|
||||||
allowedUDPPorts = [51820 443]; # for wireguard
|
allowedUDPPorts = [51820]; # for wireguard
|
||||||
allowedTCPPorts = [80 443];
|
|
||||||
trustedInterfaces = ["wg0"];
|
trustedInterfaces = ["wg0"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -267,23 +265,17 @@
|
||||||
services.ollama.enable = true;
|
services.ollama.enable = true;
|
||||||
|
|
||||||
# wireguard setup
|
# wireguard setup
|
||||||
# networking.wg-quick.interfaces.wg0 = {
|
networking.wg-quick.interfaces.wg0 = {
|
||||||
# address = ["10.0.0.2/24" "fdc9:281f:04d7:9ee9::2/64"];
|
address = ["10.0.0.2/24" "fdc9:281f:04d7:9ee9::2/64"];
|
||||||
# privateKeyFile = "/run/secrets/wireguard/private";
|
privateKeyFile = "/run/secrets/wireguard/private";
|
||||||
# peers = [
|
peers = [
|
||||||
# {
|
{
|
||||||
# publicKey = "a16/F/wP7HQIUtFywebqPSXQAktPsLgsMLH9ZfevMy0=";
|
publicKey = "a16/F/wP7HQIUtFywebqPSXQAktPsLgsMLH9ZfevMy0=";
|
||||||
# allowedIPs = ["0.0.0.0/0" "::/0"];
|
allowedIPs = ["0.0.0.0/0" "::/0"];
|
||||||
# endpoint = "31.59.129.225:51820";
|
endpoint = "31.59.129.225:51820";
|
||||||
# persistentKeepalive = 25;
|
persistentKeepalive = 25;
|
||||||
# presharedKeyFile = "/run/secrets/wireguard/psk";
|
presharedKeyFile = "/run/secrets/wireguard/psk";
|
||||||
# }
|
}
|
||||||
# ];
|
];
|
||||||
# };
|
|
||||||
|
|
||||||
services.caddy = {
|
|
||||||
enable = true;
|
|
||||||
configFile = ./Caddyfile;
|
|
||||||
logFormat = lib.mkForce "level INFO";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue