adding more things

This commit is contained in:
Anish Lakhwara 2022-12-12 17:16:08 +10:00
parent 9f6a184d17
commit 544759cf4f
7 changed files with 24 additions and 46 deletions

View file

@ -12,11 +12,11 @@ D('sealight.xyz', REG_NONE, DnsProvider(DNS_HEDNS),
//NAMESERVER('ns3.he.net.'),
//NAMESERVER('ns4.he.net.'),
//NAMESERVER('ns5.he.net.'),
// capsul
// capsul: helix
A('bridge', '69.61.38.225', TTL(300)),
A('rss', '69.61.38.225', TTL(300)),
A('git', '69.61.38.225', TTL(300)),
// vultr -> nulled
// vultr -> nulled: lituus
A('@', '45.77.48.108', TTL(300)),
A('jitsi', '45.77.48.108', TTL(300)),
A('chat', '45.77.48.108', TTL(300)),

View file

@ -1,29 +0,0 @@
var DSP_BIND = NewDnsProvider("bind");
var REG_CHANGEME = NewRegistrar("none");
D("sealight.xyz", REG_CHANGEME,
DnsProvider(DSP_BIND),
DefaultTTL(86400),
//SOA('@', 'ns1.he.net.', 'hostmaster.he.net.', 2022121008, 86400, 7200, 3600000, 172800, TTL(172800)),
CNAME('autoconfig', 'autoconfig.nullhex.com.'),
A('bridge', '69.61.38.225', TTL(300)),
A('chat', '45.77.48.108', TTL(300)),
A('element', '45.77.48.108', TTL(300)),
A('git', '69.61.38.225', TTL(300)),
A('jitsi', '69.61.38.225', TTL(300)),
CNAME('key1._domainkey', 'key1.nullhex.com.'),
A('rss', '69.61.38.225', TTL(300)),
A('@', '45.77.48.108', TTL(300)),
MX('@', 10, 'smtp-in-1.nullhex.com.'),
MX('@', 20, 'smtp-in-2.nullhex.com.'),
//NAMESERVER('ns1.he.net.'),
//NAMESERVER('ns2.he.net.'),
//NAMESERVER('ns3.he.net.'),
//NAMESERVER('ns4.he.net.'),
//NAMESERVER('ns5.he.net.'),
TXT('@', 'v=spf1 a mx ~all'),
A('turn', '69.61.38.225', TTL(300)),
SRV('_autodiscover._tcp', 0, 1, 443, 'autodiscover.nullhex.com.'),
TXT('_dmarc', 'v=DMARC1; p=quarantine;'),
SRV('_imaps._tcp', 0, 1, 993, 'imap.nullhex.com.'),
SRV('_submissions._tcp', 0, 1, 465, 'smtp.nullhex.com.')
)

View file

@ -540,17 +540,17 @@ in
-- null-ls
-- being very janky
-- local null_ls = require("null-ls")
-- null_ls.setup({
-- sources = {
local null_ls = require("null-ls")
null_ls.setup({
sources = {
null_ls.builtins.diagnostics.shellcheck,
-- null_ls.builtins.code_actions.statix,
-- null_ls.builtins.diagnostics.shellcheck,
-- -- null_ls.builtins.diagnostics.clj_kondo,
-- null_ls.builtins.diagnostics.clj_kondo,
-- null_ls.builtins.formatting.isort,
-- null_ls.builtins.formatting.black,
-- null_ls.builtins.code_actions.proselint,
-- },
-- })
},
})
-- Setup lspconfig
require("lsp-format").setup {}

View file

@ -61,7 +61,7 @@
locations."/".proxyPass = "http://localhost:3001/"; # Proxy Gitea
};
};
networking.firewall.allowedTCPPorts = [ 80 443 ];
networking.firewall.allowedTCPPorts = [ 80 443 22 ];
security.acme.defaults.email = "anish+acme@lakhwara.com";
security.acme.acceptTerms = true;
}

View file

@ -3,6 +3,10 @@
{
imports = [
./mautrix-telegram.nix
# ./mautrix-discord.nix
# ./mautrix-whatsapp.nix
# ./mautrix-slack.nix
# ./mautrix-signall.nix
./mjolnir.nix
./heisenbridge.nix
./compress-state-service.nix

View file

@ -15,13 +15,13 @@ in
user = mkOption {
type = types.str;
default = "woodpeckerserver";
description = "User account under which gonic runs.";
description = "User account under which woodpecker server runs.";
};
group = mkOption {
type = types.str;
default = "woodpeckerserver";
description = "Group account under which gonic runs.";
description = "Group account under which woodpecker server runs.";
};
hostname = mkOption {
@ -35,7 +35,7 @@ in
users.users = optionalAttrs (cfg.user == name) {
${name} = {
group = cfg.group;
description = "woodpecker user";
description = "woodpecker server user";
home = cfg.dataDir;
createHome = true;
};
@ -68,9 +68,7 @@ in
# To get these secrets, please check Drone's documentation for Gitea integration:
# https://docs.drone.io/server/provider/gitea/
sops.secrets.drone = {
sopsFile = ../.secrets/drone.yaml;
};
# agenix secret
systemd.services.drone-server = {
wantedBy = [ "multi-user.target" ];

View file

@ -14,11 +14,16 @@ in
"mossnet.age".publicKeys = allUserKeys;
"curve-wg.age".publicKeys = curve;
"box-wg.age".publicKeys = [ mossnet ];
# "wallabag.age".publicKeys = [ mossnet ];
"borg-password.age".publicKeys = systemOnly;
"freshrss-dbpass.age".publicKeys = [ helix ];
"synapse-config.age".publicKeys = [ lituus ];
"synapse-database-password.age".publicKeys = [ lituus ];
"sealight-mod-password.age".publicKeys = [ lituus ];
"telegram-matrix-env.age".publicKeys = [ lituus ];
# "wallabag.age".publicKeys = [ mossnet ];
"woodpecker-agent-secret".publicKeys = [ lituus helix ];
"woodpecker-client-id".publicKeys = [ helix ];
"woodpecker-client-secret".publicKeys = [ helix ];
"gitea-dbpass".publicKeys = [ helix ];
}