Compare commits
No commits in common. "2c65e60d08f438a8f9448ee73df626a804a0c1d5" and "025bb46f2e7d5c51a9fce20f52302644b1b1cc85" have entirely different histories.
2c65e60d08
...
025bb46f2e
92
flake.lock
92
flake.lock
|
@ -88,11 +88,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720524665,
|
"lastModified": 1720450253,
|
||||||
"narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=",
|
"narHash": "sha256-1in42htN3g3MnE3/AO5Qgs6pMWUzmtPQ7s675brO8uw=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1",
|
"rev": "2b6bd3c87d3a66fb0b8f2f06c985995e04b4fb96",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -206,11 +206,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720896272,
|
"lastModified": 1720453602,
|
||||||
"narHash": "sha256-zo1lDMsxjEyko/P+KfCLNYZrCAWQOrX90/J31nqzpy4=",
|
"narHash": "sha256-7+PjJZn/jpqNkVKJ3AGVT9G601rVj/R8KkT+WWjhwyk=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "bc6b0880dda2607a80f000c134f573c970452a0f",
|
"rev": "b03f41efec14273cf25c42d4cef326acc36cb319",
|
||||||
"revCount": 4925,
|
"revCount": 4913,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland"
|
"url": "https://github.com/hyprwm/Hyprland"
|
||||||
|
@ -228,11 +228,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720709712,
|
"lastModified": 1718476555,
|
||||||
"narHash": "sha256-78j/cY+AXoMIqqiNc1vWx237EPfpERAcYsb57ABUbwQ=",
|
"narHash": "sha256-fuWpgh8KasByIJWE+xVd37Al0LV5YAn6s871T50qVY0=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "contrib",
|
"repo": "contrib",
|
||||||
"rev": "65d42dcbfde2229a75ccdb195c318dfe241f9ade",
|
"rev": "29a8374f4b9206d5c4af84aceb7fb5dff441ea60",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -309,11 +309,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720545076,
|
"lastModified": 1720203444,
|
||||||
"narHash": "sha256-Pxacc2uoxI00koXp5+CyNqHOTQlqNlK0rlRHDBHX4+g=",
|
"narHash": "sha256-lq2dPPPcwMHTLsFrQ2pRp4c2LwDZWoqzSyjuPdeJCP4=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprutils",
|
"repo": "hyprutils",
|
||||||
"rev": "6174a2a25f4e216c0f1d0c4278adc23c476b1d09",
|
"rev": "a8c3a135701a7b64db0a88ec353a392f402d2a87",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -357,11 +357,11 @@
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720861673,
|
"lastModified": 1720483510,
|
||||||
"narHash": "sha256-gh34LtCLvXCd/Xyk33mgQU3QqNyJ7ZwJj59c4Qdad78=",
|
"narHash": "sha256-IG/g4l/W0R2M/jxEyu/Sl3BmR/OK5D1jiahpc0wlpvE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "neovim-nightly-overlay",
|
"repo": "neovim-nightly-overlay",
|
||||||
"rev": "34b8101a10dfb4cb38832a17ef33281d59e2b2b3",
|
"rev": "b6b51915180e6d2eac488d6f882e4ba36bad380d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -373,11 +373,11 @@
|
||||||
"neovim-src": {
|
"neovim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720816717,
|
"lastModified": 1720478486,
|
||||||
"narHash": "sha256-C8bdG2wrI29afHI1705W37M7CPudz5117YafiBlW0Y4=",
|
"narHash": "sha256-66u+yzjk6NrFr2jj2svD3jwNX8P2B8/DNH9A51V4kh8=",
|
||||||
"owner": "neovim",
|
"owner": "neovim",
|
||||||
"repo": "neovim",
|
"repo": "neovim",
|
||||||
"rev": "10256bb760fcab0dc25f7eb5b0b45966cb771939",
|
"rev": "fb6c059dc55c8d594102937be4dd70f5ff51614a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -393,11 +393,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720926593,
|
"lastModified": 1720334033,
|
||||||
"narHash": "sha256-fW6e27L6qY6s+TxInwrS2EXZZfhMAlaNqT0sWS49qMA=",
|
"narHash": "sha256-X9pEvvHTVWJphhbUYqXvlLedOndNqGB7rvhSvL2CIgU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "5fe5b0cdf1268112dc96319388819b46dc051ef4",
|
"rev": "685e40e1348007d2cf76747a201bab43d86b38cb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -408,11 +408,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720542800,
|
"lastModified": 1720031269,
|
||||||
"narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=",
|
"narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "feb2849fdeb70028c70d73b848214b00d324a497",
|
"rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -424,11 +424,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720915306,
|
"lastModified": 1720282526,
|
||||||
"narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=",
|
"narHash": "sha256-dudRkHPRivMNOhd04YI+v4sWvn2SnN5ODSPIu5IVbco=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d",
|
"rev": "550ac3e955c30fe96dd8b2223e37e0f5d225c927",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -440,11 +440,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720768451,
|
"lastModified": 1720418205,
|
||||||
"narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
|
"narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
|
"rev": "655a58a72a6601292512670343087c2d75d859c1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -455,11 +455,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720750130,
|
"lastModified": 1720368505,
|
||||||
"narHash": "sha256-y2wc7CdK0vVSIbx7MdVoZzuMcUoLvZXm+pQf2RIr1OU=",
|
"narHash": "sha256-5r0pInVo5d6Enti0YwUSQK4TebITypB42bWy5su3MrQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6794d064edc69918bb0fc0e0eda33ece324be17a",
|
"rev": "ab82a9612aa45284d4adf69ee81871a389669a9e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -471,11 +471,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720954236,
|
"lastModified": 1720386169,
|
||||||
"narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=",
|
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27",
|
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -486,11 +486,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721009508,
|
"lastModified": 1720568009,
|
||||||
"narHash": "sha256-5FPwaPl/i7BO4Qm7mdqDUEly5e6CM+FUFeafyd6HaC0=",
|
"narHash": "sha256-EC7HGMr4pIorA70QeHUMdqDQNuzlhzARuewZdByayyM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "669d9c8a383cd54bf2b47e2a3bf67b0910bb7d6d",
|
"rev": "642bcd7e694adb60641c8125baea542b3067ca5c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -520,11 +520,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721010111,
|
"lastModified": 1720491570,
|
||||||
"narHash": "sha256-GuPw2xhJZ+eszIJFu7z7AtqUmirSWPHpxuCpG6dSOic=",
|
"narHash": "sha256-PHS2BcQ9kxBpu9GKlDg3uAlrX/ahQOoAiVmwGl6BjD4=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "3ef018b6d0f62eb59580a8e9fe141e37bf1d972d",
|
"rev": "b970af40fdc4bd80fd764796c5f97c15e2b564eb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -541,11 +541,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720926522,
|
"lastModified": 1720479166,
|
||||||
"narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=",
|
"narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "0703ba03fd9c1665f8ab68cc3487302475164617",
|
"rev": "67035a355b1d52d2d238501f8cc1a18706979760",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -3,11 +3,9 @@ let
|
||||||
sopsFile = ../../secrets/bareksa.yaml;
|
sopsFile = ../../secrets/bareksa.yaml;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
sops.secrets = {
|
sops.secrets."bareksa/openvpn" = {
|
||||||
"bareksa/openvpn" = {
|
|
||||||
inherit sopsFile;
|
inherit sopsFile;
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
programs.zsh.shellAliases = {
|
programs.zsh.shellAliases = {
|
||||||
vpn-bareksa = "sudo ${pkgs.openvpn}/bin/openvpn --config ${config.sops.secrets."bareksa/openvpn".path}";
|
vpn-bareksa = "sudo ${pkgs.openvpn}/bin/openvpn --config ${config.sops.secrets."bareksa/openvpn".path}";
|
||||||
|
|
|
@ -12,7 +12,6 @@ in
|
||||||
redmage.enable = lib.mkEnableOption "redmage podman";
|
redmage.enable = lib.mkEnableOption "redmage podman";
|
||||||
redmage-demo.enable = lib.mkEnableOption "redmage-demo podman";
|
redmage-demo.enable = lib.mkEnableOption "redmage-demo podman";
|
||||||
qbittorrent.enable = lib.mkEnableOption "qbittorrent podman";
|
qbittorrent.enable = lib.mkEnableOption "qbittorrent podman";
|
||||||
openobserve.enable = lib.mkEnableOption "openobserve podman";
|
|
||||||
|
|
||||||
servarr = {
|
servarr = {
|
||||||
enable = mkEnableOption "servarr group";
|
enable = mkEnableOption "servarr group";
|
||||||
|
|
|
@ -36,7 +36,6 @@
|
||||||
servarr.recyclarr.enable = true;
|
servarr.recyclarr.enable = true;
|
||||||
servarr.real-debrid-manager.enable = false;
|
servarr.real-debrid-manager.enable = false;
|
||||||
servarr.rdtclient.enable = true;
|
servarr.rdtclient.enable = true;
|
||||||
openobserve.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
docker = {
|
docker = {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
bareksa:
|
bareksa:
|
||||||
openvpn: ENC[AES256_GCM,data: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,iv:amxpN4aoRTwsRyhdwjtyGgq5d7AGhGmgl4Xb5SUYD24=,tag:T+dE4XtgSsjBrXIyu6Py4g==,type:str]
|
openvpn: ENC[AES256_GCM,data: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,iv:/PL754psZ3FmtGh3yPxFgJOPl6sK/8mR4JMeOEJxOiw=,tag:do4WSomPukfA6j428c5lfQ==,type:str]
|
||||||
sops:
|
sops:
|
||||||
kms: []
|
kms: []
|
||||||
gcp_kms: []
|
gcp_kms: []
|
||||||
|
@ -15,8 +15,8 @@ sops:
|
||||||
TlB6MjhXY1VPUkJQS05hdFVGbGlIdUEKhK2RFfuDZUXdDUL/ueJnRP65lAGFVPXg
|
TlB6MjhXY1VPUkJQS05hdFVGbGlIdUEKhK2RFfuDZUXdDUL/ueJnRP65lAGFVPXg
|
||||||
zqZdgIU6/CKKRjguw4LC2aO75y2tISRrACvvzjjp0LED6rZQfZspWg==
|
zqZdgIU6/CKKRjguw4LC2aO75y2tISRrACvvzjjp0LED6rZQfZspWg==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2024-07-12T05:06:34Z"
|
lastmodified: "2024-07-12T03:10:48Z"
|
||||||
mac: ENC[AES256_GCM,data:AgRjY8T0JLuI/YMeEtGmzu8RcJQCs9PJKzM+yNRbP23GNQGkNEo50WqFqxgphuohpYNLlkdCnA0UFZYxF1iEjJehPMVY99j7UnP41G5fMIzPqW7oXN88VJ+N9ZnyIBk9SOTEJMsYtz5lzI3wRufJpf8RtHLuIHGyMU7u6k3Wxok=,iv:+evH8GBEMJZJGUU5mP+1/8yYr/D1ZitCt4QJ0PHQCzs=,tag:WPQ7BWn+NkJYvOwmvqAIew==,type:str]
|
mac: ENC[AES256_GCM,data:bGMnCGchG79mWb6c6AA+80/iuFSlESY6UhtoUV5uRcXZG8kzjN/k+r9NddoAgVK/l6vK4Lu3VipEef30uw9TXxKTpLU07nxNQGly2mlJNlbGRBNJzfNJu7pRoxSq77UJOl5MVtaPPTB61l4Iev3t+x27RJmPpTOncQ0kp2z2a/U=,iv:tFYj3s7pDjU/q96NcNiDdQmSH3zv7M9AhLDAbBKvprE=,tag:MyNls7RWiXhTWo+QJQXoGw==,type:str]
|
||||||
pgp: []
|
pgp: []
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.8.1
|
version: 3.8.1
|
||||||
|
|
|
@ -1,22 +0,0 @@
|
||||||
openobserve:
|
|
||||||
env: ENC[AES256_GCM,data:c7XB9h82qCaV8MWTibJ2DUAjCDEgtjNvXi8B4tLfiJcws7Wfhhh5HQHiy/2Yc4q0h9QcQ9U/WNB05RVdX76H5UTsM7d9SbpG3/NW8d3yyiJlIZ7b/e4l3LD0HEM=,iv:pUcZ2S6mmFncs14HcRwEGSNh+/dz3Ut9M0kWVJwVkck=,tag:279V8olra+A1reKtZHnelQ==,type:str]
|
|
||||||
sops:
|
|
||||||
kms: []
|
|
||||||
gcp_kms: []
|
|
||||||
azure_kv: []
|
|
||||||
hc_vault: []
|
|
||||||
age:
|
|
||||||
- recipient: age1kruum2varzua7w5n6n52vhwyek2arc685rhcwt0u7k2jf5mecsjslkl9ll
|
|
||||||
enc: |
|
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZRmg5YURIdVNMVUFGbTNM
|
|
||||||
eXdWR0R1N09RMm4vSjRvUmw1VkV0SEFtN2s4CkhCcXgyNHFTU0hwMnNYdG5Sam9j
|
|
||||||
R21jcDY2MEhtVnZBckpsc010OEVqZmsKLS0tIDZtRmgzRWJZc1NLVVM0dkpwbUpL
|
|
||||||
Mk1OU0htcGIrWkUzdzFPZUxYb1JyeDAKQjXadi43Wr4yA89HDLsWACrHeUn265zG
|
|
||||||
qIU/QU6aO7bgoyflQfoppwD6bSqVrJMcTnTujIRA4xDtmCfNnP2cFQ==
|
|
||||||
-----END AGE ENCRYPTED FILE-----
|
|
||||||
lastmodified: "2024-07-15T07:57:57Z"
|
|
||||||
mac: ENC[AES256_GCM,data:uY2pxpgCxOBlj2gGS+/CQ9u0pe6gYlMXlaLKfHjZwJyzAeLjKAE2DLxQVDxx1z2jxx9FoaBnmVEwIgZ399Nk0Ale8ZlN63nduzycTb0kY1Vq8+tNC5Z+LEBe6p54ORmAHQUpUpK8zG72tg3djqH4D3Lm/cyiDegp14PcmK3xRuM=,iv:EJY4zl+vuWR6GJOulF7XLhSBlwSZgq9u2BMLRPR74m0=,tag:1JU2MToCFisIqp1BC/2oNw==,type:str]
|
|
||||||
pgp: []
|
|
||||||
unencrypted_suffix: _unencrypted
|
|
||||||
version: 3.8.1
|
|
|
@ -41,13 +41,12 @@ in
|
||||||
# 10.88.0.6 -> Suwayomi Flaresolverr
|
# 10.88.0.6 -> Suwayomi Flaresolverr
|
||||||
# 10.88.1.1 -> Pihole
|
# 10.88.1.1 -> Pihole
|
||||||
imports = [
|
imports = [
|
||||||
./openobserve.nix
|
|
||||||
./pihole.nix
|
./pihole.nix
|
||||||
./qbittorrent.nix
|
./qbittorrent.nix
|
||||||
./redmage-demo.nix
|
./redmage-demo.nix
|
||||||
./redmage.nix
|
./redmage.nix
|
||||||
./servarr
|
|
||||||
./suwayomi.nix
|
./suwayomi.nix
|
||||||
./ytptube.nix
|
./ytptube.nix
|
||||||
|
./servarr
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,53 +0,0 @@
|
||||||
{ config, lib, ... }:
|
|
||||||
let
|
|
||||||
name = "openobserve";
|
|
||||||
podman = config.profile.podman;
|
|
||||||
inherit (lib) mkIf;
|
|
||||||
ip = "10.88.99.1";
|
|
||||||
image = "public.ecr.aws/zinclabs/openobserve:latest";
|
|
||||||
rootVolume = "/nas/podman/openobserve";
|
|
||||||
domain = "${name}.tigor.web.id";
|
|
||||||
user = config.profile.user;
|
|
||||||
uid = toString user.uid;
|
|
||||||
gid = toString user.gid;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
config = mkIf (podman.enable && podman.${name}.enable) {
|
|
||||||
services.caddy.virtualHosts.${domain}.extraConfig = ''
|
|
||||||
reverse_proxy ${ip}:5080
|
|
||||||
'';
|
|
||||||
|
|
||||||
system.activationScripts."podman-${name}" = ''
|
|
||||||
mkdir -p ${rootVolume}/data
|
|
||||||
chown ${uid}:${gid} ${rootVolume} ${rootVolume}/data
|
|
||||||
'';
|
|
||||||
|
|
||||||
sops.secrets."openobserve/env".sopsFile = ../../secrets/openobserve.yaml;
|
|
||||||
|
|
||||||
virtualisation.oci-containers.containers.${name} = {
|
|
||||||
inherit image;
|
|
||||||
hostname = name;
|
|
||||||
autoStart = true;
|
|
||||||
user = "${uid}:${gid}";
|
|
||||||
environment = {
|
|
||||||
TZ = "Asia/Jakarta";
|
|
||||||
ZO_DATA_DIR = "/data";
|
|
||||||
ZO_WEB_URL = "https://${domain}";
|
|
||||||
};
|
|
||||||
volumes = [
|
|
||||||
"${rootVolume}/data:/data"
|
|
||||||
];
|
|
||||||
extraOptions = [
|
|
||||||
"--network=podman"
|
|
||||||
"--ip=${ip}"
|
|
||||||
];
|
|
||||||
environmentFiles = [
|
|
||||||
config.sops.secrets."openobserve/env".path
|
|
||||||
];
|
|
||||||
labels = {
|
|
||||||
"io.containers.autoupdate" = "registry";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
|
@ -29,6 +29,7 @@ in
|
||||||
key = config.sops.secrets."syncthing/server/key.pem".path;
|
key = config.sops.secrets."syncthing/server/key.pem".path;
|
||||||
cert = config.sops.secrets."syncthing/server/cert.pem".path;
|
cert = config.sops.secrets."syncthing/server/cert.pem".path;
|
||||||
settings = {
|
settings = {
|
||||||
|
options.urAccepted = 1; # Allow anonymous usage reporting.
|
||||||
folders = {
|
folders = {
|
||||||
"/nas/redmage/images/windows" = {
|
"/nas/redmage/images/windows" = {
|
||||||
label = "Redmage/Windows";
|
label = "Redmage/Windows";
|
||||||
|
@ -112,8 +113,6 @@ in
|
||||||
id = "EmuDeck";
|
id = "EmuDeck";
|
||||||
devices = [
|
devices = [
|
||||||
"steam-deck"
|
"steam-deck"
|
||||||
"windows"
|
|
||||||
"living-room-system"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -142,10 +141,6 @@ in
|
||||||
name = "Steam Deck";
|
name = "Steam Deck";
|
||||||
id = "6SOR4SU-MVT2XIS-4J6IGVP-LITFLDB-ZH6LA7T-PUSQK26-P6RVWZ7-YB7P4AX";
|
id = "6SOR4SU-MVT2XIS-4J6IGVP-LITFLDB-ZH6LA7T-PUSQK26-P6RVWZ7-YB7P4AX";
|
||||||
};
|
};
|
||||||
living-room-system = {
|
|
||||||
name = "Living Room System";
|
|
||||||
id = "63W5VTT-X6R6WOC-LMQEXM7-6PCUYLX-UONPYFB-UYM2OGN-2TJ47HG-66TSCQC";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
overrideFolders = true;
|
overrideFolders = true;
|
||||||
|
|
Loading…
Reference in a new issue