Compare commits
No commits in common. "29c2526e6af4d4d80daf76e6f94e8f2c279e946d" and "d971ab334ea9a2de48d3ce3a53cb728e538ca767" have entirely different histories.
29c2526e6a
...
d971ab334e
18
flake.lock
generated
18
flake.lock
generated
@ -250,11 +250,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733572789,
|
"lastModified": 1733482664,
|
||||||
"narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
|
"narHash": "sha256-ZD+h1fwvZs+Xvg46lzTWveAqyDe18h9m7wZnTIJfFZ4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
|
"rev": "e38d3dd1d355a003cc63e8fe6ff66ef2257509ed",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -331,11 +331,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-unstable": {
|
"nixos-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733656628,
|
"lastModified": 1733505731,
|
||||||
"narHash": "sha256-dLQKmK5Sn3sWOKSg8EnDGdUUnv5M26YM1D8OIQuEvSo=",
|
"narHash": "sha256-B3jYxAIMhBdH5ayiSVoXsi4zvInRbZB5eEUac5mboUQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e6eb5fff7256ffc39233dd5ffe2fea16d4e0b81f",
|
"rev": "f145dbde156efee66276502a2ecbfd60ed81c18d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -363,11 +363,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733654877,
|
"lastModified": 1733506536,
|
||||||
"narHash": "sha256-CNZ8bOvXSR/v5Q83sv3IO+ZcKZpDZuOnPJz64QDNtIM=",
|
"narHash": "sha256-hmTCczt4tDKyKNtm0UOp78oHSDnJU3qZHX80KEEu1lI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1b6d067c32f00c0c4ee5083a3137e9feff7009ef",
|
"rev": "260a02d2ee673c2e4a4cfe8bc6c78ce8ea39c08c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -39,7 +39,6 @@ in
|
|||||||
./jellyseer.nix
|
./jellyseer.nix
|
||||||
./teslamate.nix
|
./teslamate.nix
|
||||||
./postgres.nix
|
./postgres.nix
|
||||||
./netdata.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
age.identityPaths = [ "/root/.ssh/id_ed25519" ];
|
age.identityPaths = [ "/root/.ssh/id_ed25519" ];
|
||||||
|
@ -39,21 +39,8 @@ let
|
|||||||
allDomains = config.architect.vhost // {
|
allDomains = config.architect.vhost // {
|
||||||
"architect.devs.giugl.io" = { dnsInterfaces = [ "lan" "tailscale" ]; };
|
"architect.devs.giugl.io" = { dnsInterfaces = [ "lan" "tailscale" ]; };
|
||||||
};
|
};
|
||||||
domain = "adguard.giugl.io";
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
architect.vhost.${domain} = with config.architect.networks; {
|
|
||||||
dnsInterfaces = [ "tailscale" "lan" ];
|
|
||||||
locations."/" = {
|
|
||||||
port = config.services.adguardhome.port;
|
|
||||||
allowLan = true;
|
|
||||||
|
|
||||||
allow = [
|
|
||||||
tailscale.net
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
coredns = {
|
coredns = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -21,7 +21,6 @@ in
|
|||||||
environmentVariables = {
|
environmentVariables = {
|
||||||
OLLAMA_FLASH_ATTENTION = "1";
|
OLLAMA_FLASH_ATTENTION = "1";
|
||||||
OLLAMA_NUM_PARALLEL = "2";
|
OLLAMA_NUM_PARALLEL = "2";
|
||||||
OLLAMA_KV_CACHE_TYPE = "q8_0";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,26 +0,0 @@
|
|||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
domain = "monitor.giugl.io";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
services.netdata = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.unstablePkgs.netdata;
|
|
||||||
config = {
|
|
||||||
db.mode = "dbengine";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
architect.vhost.${domain} = with config.architect.networks; {
|
|
||||||
dnsInterfaces = [ "tailscale" "lan" ];
|
|
||||||
|
|
||||||
locations."/" = {
|
|
||||||
port = 19999;
|
|
||||||
allowLan = true;
|
|
||||||
allow = [
|
|
||||||
tailscale.net
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
@ -129,7 +129,7 @@ with lib;
|
|||||||
services.nginx.virtualHosts = mapAttrs
|
services.nginx.virtualHosts = mapAttrs
|
||||||
(domain: conf: {
|
(domain: conf: {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost= "giugl.io";
|
enableACME = true;
|
||||||
locations = mapAttrs
|
locations = mapAttrs
|
||||||
(path: location: {
|
(path: location: {
|
||||||
proxyPass = "http://${location.host}:${toString location.port}${location.path}";
|
proxyPass = "http://${location.host}:${toString location.port}${location.path}";
|
||||||
|
@ -1,25 +1,10 @@
|
|||||||
{ config, ... }:
|
{ options, lib, config, ... }:
|
||||||
|
|
||||||
let
|
|
||||||
giuglioDomain = "giugl.io";
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
age.secrets.ovh = {
|
config.security.acme = {
|
||||||
file = ../secrets/ovh.age;
|
|
||||||
owner = "acme";
|
|
||||||
};
|
|
||||||
security.acme = {
|
|
||||||
acceptTerms = true;
|
acceptTerms = true;
|
||||||
certs.${giuglioDomain} =
|
|
||||||
{
|
|
||||||
dnsProvider = "ovh";
|
|
||||||
environmentFile = config.age.secrets.ovh.path;
|
|
||||||
extraDomainNames = [ "*.${giuglioDomain}" ];
|
|
||||||
};
|
|
||||||
defaults = {
|
defaults = {
|
||||||
email = "letsencrypt@depasquale.giugl.io";
|
email = "letsencrypt@depasquale.giugl.io";
|
||||||
dnsProvider = "ovh";
|
|
||||||
environmentFile = config.age.secrets.ovh.path;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
age-encryption.org/v1
|
|
||||||
-> ssh-rsa QXZdow
|
|
||||||
aYgowxTfdGOqTYOZBbkg/dH7f+m6nvVF/8qZX0DE4hazln/QS9maWbkOwD7FLldm
|
|
||||||
HRNV/YwZZEhbujHbDqgxnXk7Q11KOA72864B6mF2VZUruyo0cnACqo7OyzwApqv/
|
|
||||||
+LPjGb9h/gCJpQ3a5Jdh202FfaNGAh358fZVDyd37XPSOykiIAAxgMlDyn+96OiM
|
|
||||||
P2vsyduWXDsqzCqtiNQrKVjryI5CIGOTAcYTgQ35S3uXFD8Gu27KfagUwZp2hdyp
|
|
||||||
3WmGl+ZTrPNdOwzLWGj/RXaeTslABn1Owmq1naASRvJpp97ToynRzkDA50rBqUyR
|
|
||||||
vGVB9IJxSjkSm3BJ4UAI6rpoz/6t2jkfNNE1cPix4AYjPAMyU+uiUSaZ/UBkwlXw
|
|
||||||
08rM1eGcBaErB1ExcDV5+jUCdJBfi6Q9vIG7Ty4wbN1PfztAhzEyzT0L1bTn1AKC
|
|
||||||
4S9n5lqFa1CdraK9eh2A+o9CNlkta+Z24ctPTVqBYtImBTKHOTofhr0omQdFV6M2
|
|
||||||
bhxsOoAAoNhwn/lWC2fAcgfPQrUOW524+eHyPjsvf4rNNv0bk5EP1J4vMrWr9rqJ
|
|
||||||
v5GEQ77YVXYQthiyg74XYc3Eo8sbtE+ncDoOquzdT385POd870qi1ht+JMY6OEmj
|
|
||||||
q8lxVau2SFTKPkkmZKmtoNrYdKp5+DsB3nOUKcIXofs
|
|
||||||
-> ssh-ed25519 7eGqHw cCrhq1kfav4TYAUOpP4O6fQ958O37Uad2jX9SUrnxn4
|
|
||||||
TSiMyrYsdblB5SFwZpw7HhmicWX1vNomhBP4HtlvHJo
|
|
||||||
-> ssh-rsa tO3rGg
|
|
||||||
J6oPMt6hiry6ks3hlAjUAY1AzEYU+7voto5XC+I6Fmyfabz9zaJ3TtbCPVF5BRNR
|
|
||||||
DOYLiD24EbcVoqECn2A2MRK1xH4owBD5YaE3Il2NwSJHhC+ZhROaMTu5mHxbzK/u
|
|
||||||
BF2MLRZ0Bwwq4szaHoFf12TFwNtIRZXS9m6l4jHdsxWj6x0iui18p3JLxij1cVwE
|
|
||||||
03rSWz+9c8bpZ6LHuPJAhatBZHSZwkKwH8Dn8NOxCLmVNRM4PyvJsj9lRn7fMwRY
|
|
||||||
64QI2z6bRAry6oINbVAAOsPlM0Ix+7hbFs/UstnENFqfcDvPzrrhALDhuDLIJpGu
|
|
||||||
WgAaMStZGjydy0oqHJceuduxVreqTlfiki7yruRFqRBgjMopwOsw5i9UPWR6SZ+E
|
|
||||||
cUCFeEynUMrmFSp5qvDX0WtkU2G/GRFEPaB+k+UN+JduIRb2RBCLt2uG0249TwO8
|
|
||||||
T4sq098XTM8wARgOv6n51lHFCPpM3iSbP5KMCYH9FhsJV0Qu9Q7157McNZuVL9Ie
|
|
||||||
|
|
||||||
--- KYLAPCcTkg/tF2c2ni4UaBTV5AhUleg8GgJH0oRQSK0
|
|
||||||
½;¬jŒ<6A>a羄ïÓÄ<C393>5`hÂŒø»æy;JúãÈå³C¢µ‡£ÏwX:eßøw³ù»ÜH
|
|
||||||
L<EFBFBD>he’jCÓ2¨ì"#˵„=Î/Dzˆ1ÒÅÿ¼™^Nû$ÃéM·úqN…v1µØÁ–Ç”ç¸T¦ÌñÙ—Ç0FsÕ(WeõöË…¡˜Ý8|^‹iYFQæ3œ ¡Õ
|
|
||||||
A¤1ïEÜÂÚM_=;•¸‚×jFÜVý[Ýät°¬{©
w×…Ê<E280A6>Ö)
|
|
@ -11,5 +11,4 @@ in
|
|||||||
"nextcloud-database.age".publicKeys = pubkeys;
|
"nextcloud-database.age".publicKeys = pubkeys;
|
||||||
"restic-environment.age".publicKeys = pubkeys;
|
"restic-environment.age".publicKeys = pubkeys;
|
||||||
"restic-passwords.age".publicKeys = pubkeys;
|
"restic-passwords.age".publicKeys = pubkeys;
|
||||||
"ovh.age".publicKeys = pubkeys;
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user