Compare commits

...

10 Commits

6 changed files with 21 additions and 24 deletions

View File

@ -29,6 +29,9 @@ makeEnable config "modules.code" true {
typescript typescript
nodePackages.typescript-language-server nodePackages.typescript-language-server
# golang
go
# Rust # Rust
rustup rustup

View File

@ -33,7 +33,7 @@ makeEnable config "modules.gitea-runner" false {
]; ];
enable = true; enable = true;
name = config.networking.hostName; name = config.networking.hostName;
url = "https://1896Folsom.duckdns.org:3000"; url = "https://dev.railbird.ai";
tokenFile = config.age.secrets.gitea-runner-token.path; tokenFile = config.age.secrets.gitea-runner-token.path;
labels = [ labels = [
"nixos-${pkgs.system}:host" "nixos-${pkgs.system}:host"

View File

@ -5,10 +5,10 @@ makeEnable config "modules.gitea" false {
enable = true; enable = true;
lfs.enable = true; lfs.enable = true;
settings.server = { settings.server = {
DOMAIN = "1896Folsom.duckdns.org"; DOMAIN = "dev.railbird.ai";
SSH_PORT = 1123; SSH_PORT = 1123;
HTTP_PORT = 3001; HTTP_PORT = 3001;
ROOT_URL = "https://1896Folsom.duckdns.org:3000"; ROOT_URL = "https://dev.railbird.ai";
}; };
settings.actions = { settings.actions = {
ENABLED = true; ENABLED = true;
@ -17,16 +17,14 @@ makeEnable config "modules.gitea" false {
services.nginx = { services.nginx = {
enable = true; enable = true;
recommendedProxySettings = true;
recommendedGzipSettings = true;
recommendedTlsSettings = true;
virtualHosts = { virtualHosts = {
"gitea" = { "dev.railbird.ai" = {
serverName = "1896Folsom.duckdns.org"; serverName = "dev.railbird.ai";
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
listen = [{
addr = "0.0.0.0";
port = 3000;
ssl = true;
}];
locations."/" = { locations."/" = {
proxyPass = "http://localhost:3001"; proxyPass = "http://localhost:3001";
}; };

View File

@ -34,6 +34,7 @@ rec {
andyKeys = [ andyKeys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqBnDZXcZIMtOTPxg4pJWyMyNp84kpU2uH88aCkrhMBY2TI4dqAXGY4h1DOyOEyQo9nTgyvdlv4M1Hlp5tzfbuapdTWtt36gb+FKpsTUy8dz45fhKJerUszNbVQ+SpZu4ZFN4Nv9eP3AHO+Mzjcvbf666VMDEzZWu2totd7jxyI9PdK78TD5AOi+kGTtbEgqMpJCcZmJlzJ9NJJ2ejhPCRwcfDrShHcfMeEwWL5MmnzT+WstkRwJAM0f9/ks77jWDnB1Eu55rQykU8zVZ1nz1GiXZcxUpm6B0IRhwn8NGH6nVzSLITtO5eJ7LPQR9XNUODpbrsVGNK6jgGql9gZpYp andy@nixos" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqBnDZXcZIMtOTPxg4pJWyMyNp84kpU2uH88aCkrhMBY2TI4dqAXGY4h1DOyOEyQo9nTgyvdlv4M1Hlp5tzfbuapdTWtt36gb+FKpsTUy8dz45fhKJerUszNbVQ+SpZu4ZFN4Nv9eP3AHO+Mzjcvbf666VMDEzZWu2totd7jxyI9PdK78TD5AOi+kGTtbEgqMpJCcZmJlzJ9NJJ2ejhPCRwcfDrShHcfMeEwWL5MmnzT+WstkRwJAM0f9/ks77jWDnB1Eu55rQykU8zVZ1nz1GiXZcxUpm6B0IRhwn8NGH6nVzSLITtO5eJ7LPQR9XNUODpbrsVGNK6jgGql9gZpYp andy@nixos"
]; ];
willKeys = [];
loewyKeys = [ loewyKeys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDROb8zcXAgqR3xNpStjt8kSL2Tnic+aWVlQRkmmLveay0RDPatHVKiWtscBoFYvL19xwpi692nZjyPAGQBLMquVx8rexHUFVbs6UVM41Y/QV0UZLSlVM7xNl3nL/dQoxT8OC2a9WJThNm41EjFzzKAuUaWqjm4+uEsC9felBIzndlA5/bIn6EUkMb2X8qmOOIOod1UeVZeK0fWMoDdKsHtQjiQrrP4nLjOmrTQ+BF2yUHwFbW6SCQiXT1Jzq4zymnI717ZraTK0nXzl8amLrGGrh36TrR7pv9hWLeNIMCARvOtABMdQmrT1dI4FxLK1uKM696uzfoaZDUn58G2VGrd loewy gitlab" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDROb8zcXAgqR3xNpStjt8kSL2Tnic+aWVlQRkmmLveay0RDPatHVKiWtscBoFYvL19xwpi692nZjyPAGQBLMquVx8rexHUFVbs6UVM41Y/QV0UZLSlVM7xNl3nL/dQoxT8OC2a9WJThNm41EjFzzKAuUaWqjm4+uEsC9felBIzndlA5/bIn6EUkMb2X8qmOOIOod1UeVZeK0fWMoDdKsHtQjiQrrP4nLjOmrTQ+BF2yUHwFbW6SCQiXT1Jzq4zymnI717ZraTK0nXzl8amLrGGrh36TrR7pv9hWLeNIMCARvOtABMdQmrT1dI4FxLK1uKM696uzfoaZDUn58G2VGrd loewy gitlab"
]; ];

View File

@ -25,7 +25,7 @@ in
path = "/nix-cache"; path = "/nix-cache";
}; };
modules.gitea.enable = true; modules.gitea.enable = true;
modules.gitea-runner.enable = true; modules.gitea-runner.enable = false;
services.vaultwarden = { services.vaultwarden = {
enable = true; enable = true;
@ -46,22 +46,11 @@ in
recommendedGzipSettings = true; recommendedGzipSettings = true;
recommendedTlsSettings = true; recommendedTlsSettings = true;
virtualHosts = { virtualHosts = {
"1896Folsom.duckdns.org" = { "vaultwarden.railbird.ai" = {
# enableACME = true;
# forceSSL = true;
locations."/" = {
proxyPass = "http://[::1]:8222";
};
};
"dev.railbird.ai" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
listen = [{
addr = "0.0.0.0";
ssl = true;
}];
locations."/" = { locations."/" = {
proxyPass = "http://localhost:3001"; proxyPass = "http://[::1]:8222";
}; };
}; };
}; };

View File

@ -46,6 +46,12 @@ in
shell = pkgs.zsh; shell = pkgs.zsh;
openssh.authorizedKeys.keys = kanivanKeys ++ deanKeys; openssh.authorizedKeys.keys = kanivanKeys ++ deanKeys;
}; };
will = userDefaults // {
extraGroups = extraGroupsWithWheel;
name = "will";
shell = pkgs.zsh;
openssh.authorizedKeys.keys = kanivanKeys ++ willKeys;
};
alex = userDefaults // { alex = userDefaults // {
extraGroups = extraGroupsWithWheel; extraGroups = extraGroupsWithWheel;
name = "alex"; name = "alex";