Compare commits

...
5 Commits
Author SHA1 Message Date
Jordan Ashurst 1ca1cd0df0 Merge branch 'experiment' 2026-09-14 17:48:56 -07:00
Jordan Ashurst 050930a2ce Adding new secrets 2026-09-14 16:36:03 -07:00
Jordan Ashurst 181a18fe4d Adding sops support to home-manager 2026-09-14 06:08:15 -07:00
Jordan Ashurst 5f9a78dc92 Adding subdomains to Caddy 2026-09-14 05:59:52 -07:00
Jordan Ashurst e5ea074bf6 $2 2026-09-14 05:58:22 -07:00
5 changed files with 43 additions and 19 deletions
+18 -11
View File
@@ -225,8 +225,8 @@
ddclient ddclient
telegram-desktop telegram-desktop
btop btop
ungoogled-chromium # ungoogled-chromium
opencode # opencode
doas doas
lan-mouse lan-mouse
stylua stylua
@@ -277,6 +277,7 @@
keepassxc keepassxc
sops sops
age age
unzip
]; ];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
@@ -294,10 +295,10 @@
services.caddy = { services.caddy = {
enable = true; enable = true;
environmentFile = config.sops.templates."caddy.env".path; environmentFile = config.sops.templates."caddy.env".path;
globalConfig = '' # globalConfig = ''
acme_ca https://acme.zerossl.com/v2/DV90 # acme_ca https://acme.zerossl.com/v2/DV90
email {$ACME_EMAIL}; # email {$ACME_EMAIL};
''; # '';
#tls ${config.sops.secrets.zerossl_cert.path} ${config.sops.secrets.zerossl_private_key.path} #tls ${config.sops.secrets.zerossl_cert.path} ${config.sops.secrets.zerossl_private_key.path}
virtualHosts."centraldogma.site:".extraConfig = '' virtualHosts."centraldogma.site:".extraConfig = ''
@@ -316,12 +317,18 @@
reverse_proxy /radarr/* 127.0.0.1:7878 reverse_proxy /radarr/* 127.0.0.1:7878
''; '';
virtualHosts."jellyfin.centraldogma.site:".extraConfig = ''
virtualHosts."blog.centraldogma.dedyn.io:".extraConfig = '' redir /jellyfin /jellyfin/
root * /srv/root/ reverse_proxy /jellyfin/* 127.0.0.1:8096
file_server
encode zstd gzip
''; '';
virtualHosts."git.centraldogma.site:".extraConfig = ''
reverse_proxy /* 127.0.0.1:3000
'';
# virtualHosts."blog.centraldogma.dedyn.io:".extraConfig = ''
# root * /srv/root/
# file_server
# encode zstd gzip
# '';
}; };
services.flaresolverr = { services.flaresolverr = {
enable = true; enable = true;
Generated
+6 -6
View File
@@ -86,11 +86,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789352311, "lastModified": 1789386765,
"narHash": "sha256-E9hlcRNSRQ1vb+UicOusX/ucroGlBAz/pYhCBorLOn4=", "narHash": "sha256-4hyLFBhzQC7+qPMELWc7J/sbdA6ckXZxXU9CYRsGhsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cfcda3f99334c8459fa4cd46cce87502e0b48f0a", "rev": "87c391f49a34660de6010f35bb50fb1bf811be9f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -136,11 +136,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1789149629, "lastModified": 1789286504,
"narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=", "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eaad089433ca2bb662274377d33df3d0e51ef28b", "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
+4
View File
@@ -50,6 +50,10 @@
inherit inputs; inherit inputs;
}; };
home-manager.sharedModules = [
inputs.sops-nix.homeManagerModules.sops
];
home-manager.users.mask = ./home.nix; home-manager.users.mask = ./home.nix;
} }
+12
View File
@@ -59,6 +59,7 @@
home.shellAliases = { home.shellAliases = {
dogma-rebuild = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}#dogma-nixos"; dogma-rebuild = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}#dogma-nixos";
cdproj = "cd ${config.home.homeDirectory}/projects/nixos-dogma"; cdproj = "cd ${config.home.homeDirectory}/projects/nixos-dogma";
working = "echo aaa";
}; };
# Home Manager can also manage your environment variables through # Home Manager can also manage your environment variables through
@@ -82,6 +83,8 @@
SOPS_EDITOR = "nvim"; SOPS_EDITOR = "nvim";
EDITOR = "nvim"; EDITOR = "nvim";
VISUAL = "nvim"; VISUAL = "nvim";
TEST = "test";
TEST_A = "testa";
}; };
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
@@ -125,4 +128,13 @@
}; };
programs.home-manager.enable = true; programs.home-manager.enable = true;
sops = {
age.keyFile = "/home/mask/.config/sops/age/keys.txt";
defaultSopsFile = ./secrets/secrets.yaml;
secrets = {
"github/token" = {};
"gitlab/token" = {};
};
};
} }
+3 -2
View File
@@ -22,6 +22,7 @@ postgres:
pgmasterpass: ENC[AES256_GCM,data:KYlzLRIV9jkbtbb8O8EiTXXYP+cPwYkV+WEse1T+grd5kPpl/xxAqAOIc44UcfQ8+FJMFpBe,iv:kWHbvoeLznuESsvKx5ADrPGGxVYVRMlRL3XUjr92+fU=,tag:dK2gii+lxVM7+Y++1eR5ZA==,type:str] pgmasterpass: ENC[AES256_GCM,data:KYlzLRIV9jkbtbb8O8EiTXXYP+cPwYkV+WEse1T+grd5kPpl/xxAqAOIc44UcfQ8+FJMFpBe,iv:kWHbvoeLznuESsvKx5ADrPGGxVYVRMlRL3XUjr92+fU=,tag:dK2gii+lxVM7+Y++1eR5ZA==,type:str]
pgmasterpass: ENC[AES256_GCM,data:s3KOZiag7h3iFYxBxXnhyYQ6ZG9jdav4uM9bQHgXdpYZW4yircOgoI1YiuciDoF1RhdOjbNh,iv:KzblpETo/wQtYUJUALAyvPRDlbuxXPiGOBhgJpVJd/8=,tag:Z5f7UhWNtn060UUm+/owqg==,type:str] pgmasterpass: ENC[AES256_GCM,data:s3KOZiag7h3iFYxBxXnhyYQ6ZG9jdav4uM9bQHgXdpYZW4yircOgoI1YiuciDoF1RhdOjbNh,iv:KzblpETo/wQtYUJUALAyvPRDlbuxXPiGOBhgJpVJd/8=,tag:Z5f7UhWNtn060UUm+/owqg==,type:str]
gitea: gitea:
database: ENC[AES256_GCM,data:AiYQyrsmFVlWSYO+YFFgrCSTGTn3nl2tH+YcXlQKsLGJeNtTt1WV0/VvNuo=,iv:XZhZi183po9Mp8hAvSpti5qWec5+Rwu+UFPEUplZv0I=,tag:IFT/oP9Unwk+RE9sBLjJGg==,type:str]
password: ENC[AES256_GCM,data:6GKcqsdLXaHVJODuuz2sZSZDn/0U1vT9NTfeuNlhwGO6MrQ9QYaOlpU3AI8=,iv:TL1EQnLXgXeenp0CqNAOajq4g66Spl1JLgPP3i4OpQc=,tag:9jPCAGR6zxKl0tzMeXWsGA==,type:str] password: ENC[AES256_GCM,data:6GKcqsdLXaHVJODuuz2sZSZDn/0U1vT9NTfeuNlhwGO6MrQ9QYaOlpU3AI8=,iv:TL1EQnLXgXeenp0CqNAOajq4g66Spl1JLgPP3i4OpQc=,tag:9jPCAGR6zxKl0tzMeXWsGA==,type:str]
caddy: caddy:
acme_email: ENC[AES256_GCM,data:TpXEvreBkq2gqpq3OTokke/Zues=,iv:iO8jIMEzBpk5DOksQqnT87Nq8vFTG28qELvfIscOqWc=,tag:poK3Kl1bkePLetSF5DPb9A==,type:str] acme_email: ENC[AES256_GCM,data:TpXEvreBkq2gqpq3OTokke/Zues=,iv:iO8jIMEzBpk5DOksQqnT87Nq8vFTG28qELvfIscOqWc=,tag:poK3Kl1bkePLetSF5DPb9A==,type:str]
@@ -49,7 +50,7 @@ sops:
OXJfnqQIRsiwQJFNLDjB4hNZ5r9iupVj66BAbadO3pwlHWOFt6+PaQ== OXJfnqQIRsiwQJFNLDjB4hNZ5r9iupVj66BAbadO3pwlHWOFt6+PaQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
recipient: age1xgfxwt7488dkpksgjawc53ewsc4p94jy6kdvnpd5r0jv5a5yr9tqzxy8x2 recipient: age1xgfxwt7488dkpksgjawc53ewsc4p94jy6kdvnpd5r0jv5a5yr9tqzxy8x2
lastmodified: "2026-09-14T02:31:14Z" lastmodified: "2026-09-14T10:21:43Z"
mac: ENC[AES256_GCM,data:P+9OCeLiwRCEfDcxVfK8ryFgfLy8oxR3KG02rhFmuQ2QqGKxuVQv5lHSB7QX8pzwM6+t7iAz666dk5+6Ztj48v+WruXwkV+gC1sM+NhfFmP5El0ItCozyvzu8/+pgcMFtsBoJ9DSgK8vQzAvPbKm1MjFSbLvqCuq753HsjYKiz0=,iv:oMKTX/1zXx3JgjLJEVYA7ROQYg3ueFvzj+bMdKPFq8Y=,tag:/y9zg6YtNjgqmYnydDE5gQ==,type:str] mac: ENC[AES256_GCM,data:rCIlQV0lfuJl+E0t4Y5IvOFxToL4+47IfMzIm7V7eq3aoj13nv8g+2k2yZncV22shjJppasvyis7u6KtFsvDNkmc+VdduiuB3vBKNkBOr3IRwtOhvzqIHyvTeN9xsy/cGmrASr661jnM8aruMOMoevsyF1LMO/f15QzS/grUOlc=,iv:dZnCqRSXMeDvv/f4vekEqu9hPvl62Vzid0HZfXTRs2k=,tag:ie90n1/kQGNZB98/5cNaRQ==,type:str]
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.13.3 version: 3.13.3