Compare commits

...

4 Commits

Author SHA1 Message Date
56cc6ab71b added hugo for new blog 2026-09-19 20:21:22 +01:00
8aab4c39c6 added certbot to fix mailserver and added tailscale for access 2026-09-19 20:21:18 +01:00
ea5c6884d7 updated flake 2026-09-19 20:21:03 +01:00
076f8ef4b4 updated komga 2026-09-19 20:20:57 +01:00
4 changed files with 96 additions and 80 deletions

59
flake.lock generated
View File

@@ -397,11 +397,11 @@
"wshowkeys": "wshowkeys" "wshowkeys": "wshowkeys"
}, },
"locked": { "locked": {
"lastModified": 1785262861, "lastModified": 1785863558,
"narHash": "sha256-aSqAk+X2lcfWKICSTtVdramX5kkuUFy5MGOc58sl1NQ=", "narHash": "sha256-xtLfe7viHVAK9PEfO5t/KZPxsVGGtdibthVj6c1t2gc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "b8677a83f0f796acfd7dd26832ef27214f5a431f", "rev": "b947debd8a73a1d81cac31304ff1ff8eccce902a",
"revCount": 50, "revCount": 52,
"type": "git", "type": "git",
"url": "https://git.voidarc.co.uk/voidarc/hypr" "url": "https://git.voidarc.co.uk/voidarc/hypr"
}, },
@@ -772,11 +772,11 @@
"wshowkeys": "wshowkeys_2" "wshowkeys": "wshowkeys_2"
}, },
"locked": { "locked": {
"lastModified": 1785436692, "lastModified": 1786360263,
"narHash": "sha256-vB5j+Vf91MCv6joAqb95uCvcNCPuzAU07+uvFAb8atE=", "narHash": "sha256-XWYFR33aM1gkAtV6SDpmVOKCppYcm6fAHIwiwz/qkIw=",
"ref": "dendritic", "ref": "dendritic",
"rev": "00f680029034e908c09f7ba9af5bb9d83fb090f5", "rev": "06848de32a3742557d531cdedc689488cc704c8a",
"revCount": 221, "revCount": 234,
"type": "git", "type": "git",
"url": "https://git.voidarc.co.uk/voidarc/nixos.git" "url": "https://git.voidarc.co.uk/voidarc/nixos.git"
}, },
@@ -911,6 +911,22 @@
} }
}, },
"nixpkgs_12": { "nixpkgs_12": {
"locked": {
"lastModified": 1781577229,
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_13": {
"locked": { "locked": {
"lastModified": 1785386831, "lastModified": 1785386831,
"narHash": "sha256-sPS3CaXH8RAT3FZRuy4VcV47iuYIWMMfa0GbyJKC3o4=", "narHash": "sha256-sPS3CaXH8RAT3FZRuy4VcV47iuYIWMMfa0GbyJKC3o4=",
@@ -992,11 +1008,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1785104993, "lastModified": 1785386831,
"narHash": "sha256-eKbrvPoAOFutbYMdbB3r5EQVmFxKv24iKqHPPUXA0gM=", "narHash": "sha256-sPS3CaXH8RAT3FZRuy4VcV47iuYIWMMfa0GbyJKC3o4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8623c4c20aa4ca2f5fb81510d2944066c3fb0d96", "rev": "21ea275a7c46aef9d4d6ddc962e6d562e9d94183",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1060,11 +1076,11 @@
"wrappers": "wrappers_2" "wrappers": "wrappers_2"
}, },
"locked": { "locked": {
"lastModified": 1783352922, "lastModified": 1786117348,
"narHash": "sha256-59Kea6PaeTM6ZBEAWzdPnuLlij2emLd21JsPnobR3B0=", "narHash": "sha256-jNxKPjAGAJ0DztgO/STGDx0skAo3qBMG5QtPIDHXVH4=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "970da906087f0691932418db8757803d64f60c28", "rev": "1ddcc8f06881c66f73d45e131c85b4b8f52e2fef",
"revCount": 94, "revCount": 99,
"type": "git", "type": "git",
"url": "https://git.voidarc.co.uk/voidarc/nvim" "url": "https://git.voidarc.co.uk/voidarc/nvim"
}, },
@@ -1189,7 +1205,7 @@
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"import-tree": "import-tree", "import-tree": "import-tree",
"nix-config": "nix-config", "nix-config": "nix-config",
"nixpkgs": "nixpkgs_12", "nixpkgs": "nixpkgs_13",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
}, },
@@ -1216,11 +1232,11 @@
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1785224226, "lastModified": 1785411317,
"narHash": "sha256-Aj0ZA0boiYSPrvN+5ECpcYmx8OFEF+M1OoVY7ko0H/E=", "narHash": "sha256-r/YV6psmPZj9aSMydTmOooTBLFiwMJoCWnaKkUlXiss=",
"owner": "AceSLS", "owner": "AceSLS",
"repo": "SLSsteam", "repo": "SLSsteam",
"rev": "4f7b79143a47a8ecb97c323745c7593d55fd6f20", "rev": "b3da36b024f565f79ee19b44bea493af3f48ea95",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1548,10 +1564,7 @@
"wshowkeys_2": { "wshowkeys_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": "nixpkgs_12"
"nix-config",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1781708685, "lastModified": 1781708685,

View File

@@ -1,63 +1,62 @@
{moduleWithSystem, ...}: { {moduleWithSystem, ...}: {
flake.nixosModules.containerKomga = moduleWithSystem ({pkgs, ...}: { flake.nixosModules.containerKomga = moduleWithSystem ({pkgs, ...}: {
virtualisation.oci-containers.containers."komga" = {
virtualisation.oci-containers.containers."komga" = { image = "gotson/komga:1.26.1";
image = "gotson/komga"; volumes = [
volumes = [ "/containers/komga/config:/config:rw"
"/containers/komga/config:/config:rw" "/etc/timezone:/etc/timezone:ro"
"/etc/timezone:/etc/timezone:ro" "/mnt/storage/streaming/manga:/data:rw"
"/mnt/storage/streaming/manga:/data:rw" ];
]; ports = [
ports = [ "25600:25600/tcp"
"25600:25600/tcp" ];
]; log-driver = "journald";
log-driver = "journald"; extraOptions = [
extraOptions = [ "--network-alias=komga"
"--network-alias=komga" "--network=komga_default"
"--network=komga_default" ];
];
};
systemd.services."podman-komga" = {
serviceConfig = {
Restart = pkgs.lib.mkOverride 90 "always";
}; };
after = [ systemd.services."podman-komga" = {
"podman-network-komga_default.service" serviceConfig = {
]; Restart = pkgs.lib.mkOverride 90 "always";
requires = [ };
"podman-network-komga_default.service" after = [
]; "podman-network-komga_default.service"
partOf = [ ];
"podman-compose-komga-root.target" requires = [
]; "podman-network-komga_default.service"
wantedBy = [ ];
"podman-compose-komga-root.target" partOf = [
]; "podman-compose-komga-root.target"
}; ];
wantedBy = [
# Networks "podman-compose-komga-root.target"
systemd.services."podman-network-komga_default" = { ];
path = [ pkgs.podman ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStop = "podman network rm -f komga_default";
}; };
script = ''
podman network inspect komga_default || podman network create komga_default
'';
partOf = [ "podman-compose-komga-root.target" ];
wantedBy = [ "podman-compose-komga-root.target" ];
};
# Root service # Networks
# When started, this will automatically create all resources and start systemd.services."podman-network-komga_default" = {
# the containers. When stopped, this will teardown all resources. path = [pkgs.podman];
systemd.targets."podman-compose-komga-root" = { serviceConfig = {
unitConfig = { Type = "oneshot";
Description = "Root target generated by compose2nix."; RemainAfterExit = true;
ExecStop = "podman network rm -f komga_default";
};
script = ''
podman network inspect komga_default || podman network create komga_default
'';
partOf = ["podman-compose-komga-root.target"];
wantedBy = ["podman-compose-komga-root.target"];
};
# Root service
# When started, this will automatically create all resources and start
# the containers. When stopped, this will teardown all resources.
systemd.targets."podman-compose-komga-root" = {
unitConfig = {
Description = "Root target generated by compose2nix.";
};
wantedBy = ["multi-user.target"];
}; };
wantedBy = [ "multi-user.target" ];
};
}); });
} }

View File

@@ -13,12 +13,13 @@
nvidiaDrivers nvidiaDrivers
containers containers
secrets secrets
certbot certbot
] ]
++ (with inputs.nix-config.nixosModules; [ ++ (with inputs.nix-config.nixosModules; [
nvim nvim
git git
zsh zsh
tailscale
]); ]);
}; };
} }

View File

@@ -1,8 +1,11 @@
{...}: { {...}: {
flake.nixosModules.server02Configuration = {...}: { flake.nixosModules.server02Configuration = {pkgs, ...}: {
networking = { networking = {
hostName = "server02"; hostName = "server02";
}; };
environment.systemPackages = with pkgs; [
hugo
];
swapDevices = [ swapDevices = [
{ {
device = "/swapfile"; device = "/swapfile";