gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: equalise

Browse source
This commit is contained in:
Kat Inskip 2022-11-14 11:08:09 -08:00
parent 90fe57fa33
commit 20da42728b
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
7 changed files with 53 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

36
flake.lock generated
View file

@ -3,11 +3,11 @@
"arcexprs": { "arcexprs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1667597026, "lastModified": 1667844584,
"narHash": "sha256-XHtUQKU+w+m2/DPVlB8fmUKtSIarv/n0wOGwho/ZuCo=", "narHash": "sha256-YucZC6fUjAldFvCpdjjvp0H8NBIb6xwp4ITecQGG5ZU=",
"owner": "arcnmx", "owner": "arcnmx",
"repo": "nixexprs", "repo": "nixexprs",
"rev": "a00aaa69de023da7f1429a2bd3081b1f5400118b", "rev": "ca2d7f002db8abc6133b19d9f97510364d64a377",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,11 +20,11 @@
"ci": { "ci": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1667599669, "lastModified": 1667932467,
"narHash": "sha256-0/PsJ5UoJ4Xa74vu25xoUO07JxHfK6pLhnjEglsWvFA=", "narHash": "sha256-LjDP5b6YvHOXjqX5JrnsKBtrZ+AOrB5icMeRlONaXto=",
"owner": "arcnmx", "owner": "arcnmx",
"repo": "ci", "repo": "ci",
"rev": "bfb73a0a2f7daeca40f8ee73506b1c5b5b5d53dc", "rev": "e744677fdde8b127cac7d6d6c7869ae1a89dd365",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -91,11 +91,11 @@
"emacs-overlay": { "emacs-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1667507825, "lastModified": 1668107626,
"narHash": "sha256-Tss8NXLO5HIqcY+v+lMy/tcdBKNwKxW5Lb4PkuS5rmY=", "narHash": "sha256-+SqPtgD0fQ/LvYxPH+1I5lR76rAqI67GcjQ1gvwUt6U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "ccefa5f7ddbb036656d8617ed2862fe057d60fb4", "rev": "a5732835d449b66324efa829e3b8be73be3d505e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +342,11 @@
"ws-butler": "ws-butler" "ws-butler": "ws-butler"
}, },
"locked": { "locked": {
"lastModified": 1667731647, "lastModified": 1668132183,
"narHash": "sha256-E/Y5yxX8u0RlLt07PJoQ+QAYMbbL19WayLU/SJDtnMw=", "narHash": "sha256-oHycAYbl3vU8sHQ4vwjW5SZ4T3x+B6bckSDCMjlRMdk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-doom-emacs", "repo": "nix-doom-emacs",
"rev": "c38ccd08345f58001cac2c2578e71d3f29b59bc0", "rev": "d73237307872f29f2c6492aa81dfc8be0dead7a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +373,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1667629849, "lastModified": 1668087632,
"narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=", "narHash": "sha256-T/cUx44aYDuLMFfaiVpMdTjL4kpG7bh0VkN6JEM78/E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3bacde6273b09a21a8ccfba15586fb165078fb62", "rev": "5f588eb4a958f1a526ed8da02d6ea1bea0047b9f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -405,11 +405,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1667742561, "lastModified": 1668255064,
"narHash": "sha256-lhNo7sk3eqq9SOABZYBECXlP552B1wgsLEGSQkWMM1M=", "narHash": "sha256-JWVzaBAC9eL+Eg/SG71ZPSDQQd/eO9sS2YNGrlDDEH4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "8aab177dc76d9b2cffe23720567ad81aaae13052", "rev": "9a0be7d4b9de779707b8788c6bdaaf23160a7975",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home/shell/zsh.nix
View file

@ -72,7 +72,7 @@ xdg.configFile."kattheme_immutable.json".text = builtins.toJSON rec {
${lib.concatStringsSep "\n" (map (opt: "setopt ${opt}") zshOpts)} ${lib.concatStringsSep "\n" (map (opt: "setopt ${opt}") zshOpts)}
bindkey '^ ' autosuggest-accept bindkey '^ ' autosuggest-accept
${if pkgs.hostPlatform.isDarwin then '' ${if pkgs.hostPlatform.isDarwin then ''
export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH" export PATH="''${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
'' else "" '' else ""
} }
''; '';

8
modules/nixos/network.nix
View file

@ -365,7 +365,11 @@
mode = "0440"; mode = "0440";
} }
) (filterAttrs (_: settings: settings.create_cert) config.domains); ) (filterAttrs (_: settings: settings.create_cert) config.domains);
in networks // networks' // domains // domains'; in networks // networks' // domains // domains' // {
tailscale-key = {
text = tf.resources.tailnet_key.refAttr "key";
};
};
services.nginx.virtualHosts = let services.nginx.virtualHosts = let
networkVirtualHosts = concatLists (mapAttrsToList (network: settings: map(domain: nameValuePair (if domain != "@" then domain else settings.zone) { networkVirtualHosts = concatLists (mapAttrsToList (network: settings: map(domain: nameValuePair (if domain != "@" then domain else settings.zone) {
@ -421,7 +425,7 @@
# otherwise authenticate with tailscale # otherwise authenticate with tailscale
# to-do: --advertise-exit-node # to-do: --advertise-exit-node
${tailscale}/bin/tailscale up -authkey ${tf.resources.tailnet_key.getAttr "key"} ${tailscale}/bin/tailscale up -authkey $(cat ${config.secrets.files.tailscale-key.path})
''; '';
}; };
}; };

6
nixos/base/system.nix
View file

@ -6,9 +6,9 @@
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = true;
boot.zfs.enableUnstable = mkIf (elem "zfs" config.boot.supportedFilesystems) true; boot.zfs.enableUnstable = mkIf (elem "zfs" config.boot.supportedFilesystems) true;
boot.kernel.sysctl = { boot.kernel.sysctl = {
"fs.inotify.max_user_watches" = "524288"; "fs.inotify.max_user_watches" = 524288;
"net.core.rmem_max" = "16777216"; "net.core.rmem_max" = 16777216;
"net.core.wmem_max" = "16777216"; "net.core.wmem_max" = 16777216;
"net.ipv4.tcp_rmem" = "4096 87380 16777216"; "net.ipv4.tcp_rmem" = "4096 87380 16777216";
"net.ipv4.tcp_wmem" = "4096 65536 16777216"; "net.ipv4.tcp_wmem" = "4096 65536 16777216";
"net.ipv4.ip_forward" = "1"; "net.ipv4.ip_forward" = "1";

6
nixos/gui/nfs.nix
View file

@ -3,13 +3,13 @@
{ {
boot.supportedFilesystems = [ "nfs" ]; boot.supportedFilesystems = [ "nfs" ];
/*
fileSystems."/mnt/kat-nas" = lib.mkIf (config.networking.hostName != "yukari") { fileSystems."/mnt/kat-nas" = lib.mkIf (config.networking.hostName != "yukari") {
device = "${meta.network.nodes.nixos.yukari.network.addresses.w.domain}:/mnt/zraw/media"; device = "yukari.inskip.me:/mnt/zraw/media";
fsType = "nfs"; fsType = "nfs";
options = [ "x-systemd.automount" "noauto" "nfsvers=4" "soft" "retrans=2" "timeo=60" ]; options = [ "x-systemd.automount" "noauto" "nfsvers=4" "soft" "retrans=2" "timeo=60" ];
}; };
/*
fileSystems."/mnt/hex-corn" = { fileSystems."/mnt/hex-corn" = {
device = "storah.net.lilwit.ch:/data/cornbox"; device = "storah.net.lilwit.ch:/data/cornbox";
fsType = "nfs"; fsType = "nfs";

22
nixos/systems/tewi/nixos.nix
View file

@ -1,4 +1,4 @@
{ meta, config, lib, pkgs, modulesPath, ... }: { meta, tf, config, lib, pkgs, modulesPath, ... }:
{ {
imports = with meta; [ imports = with meta; [
@ -14,6 +14,7 @@
./mosquitto.nix ./mosquitto.nix
./postgres.nix ./postgres.nix
./nginx.nix ./nginx.nix
../../gui/nfs.nix
]; ];
services.cockroachdb.locality = "provider=local,network=gensokyo,host=${config.networking.hostName}"; services.cockroachdb.locality = "provider=local,network=gensokyo,host=${config.networking.hostName}";
@ -51,6 +52,25 @@
kernelModules = [ "kvm-intel" ]; kernelModules = [ "kvm-intel" ];
}; };
services.openiscsi = {
enable = true;
name = "";
discoverPortal = "shanghai.tail.cutie.moe";
};
environment.etc."iscsi/initiatorname.iscsi" = lib.mkForce {
source = config.secrets.files.openscsi-config.path;
};
secrets.variables.openscsi-password = {
path = "gensokyo/tewi-scsi";
field = "password";
};
secrets.files.openscsi-config = {
text = "InitiatorName=${tf.variables.openscsi-password.ref}";
};
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-uuid/6c5d82b1-5d11-4c72-96c6-5f90e6ce57f5"; device = "/dev/disk/by-uuid/6c5d82b1-5d11-4c72-96c6-5f90e6ce57f5";

2
tf

@ -1 +1 @@
Subproject commit fcebdcb305933c80bd9f8ed3bc8f9713577f2bf3 Subproject commit 2fa407225d8e91c4dba36ac53ab75d56188c30cf