Compare commits

..

No commits in common. "8c42b5ea1ac588d419509bc901f771bfa8975097" and "10a1eafca4f6598ff6a2c7321ceb090678563e91" have entirely different histories.

5 changed files with 34 additions and 35 deletions

42
flake.lock generated
View file

@ -24,11 +24,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770328441, "lastModified": 1769758502,
"narHash": "sha256-v3rNKKUg+pWInBlJVYBMxLbImpdwLlKnjJ8rPp6IR8I=", "narHash": "sha256-jFT7y3qJdngk4yfS4FM3TC+MBhob/wEVkb/vEh3eF40=",
"owner": "nlewo", "owner": "nlewo",
"repo": "comin", "repo": "comin",
"rev": "a651f36e6a211be6d3f51ffffe9cb2bd9a4a3cef", "rev": "69ee06dc03cdd50e72a71634d7840af01afc6114",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,11 +87,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1770437015, "lastModified": 1770091431,
"narHash": "sha256-+FHN9EthS+kHxnMoSDZEiGLoxwiIuij6ltK3aTmlLMA=", "narHash": "sha256-9Sqq/hxq8ZDLRSzu+edn0OfWG+FAPWFpwMKaJobeLec=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "65d59f814068d04e532cad2773d281e4951acd95", "rev": "4f827ff035c6ddc58d04c45abe5b777d356b926a",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -159,11 +159,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770260404, "lastModified": 1769580047,
"narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -262,11 +262,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1770197578, "lastModified": 1770115704,
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -278,11 +278,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1770464364, "lastModified": 1770136044,
"narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -369,11 +369,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770228511, "lastModified": 1769691507,
"narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -389,11 +389,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770431965, "lastModified": 1770086828,
"narHash": "sha256-vVMfSjrmeYGfT+dj5eLZ8xNnJP62gvdW32IFQk606wM=", "narHash": "sha256-mufcsiTsh04F5pocBQcdKWjIah0YwFGtM57UXXmiBm4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "2b53743c0c65c6c525952fce502fe6eaa0913300", "rev": "4badc6c89256856f3537d05e14dce64674f39382",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -26,18 +26,12 @@
services = { services = {
dns.enable = true; dns.enable = true;
syncthing = { syncthing = {
enable = true; enable = true;
isServer = true; isServer = true;
gui.domain = "syncthing.${privateDomain}"; gui.domain = "syncthing.${privateDomain}";
doBackups = true; doBackups = true;
}; };
atuin = {
enable = true;
domain = "atuin.${privateDomain}";
};
}; };
web-services = { web-services = {
@ -52,6 +46,11 @@
domain = "budget.${privateDomain}"; domain = "budget.${privateDomain}";
doBackups = true; doBackups = true;
}; };
atuin = {
enable = true;
domain = "atuin.${privateDomain}";
};
}; };
}; };
} }

View file

@ -1,9 +1,9 @@
{ config, lib, ... }: { config, lib, ... }:
let let
cfg = config.custom.services.alloy; cfg = config.custom.web-services.alloy;
in in
{ {
options.custom.services.alloy = { options.custom.web-services.alloy = {
enable = lib.mkEnableOption ""; enable = lib.mkEnableOption "";
domain = lib.mkOption { domain = lib.mkOption {
type = lib.types.nonEmptyStr; type = lib.types.nonEmptyStr;

View file

@ -1,9 +1,9 @@
{ config, lib, ... }: { config, lib, ... }:
let let
cfg = config.custom.services.atuin; cfg = config.custom.web-services.atuin;
in in
{ {
options.custom.services.atuin = { options.custom.web-services.atuin = {
enable = lib.mkEnableOption ""; enable = lib.mkEnableOption "";
domain = lib.mkOption { domain = lib.mkOption {
type = lib.types.nonEmptyStr; type = lib.types.nonEmptyStr;

View file

@ -8,10 +8,10 @@
services = { services = {
auto-gc.onlyCleanRoots = true; auto-gc.onlyCleanRoots = true;
comin.enable = true; comin.enable = true;
alloy = { };
enable = true; web-services.alloy = {
domain = "alloy.${config.networking.hostName}.${config.custom.networking.overlay.domain}"; enable = true;
}; domain = "alloy.${config.networking.hostName}.${config.custom.networking.overlay.domain}";
}; };
}; };
} }