adtya/configuration.nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: adtya:db3f3318a12cf6e11692f12c7f6acaf7545eabda
Branches Tags
adtya:main
..
compare: adtya:a536f23cce6838a0ecfb64c8e5ae7904538d4f2e
Branches Tags
adtya:main

No commits in common. "db3f3318a12cf6e11692f12c7f6acaf7545eabda" and "a536f23cce6838a0ecfb64c8e5ae7904538d4f2e" have entirely different histories.
db3f3318a1 ... a536f23cce

10 changed files with 16 additions and 64 deletions
Show stats Expand all files Collapse all files

8
flake.lock
View file

@ -786,11 +786,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1733046123,
"narHash": "sha256-nfi/zbiXgYRJ3RnO1GrypvKlUxqUsp1ORlTbgMgKNE4=",
"lastModified": 1732838483,
"narHash": "sha256-I73ckA2YONWTK5teDyW4YauUVQLh8+wfakYYukfOc78=",
"ref": "main",
"rev": "d0ffd1a57e5a2d91e5c689f0304c21f6fd5f519d",
"revCount": 12,
"rev": "c3e89a8a6abdb33cbc2e79d9ef744810680ee11d",
"revCount": 8,
"type": "git",
"url": "https://git.acomputer.lol/adtya/recipes.nix"
},

2
home/programs/firefox/policies.nix
View file

@ -35,6 +35,7 @@ in
"{3c078156-979c-498b-8990-85f7987dd929}" = install "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi";
"{b743f56d-1cc1-4048-8ba6-f9c2ab7aa54d}" = install "https://addons.mozilla.org/firefox/downloads/latest/dracula-dark-colorscheme/latest.xpi";
"{d634138d-c276-4fc8-924b-40a0ea21d284}" = install "https://addons.mozilla.org/firefox/downloads/latest/1password-x-password-manager/latest.xpi";
"newtaboverride@agenedia.com" = install "https://addons.mozilla.org/firefox/downloads/latest/new-tab-override/latest.xpi";
};
FirefoxHome = {
Search = true;
@ -80,7 +81,6 @@ in
"browser.aboutHomeSnippets.updateUrl" = lock "";
"browser.crashReports.unsubmittedCheck.autoSubmit2" = lock false;
"browser.selfsupport.url" = lock "";
"browser.startup.homepage" = lock "https://homepage.labs.adtya.xyz";
"browser.startup.homepage_override.mstone" = lock "ignore";
"browser.startup.homepage_override.buildID" = lock "";
"browser.tabs.firefox-view" = lock false;

1
hosts/bifrost/services/apps/default.nix
View file

@ -8,7 +8,6 @@ _: {
./ironyofprivacy.org.nix
./ntfy.nix
./proofs.nix
./vaultwarden.nix
./wiki.nix
../../../shared/prometheus-exporters.nix
../../../shared/promtail.nix

7
hosts/bifrost/services/apps/vaultwarden.nix
View file

@ -1,7 +0,0 @@
_: {
services.caddy.virtualHosts."vault.acomputer.lol" = {
extraConfig = ''
reverse_proxy 10.10.10.13:8222
'';
};
}

12
hosts/shared/blocky.nix
View file

@ -4,20 +4,22 @@
blocky = {
enable = true;
settings = {
bootstrapDns = [
"tcp+udp:1.1.1.1"
"tcp+udp:1.0.0.1"
];
bootstrapDns = [ "tcp+udp:1.1.1.1" ];
upstreams = {
groups = {
default = [
# Cloudflare
"tcp+udp:1.1.1.1"
"tcp+udp:1.0.0.1"
# Google
"tcp+udp:8.8.8.8"
"tcp+udp:8.8.4.4"
# Quad9
"tcp+udp:9.9.9.9"
"tcp+udp:149.112.112.112"
"tcp-tls:dns.quad9.net:853"
"https://dns.quad9.net/dns-query"
];
};
strategy = "parallel_best";

1
hosts/wynne/services/apps/default.nix
View file

@ -4,7 +4,6 @@ _: {
./forgejo.nix
./ntfy.nix
./postgresql.nix
./vaultwarden.nix
../../../shared/prometheus-exporters.nix
../../../shared/promtail.nix
];

5
hosts/wynne/services/apps/forgejo.nix
View file

@ -75,10 +75,7 @@ in
};
};
systemd.services = {
forgejo = {
after = [ "wg-quick-Homelab.service" "postgresql.service" ];
wants = [ "postgresql.service" ];
};
forgejo.after = [ "wg-quick-Homelab.service" "postgresql.service" ];
"gitea-runner-${utils.escapeSystemdPath "X86_64-runner"}".unitConfig.RequiresMountsFor = [ "/var/lib/private" ];
};
}

6
hosts/wynne/services/apps/postgresql.nix
View file

@ -15,16 +15,12 @@
host all all ::1/128 trust
host all all 10.10.10.0/24 trust
'';
ensureDatabases = [ "forgejo" "vaultwarden" ];
ensureDatabases = [ "forgejo" ];
ensureUsers = [
{
name = "forgejo";
ensureDBOwnership = true;
}
{
name = "vaultwarden";
ensureDBOwnership = true;
}
];
};
};

32
hosts/wynne/services/apps/vaultwarden.nix
View file

@ -1,32 +0,0 @@
{ config, ... }: {
sops.secrets = {
"vaultwarden/secrets" = {
mode = "400";
owner = config.users.users.root.name;
group = config.users.users.root.group;
};
};
recipes.vaultwarden = {
enable = true;
databaseBackend = "postgresql";
config = {
ROCKET_ADDRESS = config.nodeconfig.facts.wireguard-ip;
ROCKET_PORT = "8222";
DOMAIN = "https://vault.acomputer.lol";
SIGNUPS_ALLOWED = "false";
DATABASE_URL = "postgresql://vaultwarden@localhost/vaultwarden?sslmode=disable";
WEB_VAULT_ENABLED = "true";
SMTP_FROM = "vault@acomputer.lol";
SMTP_FROM_NAME = "Vaultwarden";
IP_HEADER = "X-Forwarded-For";
LOG_LEVEL = "warn";
};
environmentFiles = [ config.sops.secrets."vaultwarden/secrets".path ];
};
systemd.services.vaultwarden = {
after = [ "wg-quick-Homelab.service" "postgresql.service" ];
wants = [ "postgresql.service" ];
unitConfig.RequiresMountsFor = [ "/var/lib/private" ];
};
}

6
secrets.yaml
View file

@ -22,8 +22,6 @@ forgejo:
runner_registration_token_file: ENC[AES256_GCM,data:fHHAk5i3xjsTx7Zro1EOpbQaMCii0kksjTLgM+gXH2Gu2Mw+bCgKCKfeYccEQg==,iv:6jrQwEfqGDdbI/QCMvHcIEtZXtoDFT7OxVu80+oykCs=,tag:u3UClo6ca6ipBeQ/Am8yVA==,type:str]
conduwuit:
secrets: ENC[AES256_GCM,data:un4yAJoVLZxa4TcVs718HgOiDBZNRpU+Im4XlZYgPoofpMA5UgcsRoyOR3aubt8yzZKUnQpsUaJ4pmTPWoXwlbcRLFyyP8yK5KHBuN7bIIZhV0AivjktDLL4Rk8EVgrDEA==,iv:5f+Eh2aXBf2Mro12hozzMyZPsbsDyAttZYvdrdV6xsE=,tag:ylK3PtEIOhnXmoVhiTmS3w==,type:str]
vaultwarden:
secrets: ENC[AES256_GCM,data:hKcB0KnJm/ml0cYsYzKtQACl78OK2f+jx8xexzsWeB3VfmPznxYK5Fa7VSn9sCHFfRlqK6Uwpgmh4uNK6otcd6h4edlHlY7eGxAUgTy1VL4qXi5aZLwLitzShXc7iyJdlY3q7ZBWm+fqVYvLHxEItkeYh8ge1PcvMlAg2RF10txJpv3I5vwCWmsXscTBQe/eYRISad92KiEK6MvvHKCwrMtZeGfBHdcOP9j7/VqAvg0Yc+6QLWUh2teFbVGMQ0brnBdcE03asxYxliDSeVpVCT9o16LQYTk3w6txKG8wCXhrGcEOyQVoxftjMoXRlRD5/PtIiu31yeHe8dHfDo8+6OKfIbGX4RRsFEFxoMI/19cwuEO1,iv:/FOqTBbuxreExUztNidjXaeSeybgba7J8Fnm99JJd88=,tag:p8u7p2ZmdcqcWD7MirU/Fg==,type:str]
sops:
kms: []
gcp_kms: []
@ -102,8 +100,8 @@ sops:
Ynd0czBOK0NCdnZIQzNJZ3BqNndlSG8Kg9UUjMZ2p7xUhHLEL6SjSiVPw5JemYxh
sdiuZVVxzEasXLXXk6tax6AD5fz5mXEhXB24Op5scF4+VTfSZ+g9Cg==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-12-01T16:15:59Z"
mac: ENC[AES256_GCM,data:/fHhWwm4/5Qi181FmIRXPJU2XogoMOpzhqzltNAyTHDKIWYxGCDB7gZvCfNizWFxjqAvFBzoWa7XA/+VjXaaYARg/M2RrwQYnPuVE9V7NXEPjLuEeiYRfru4Vq8fZF9IFiSF+k3LXcZ+Tq7x7xqsFcHivAnYYECebWK6o9+dVVA=,iv:nrkF65Cj8cNytzt2SFiWUB6H0lxXdVt69Nwv5hFtLAo=,tag:55bnetcD4ofKsEgD0kfpfw==,type:str]
lastmodified: "2024-11-27T19:01:37Z"
mac: ENC[AES256_GCM,data:x3UKZyjZbcVfFwX1D7HAfrMvqH7K21gp+aqz5XGHAXbk2QeaO2DzdW+nX4JHCZoypD8JctX2zvdcKGzN3k8C8umox9c0KMXceD13BZFY5CsnQab0fyj2pMUICydvr+yP8CPbHkeKcjbxFiqfhgRFQeUh6ACxjqOcoFLlWJqcfxE=,iv:p49ko9Z1RZcVuE9Cmbe9IhVB1wpA2j1PTbPIOR4aEus=,tag:oR+NuuKg/Y2w2q/NnRtgcQ==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.9.1