Compare commits
2
Commits
b5aa64e74a
...
f5e3ef7c5b
| Author | SHA1 | Date | |
|---|---|---|---|
 sin_serhao
|
f5e3ef7c5b | ||
|
sin_serhao
|
8c726db73a |
Generated
+151
-35
@@ -8,11 +8,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762618334,
|
||||
"narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
|
||||
"lastModified": 1770165109,
|
||||
"narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "fcdea223397448d35d9b31f798479227e80183f6",
|
||||
"rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -21,6 +21,22 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"blobs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1604995301,
|
||||
"narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "blobs",
|
||||
"rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "blobs",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"colmena": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
@@ -49,11 +65,11 @@
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769470446,
|
||||
"narHash": "sha256-nze0VZ70K2kbDxjE+BBZLD7juOmnZqNYdOhl9aUNGWg=",
|
||||
"lastModified": 1779822991,
|
||||
"narHash": "sha256-r6e4eHEyQJEDhT6gkW3B9+OgB0pZebw2+du4bvN3vww=",
|
||||
"owner": "9001",
|
||||
"repo": "copyparty",
|
||||
"rev": "2f57228fd4e62f8cd8e12cb80a3531dc2d4d170a",
|
||||
"rev": "6e75faa62349a59f4df328a4939ba8626d89ee1a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -91,11 +107,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769524058,
|
||||
"narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=",
|
||||
"lastModified": 1780290312,
|
||||
"narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d",
|
||||
"rev": "115e5211780054d8a890b41f0b7734cafad54dfe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -136,6 +152,22 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1767039857,
|
||||
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||
"owner": "NixOS",
|
||||
"repo": "flake-compat",
|
||||
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1659877975,
|
||||
@@ -166,21 +198,51 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"git-hooks": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
"flake-compat": [
|
||||
"simple-mailserver",
|
||||
"flake-compat"
|
||||
],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"simple-mailserver",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"lastModified": 1778507602,
|
||||
"narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"simple-mailserver",
|
||||
"git-hooks",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709087332,
|
||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
@@ -229,15 +291,15 @@
|
||||
"nix-minecraft": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769567010,
|
||||
"narHash": "sha256-R4ESxjCluQQlSIPw4NaRYVvEtvsnKGRwmACcXU1at6g=",
|
||||
"lastModified": 1780375694,
|
||||
"narHash": "sha256-TznzgYVONg28KiSFB2rVdf/eLVIMtEQOxKt13Kzyrp8=",
|
||||
"owner": "Infinidoge",
|
||||
"repo": "nix-minecraft",
|
||||
"rev": "1c9c95fea177a4f8430c34dc1f974394e72bca1f",
|
||||
"rev": "e6f8bec35104ca5955efe73742da58d2823684f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -262,6 +324,22 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-2505": {
|
||||
"locked": {
|
||||
"lastModified": 1767313136,
|
||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1750134718,
|
||||
@@ -295,11 +373,11 @@
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1748929857,
|
||||
"narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
|
||||
"lastModified": 1769461804,
|
||||
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
|
||||
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -311,16 +389,16 @@
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1769318308,
|
||||
"narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=",
|
||||
"lastModified": 1780203844,
|
||||
"narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c",
|
||||
"rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11",
|
||||
"ref": "nixos-26.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -340,6 +418,22 @@
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1779630130,
|
||||
"narHash": "sha256-RWn/gMXEy+p6yL5lKh51Z/w6RHC+5Px18Tarkuva99Y=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "68ac0b94b449482d8a90f3e3791d61a8ee186f07",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable-small",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1736549401,
|
||||
"narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=",
|
||||
@@ -363,7 +457,9 @@
|
||||
"disko": "disko",
|
||||
"nix-minecraft": "nix-minecraft",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs-2505": "nixpkgs-2505",
|
||||
"shoblog-front": "shoblog-front",
|
||||
"simple-mailserver": "simple-mailserver",
|
||||
"testing-grounds": "testing-grounds",
|
||||
"unstable": "unstable"
|
||||
}
|
||||
@@ -386,6 +482,27 @@
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"simple-mailserver": {
|
||||
"inputs": {
|
||||
"blobs": "blobs",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"git-hooks": "git-hooks",
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780340963,
|
||||
"narHash": "sha256-rQCWOQXN0/sQxwP7T2Y3hsC1KYxLQgul6l9LPbQdqi4=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"rev": "a61228e6918a9d673c3faf48ab23e92a55822012",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"stable": {
|
||||
"locked": {
|
||||
"lastModified": 1750133334,
|
||||
@@ -434,7 +551,7 @@
|
||||
},
|
||||
"testing-grounds": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755527993,
|
||||
@@ -452,16 +569,15 @@
|
||||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1769461804,
|
||||
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
||||
"lastModified": 1780651739,
|
||||
"narHash": "sha256-3VfA5BcsITQmorkCW/6ZF9usmLTkFTAfTj4QT7DG338=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
|
||||
"rev": "e91830af5eb4b2394ddd405998dec32f0ef18a51",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
||||
@@ -3,24 +3,25 @@
|
||||
|
||||
# Flake inputs
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||
unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
|
||||
nixpkgs-2505.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||
unstable.url = "github:NixOS/nixpkgs";
|
||||
colmena.url = "github:zhaofengli/colmena";
|
||||
|
||||
# commons
|
||||
agenix.url = "github:ryantm/agenix";
|
||||
|
||||
# zimablade inputs
|
||||
# sin inputs
|
||||
disko.url = "github:nix-community/disko";
|
||||
disko.inputs.nixpkgs.follows = "nixpkgs";
|
||||
copyparty.url = "github:9001/copyparty";
|
||||
simple-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
|
||||
|
||||
# sin inputs
|
||||
# thea inputs
|
||||
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
|
||||
testing-grounds.url = "gitlab:shobu13/testing-grounds";
|
||||
shoblog-front.url = "gitlab:shobu13/shoblog";
|
||||
|
||||
copyparty.url = "github:9001/copyparty";
|
||||
|
||||
};
|
||||
|
||||
# Flake outputs
|
||||
@@ -61,7 +62,7 @@
|
||||
);
|
||||
in
|
||||
{
|
||||
nixosConfigurations = {
|
||||
nixosConfigurations = rec {
|
||||
sin = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
|
||||
@@ -80,6 +81,24 @@
|
||||
inherit inputs;
|
||||
};
|
||||
};
|
||||
thea = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
|
||||
modules = [
|
||||
agenix.nixosModules.default
|
||||
./hosts/thea/configuration.nix
|
||||
./hosts/thea/hardware-configuration.nix
|
||||
]
|
||||
++ [
|
||||
# modules
|
||||
./modules/gitea/thea
|
||||
];
|
||||
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
nodes = { inherit sin; };
|
||||
};
|
||||
};
|
||||
};
|
||||
colmenaHive = colmena.lib.makeHive {
|
||||
meta = {
|
||||
@@ -111,7 +130,9 @@
|
||||
./modules/gitea/${name}
|
||||
];
|
||||
|
||||
deployment.targetHost = "192.168.1.12";
|
||||
deployment.targetHost = "git.shobu.fr";
|
||||
|
||||
# deployment.targetHost = "192.168.1.12";
|
||||
};
|
||||
|
||||
sin =
|
||||
@@ -133,7 +154,10 @@
|
||||
./modules/gitea/${name}
|
||||
];
|
||||
|
||||
deployment.targetHost = "192.168.1.14";
|
||||
deployment.targetHost = "git.shobu.fr";
|
||||
deployment.targetPort = 24658;
|
||||
|
||||
# deployment.targetHost = "192.168.1.14";
|
||||
deployment.allowLocalDeployment = true;
|
||||
};
|
||||
};
|
||||
@@ -152,7 +176,7 @@
|
||||
env = { };
|
||||
|
||||
# Add any shell logic you want executed any time the environment is activated
|
||||
shellHook = '''';
|
||||
shellHook = "";
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
{ inputs, pkgs, ... }:
|
||||
let
|
||||
unstable = import inputs.unstable { system = pkgs.stdenv.system; };
|
||||
in
|
||||
{
|
||||
services.actual = {
|
||||
package = unstable.actual-server;
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
settings.port = 3001;
|
||||
};
|
||||
}
|
||||
@@ -18,6 +18,7 @@
|
||||
./coredns
|
||||
./copyparty.nix
|
||||
./trilium.nix
|
||||
./actual.nix
|
||||
];
|
||||
|
||||
boot.initrd.kernelModules = [ "usb_storage" ];
|
||||
|
||||
+38
-5
@@ -15,8 +15,8 @@
|
||||
|
||||
settings = {
|
||||
p = [ 8086 ];
|
||||
e2dsa = true;
|
||||
e2ts = true;
|
||||
e2dsa = true; # files indexing
|
||||
e2ts = true; # multimedia indexing
|
||||
z = true;
|
||||
qr = true;
|
||||
xff-hdr = "X-Real-IP";
|
||||
@@ -25,6 +25,13 @@
|
||||
http-only = true;
|
||||
og = true;
|
||||
shr = "/shares";
|
||||
ansi = true; # color in log messages
|
||||
re-maxage = 60 * 60 * 12; # reindex every 12h
|
||||
|
||||
# idp-h-usr = "remote-user";
|
||||
# idp-h-grp = "remote-group";
|
||||
# idp-login = "https://auth.shobu.fr/?rd=https://files.shobu.fr";
|
||||
# idp-logout = "https://auth.shobu.fr/";
|
||||
};
|
||||
|
||||
accounts = {
|
||||
@@ -54,9 +61,9 @@
|
||||
};
|
||||
};
|
||||
"/mediacenter" = {
|
||||
path = "/mnt/mediacenter/media";
|
||||
path = "/mnt/mediacenter/";
|
||||
access = {
|
||||
rw = ["serhao"];
|
||||
rw = [ "serhao" ];
|
||||
};
|
||||
flags = {
|
||||
e2d = true;
|
||||
@@ -65,12 +72,38 @@
|
||||
"/data" = {
|
||||
path = "/mnt/data";
|
||||
access = {
|
||||
rwd = ["serhao"];
|
||||
rwd = [ "serhao" ];
|
||||
};
|
||||
flags = {
|
||||
e2d = true;
|
||||
};
|
||||
};
|
||||
"/dump" = {
|
||||
path = "/mnt/data/dump";
|
||||
access = {
|
||||
rw = "*";
|
||||
rwd = [ "serhao" ];
|
||||
};
|
||||
flags = {
|
||||
lifetime = 86400;
|
||||
df = "100g";
|
||||
vmaxb = "10g";
|
||||
};
|
||||
};
|
||||
"/dump/quick" = {
|
||||
path = "/mnt/data/dump/quick";
|
||||
access = {
|
||||
rw = "*";
|
||||
rwd = [ "serhao" ];
|
||||
};
|
||||
flags = {
|
||||
e2ds = true;
|
||||
pk = "gz,9";
|
||||
lifetime = 300;
|
||||
df = "100g";
|
||||
vmaxb = "10g";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -4,6 +4,11 @@
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
# TODO Change secrets
|
||||
extraArgs = [ "--webserver" ];
|
||||
extraArgs = [
|
||||
"--webserver"
|
||||
"--disable-webui"
|
||||
"--disable-plugin"
|
||||
"processcount"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
+163
-6
@@ -12,7 +12,6 @@
|
||||
headerStyle = "boxed";
|
||||
|
||||
providers = {
|
||||
"finnhub" = "cuvq5e9r01qub8tv03g0cuvq5e9r01qub8tv03gg";
|
||||
};
|
||||
|
||||
layout = [
|
||||
@@ -38,6 +37,20 @@
|
||||
header = false;
|
||||
};
|
||||
}
|
||||
{
|
||||
"admin" = {
|
||||
tab = "Admin";
|
||||
header = false;
|
||||
sin = {
|
||||
style = "row";
|
||||
columns = 3;
|
||||
};
|
||||
thea = {
|
||||
style = "row";
|
||||
columns = 3;
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
@@ -56,9 +69,7 @@
|
||||
}
|
||||
{
|
||||
glances = {
|
||||
url = "https://zimablade-admin.shobu.fr";
|
||||
user = "shobu";
|
||||
password = "shobu";
|
||||
url = "http://sin.home:61208";
|
||||
version = 4;
|
||||
disk = [
|
||||
"/"
|
||||
@@ -154,7 +165,7 @@
|
||||
widget = {
|
||||
type = "jellyseerr";
|
||||
url = "https://jellyseerr.shobu.fr";
|
||||
key = "MTczNzkyNzMxMzgwODk4N2FlZWJkLTQ0N2QtNGU0MS1iOWE1LTJmZmE3OTI4ZGQ5OQ==";
|
||||
key = "MTc0OTMzOTE2MDMwODgxNzdlYjNlLTU4N2ItNDc0Mi1iZTY4LTM3NzVhMWZiMDUzZg==";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -227,7 +238,7 @@
|
||||
href = "https://transmission.shobu.fr";
|
||||
widget = {
|
||||
type = "transmission";
|
||||
url = "https://transmission.shobu.fr";
|
||||
url = "http://sin.home:9091";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -235,6 +246,152 @@
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
"admin" = [
|
||||
(
|
||||
let
|
||||
name = "sin";
|
||||
address = "http://sin.home:61208";
|
||||
in
|
||||
{
|
||||
"${name}" = [
|
||||
{
|
||||
"info" = {
|
||||
widget = {
|
||||
type = "glances";
|
||||
url = address;
|
||||
version = 4;
|
||||
metric = "info";
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
"main storage" = {
|
||||
widget = {
|
||||
type = "glances";
|
||||
url = address;
|
||||
version = 4;
|
||||
metric = "fs:/mnt/fs";
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
"system storage" = {
|
||||
widget = {
|
||||
type = "glances";
|
||||
url = address;
|
||||
version = 4;
|
||||
metric = "fs:/";
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
"memory" = {
|
||||
widget = {
|
||||
type = "glances";
|
||||
url = address;
|
||||
version = 4;
|
||||
metric = "memory";
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
"cpu" = {
|
||||
widget = {
|
||||
type = "glances";
|
||||
url = address;
|
||||
version = 4;
|
||||
metric = "cpu";
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
"network" = {
|
||||
widget = {
|
||||
type = "glances";
|
||||
url = address;
|
||||
version = 4;
|
||||
metric = "network:enp2s0";
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
)
|
||||
|
||||
(
|
||||
let
|
||||
name = "thea";
|
||||
address = "http://thea.home:61208";
|
||||
in
|
||||
{
|
||||
"${name}" = [
|
||||
{
|
||||
"info" = {
|
||||
widget = {
|
||||
type = "glances";
|
||||
url = address;
|
||||
version = 4;
|
||||
metric = "info";
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
"main storage" = {
|
||||
widget = {
|
||||
type = "glances";
|
||||
url = address;
|
||||
version = 4;
|
||||
metric = "fs:/mnt/fs";
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
"system storage" = {
|
||||
widget = {
|
||||
type = "glances";
|
||||
url = address;
|
||||
version = 4;
|
||||
metric = "fs:/";
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
"memory" = {
|
||||
widget = {
|
||||
type = "glances";
|
||||
url = address;
|
||||
version = 4;
|
||||
metric = "memory";
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
"cpu" = {
|
||||
widget = {
|
||||
type = "glances";
|
||||
url = address;
|
||||
version = 4;
|
||||
metric = "cpu";
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
"network" = {
|
||||
widget = {
|
||||
type = "glances";
|
||||
url = address;
|
||||
version = 4;
|
||||
metric = "network:enp2s0";
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
)
|
||||
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
+62
-32
@@ -1,25 +1,44 @@
|
||||
{ pkgs, inputs, ... }:
|
||||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
unstable = import inputs.unstable { system = pkgs.system; };
|
||||
nixpkgs-2505 = import inputs.nixpkgs-2505 {
|
||||
system = pkgs.stdenv.system;
|
||||
config.allowUnfree = true;
|
||||
config.permittedInsecurePackages = [ "intel-media-sdk-23.2.2" ];
|
||||
};
|
||||
in
|
||||
{
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
||||
systemd.services.jellyfin.environment = {
|
||||
LIBVA_DRIVER_NAME = "iHD"; # or i965 for older GPUs
|
||||
NEOReadDebugKeys = "1";
|
||||
OverrideGpuAddressSpace = "48";
|
||||
};
|
||||
environment.sessionVariables = {
|
||||
LIBVA_DRIVER_NAME = "iHD";
|
||||
NEOReadDebugKeys = "1";
|
||||
OverrideGpuAddressSpace = "48";
|
||||
};
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
intel-ocl # Generic OpenCL support
|
||||
|
||||
intel-compute-runtime-legacy1
|
||||
intel-media-driver
|
||||
intel-vaapi-driver
|
||||
libva-vdpau-driver
|
||||
intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in)
|
||||
vpl-gpu-rt # QSV on 11th gen or newer
|
||||
nixpkgs-2505.intel-media-sdk
|
||||
];
|
||||
};
|
||||
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
boot.kernelParams = [ "i915.enable_guc=3" ];
|
||||
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"dotnet-sdk-6.0.428"
|
||||
"aspnetcore-runtime-6.0.36"
|
||||
# "dotnet-sdk-6.0.428"
|
||||
# "aspnetcore-runtime-6.0.36"
|
||||
"intel-media-sdk-23.2.2"
|
||||
];
|
||||
|
||||
users.users."starr" = {
|
||||
@@ -66,12 +85,27 @@ in
|
||||
"radarr"
|
||||
"sonarr"
|
||||
];
|
||||
users.users.jellyfin.extraGroups = [
|
||||
"render"
|
||||
"video"
|
||||
];
|
||||
|
||||
users.groups = {
|
||||
starr = { };
|
||||
starr = {
|
||||
gid = 990;
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
services =
|
||||
let
|
||||
mkEnvFile =
|
||||
name:
|
||||
(pkgs.writeText "${name}.env" ''
|
||||
${name}__AUTH__ENABLED=false
|
||||
${name}__AUTH__METHOD=External
|
||||
'');
|
||||
in
|
||||
{
|
||||
jellyfin = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
@@ -81,47 +115,43 @@ in
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
group = "starr";
|
||||
settings = {
|
||||
authentication.AuthenticationMethod = "external";
|
||||
authentication.AuthenticationType = "enabled";
|
||||
};
|
||||
environmentFiles = [
|
||||
(mkEnvFile "SONARR")
|
||||
];
|
||||
};
|
||||
radarr = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
group = "starr";
|
||||
settings = {
|
||||
authentication.AuthenticationMethod = "external";
|
||||
authentication.AuthenticationType = "enabled";
|
||||
};
|
||||
environmentFiles = [
|
||||
(mkEnvFile "RADARR")
|
||||
];
|
||||
};
|
||||
prowlarr = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
settings = {
|
||||
authentication.AuthenticationMethod = "external";
|
||||
authentication.AuthenticationType = "enabled";
|
||||
};
|
||||
environmentFiles = [
|
||||
(mkEnvFile "PROWLARR")
|
||||
];
|
||||
};
|
||||
bazarr = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
group = "starr";
|
||||
};
|
||||
lidarr = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
settings = {
|
||||
authentication.AuthenticationMethod = "external";
|
||||
authentication.AuthenticationType = "enabled";
|
||||
};
|
||||
environmentFiles = [
|
||||
(mkEnvFile "LIDARR")
|
||||
];
|
||||
};
|
||||
whisparr = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
settings = {
|
||||
authentication.AuthenticationMethod = "external";
|
||||
authentication.AuthenticationType = "enabled";
|
||||
};
|
||||
environmentFiles = [
|
||||
(mkEnvFile "WHISPARR")
|
||||
];
|
||||
};
|
||||
|
||||
jellyseerr = {
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
];
|
||||
environment = {
|
||||
PUID = toString config.users.users.transmission.uid;
|
||||
GUID = toString config.users.groups.transmission.gid;
|
||||
PGID = toString config.users.groups.starr.gid;
|
||||
PEERPORT = peerport;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
enable = true;
|
||||
port = 12783;
|
||||
host = "0.0.0.0";
|
||||
noAuthentication = true;
|
||||
# noAuthentication = true;
|
||||
environmentFile = "/secrets/trilium.env";
|
||||
};
|
||||
}
|
||||
|
||||
+74
-5
@@ -49,13 +49,13 @@ in
|
||||
access_control = {
|
||||
default_policy = "deny";
|
||||
rules = [
|
||||
# {
|
||||
# domain = "radarr.shobu.fr";
|
||||
# policy = "bypass";
|
||||
# }
|
||||
{
|
||||
domain = "auth.shobu.fr";
|
||||
policy = "bypass";
|
||||
}
|
||||
{
|
||||
domain = "*.shobu.fr";
|
||||
policy = "one_factor";
|
||||
policy = "two_factor";
|
||||
}
|
||||
];
|
||||
};
|
||||
@@ -68,6 +68,75 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
identity_providers = {
|
||||
oidc = {
|
||||
hmac_secret = "this_is_a_secret_abc123abc123abc"; # 64+ character secret
|
||||
jwks = [
|
||||
{
|
||||
key = ''
|
||||
-----BEGIN PRIVATE KEY-----
|
||||
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDBGxQpgV074AB1
|
||||
ee+JiDMxuiVooVuD8RzVISTy0tVNBFS5vydB1g5k072shMdCE8S2M4oTaW7ZG1h0
|
||||
A+XbgZj+wZFcdHA+lD6QRGSN03FlrRZBMv8BCKzctdgAW1Dtrho31+Nw+3jTrrbO
|
||||
DiQaH2kzanET0GZJ+cD3AngWYV0KCkq8yws3T8AiK4oNghyv6Amknmbf7sJ+aZ8C
|
||||
f8WCixiErT/TjEGKRxFTKw3LMrdrbljE8JP+f1sTpDZP6uOtH0YS0iJ4nWHvxKYH
|
||||
LHLzrx3rO0zBrPiXK3eAtP2baPxS5y26kJcVL5bUSbDdB3NCznZc50OO14huX2s+
|
||||
GVct0FsLAgMBAAECggEAAUoZTy91wXa5gn8EzQVWzj9YfJDv2Pn4/hjLmRNHFADQ
|
||||
gmtXfhNJiHte7qqdjB1ag8TgOcHd8oyRFmcgCs3BaL68uwEdtq/hT4FXvF37EKW+
|
||||
q/PyS38XNMWBIpfD+tmYGJHfzp2HsuPCz5tbSzG5qioZvMNHd4FtRXj6cGntjRAg
|
||||
uW1Ns2h//BajftwD8RLHOvq7lWLaPWbdbte396KNBdNpceargISf9VEJik/dPWrT
|
||||
jV5bNAm7chvEfjhLqFCJ/p6j7z4DLFGrhYnh50btfe9FnWRtUYAGxhfaobveDPVe
|
||||
AI0lFN7IFU6+G6cYHTZAtAviWIutDwK0K9ACYCo1wQKBgQDiWEIdoYvjAh2J9K8f
|
||||
8YWa660YuvLSYQmvimr7E9FzoFdiUeFqlVCw/SIz7mRuDDCliDFxheekc8+jJB5U
|
||||
kfR2C2o3llRy+wLVap6X5OmqVAjFuHXxntbK/zwyv4K5uecwtEgDyGdXW2eZDog7
|
||||
VohuWOD3cTDAkVFu/Mw/02/CqwKBgQDaZ/b1Rfu9QXLvgtf23PpqKb0VG6gOo/Sm
|
||||
bpGnEBG9sAnsvDHBs85UTxzzr0qWOSguDh5NMxd0/IxKiLDRPvshhod9rWw0T8Qh
|
||||
jBDYsDLBZlBT1AVKvkeELZx9DW1Iomx6bdtYRX3SkgBKVK43q17J3T37U/UJ36PQ
|
||||
5e1lBbDJIQKBgQDcEcP222MPTLc7stOy0zl77zlVmi8NrZulOYfapuI28ecEiWgK
|
||||
ITNbYkMnCtpKxT9nMowgPHmEw7VWgX+b6m0teNvFQDzLrpKKvieEt+UY3qvI0hia
|
||||
3D0rEg6NqPaJbd8C08ZRJ0CTByQrBJ4gU3pDD9drvnoQQTpUFybfx8waEQKBgQDL
|
||||
6a1FKuXyuRyaSktgjMiwPe/vuTabFLDigvEyTWqC880QXlUGSN4nEQYy7kJxJ0RA
|
||||
W6Ym5cDM1M4W+LA9bNQDZRszV6ti2+Z+e8tuxHNe5iuxWI7oTedvnTYx+0tBOYSW
|
||||
eeME8zyaUP48Z/uQtkt1pT6tXKG3ajoEW+fdHgcEgQKBgCCTnBkASe21/n+D3c02
|
||||
vGekM3ioWNe9heIWv/7aWmMXb14DBCZMVXNyfOe7gQs2u3OX+IBW8UscGhY2LjVV
|
||||
5dKLMIWHw8Afccw4isYhequmJeai2Q3SSenWc7lIqOG4FDpwkcjW0VBBaU/p7ZnA
|
||||
h3JJ7q49hdgOKpF/xZNwmmfI
|
||||
-----END PRIVATE KEY-----''; # rsa private key
|
||||
}
|
||||
];
|
||||
claims_policies = {
|
||||
trilium = {
|
||||
id_token = [
|
||||
"email"
|
||||
"name"
|
||||
];
|
||||
};
|
||||
};
|
||||
clients = [
|
||||
{
|
||||
client_id = "trilium";
|
||||
client_name = "Trilium Notes";
|
||||
client_secret = "$pbkdf2-sha512$310000$c8p78n7pUMln0jzvd4aK4Q$JNRBzwAo0ek5qKn50cFzzvE9RXV88h1wJn5KGiHrD0YKtZaR/nCb2CJPOsKaPK0hjf.9yHxzQGZziziccp6Yng";
|
||||
public = false;
|
||||
authorization_policy = "two_factor";
|
||||
claims_policy = "trilium";
|
||||
require_pkce = false;
|
||||
pkce_challenge_method = "";
|
||||
redirect_uris = [ "https://trilium.shobu.fr/callback" ];
|
||||
scopes = [
|
||||
"openid"
|
||||
"profile"
|
||||
"email"
|
||||
];
|
||||
response_types = [ "code" ];
|
||||
grant_types = [ "authorization_code" ];
|
||||
access_token_signed_response_alg = "none";
|
||||
userinfo_signed_response_alg = "none";
|
||||
token_endpoint_auth_method = "client_secret_basic";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -17,10 +17,11 @@ in
|
||||
imports = [
|
||||
./nginx.nix
|
||||
# ./cybercoffee
|
||||
./ollama.nix
|
||||
./minecraft.nix
|
||||
# ./ollama.nix
|
||||
# ./minecraft.nix
|
||||
./secrets
|
||||
./authelia.nix
|
||||
./glances.nix
|
||||
];
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
@@ -39,6 +40,7 @@ in
|
||||
firewall = {
|
||||
allowedTCPPorts = [
|
||||
nodes.sin.config.services.gitea.settings.server.SSH_PORT
|
||||
993 # mail port
|
||||
]
|
||||
++ [
|
||||
# minecraft ad hoc server ports
|
||||
@@ -57,6 +59,16 @@ in
|
||||
proto = "tcp";
|
||||
destination = "${sin-address}:22";
|
||||
}
|
||||
{
|
||||
sourcePort = 993;
|
||||
proto = "tcp";
|
||||
destination = "${sin-address}:993";
|
||||
}
|
||||
{
|
||||
sourcePort = 8086;
|
||||
proto = "tcp";
|
||||
destination = "${sin-address}:8086";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
@@ -87,13 +99,11 @@ in
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
lunarvim
|
||||
wget
|
||||
httpie
|
||||
tmux
|
||||
git
|
||||
helix
|
||||
python312
|
||||
# lemonade
|
||||
];
|
||||
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
{ ... }:
|
||||
{
|
||||
services.glances = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
# TODO Change secrets
|
||||
extraArgs = [
|
||||
"--webserver"
|
||||
"--disable-webui"
|
||||
"--disable-plugin"
|
||||
"processcount"
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -49,7 +49,7 @@
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/D1B9-8019";
|
||||
device = "/dev/disk/by-uuid/2CF4-0109";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
|
||||
@@ -9,10 +9,6 @@ let
|
||||
url = "file:///${inputs.testing-grounds.modpack}/pack.toml";
|
||||
packHash = "sha256-+taYj4uroLNxM4Nia3n+5P1Y/g6dzE6Iq13TsZgk4mU=";
|
||||
};
|
||||
gregpack = pkgs.fetchPackwizModpack {
|
||||
url = "https://raw.githubusercontent.com/GregTechCEu/GregTech-Modern-Community-Pack/refs/heads/main/pack.toml";
|
||||
packHash = "sha256-SE86gP15H/Aug6vTLmMxHuxF2/+iLmCI/wQlON1xasM=";
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [ inputs.nix-minecraft.nixosModules.minecraft-servers ];
|
||||
@@ -24,7 +20,7 @@ in
|
||||
openFirewall = true;
|
||||
|
||||
servers.testing-grounds = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
|
||||
package = inputs.testing-grounds.packages.x86_64-linux.forge-server;
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
inputs,
|
||||
pkgs,
|
||||
lib,
|
||||
nodes,
|
||||
...
|
||||
}:
|
||||
let
|
||||
@@ -34,7 +35,7 @@ in
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://${sin-address}:${port}";
|
||||
proxyPass = "http://${sin-address}:${toString port}";
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -106,9 +107,10 @@ in
|
||||
// mkStarr "lidarr.shobu.fr" "8686"
|
||||
// mkStarr "whisparr.shobu.fr" "6969"
|
||||
// mkVHost "jellyseerr.shobu.fr" "5055"
|
||||
// mkVHost "transmission.shobu.fr" "9091"
|
||||
// mkVHost "zimablade-admin.shobu.fr" "61208"
|
||||
// (withWebsockets (withAuthelia (mkVHost "trilium.shobu.fr" "12783") "/") "/")
|
||||
// withAuthelia (mkVHost "transmission.shobu.fr" "9091") "/"
|
||||
// withAuthelia (mkVHost "zimablade-admin.shobu.fr" "61208") "/"
|
||||
// withAuthelia (mkVHost "actual.shobu.fr" nodes.sin.config.services.actual.settings.port) "/"
|
||||
// (withWebsockets (mkVHost "trilium.shobu.fr" "12783") "/")
|
||||
// {
|
||||
"shobu.fr" = {
|
||||
enableACME = true;
|
||||
@@ -165,6 +167,9 @@ in
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://${sin-address}:3000";
|
||||
extraConfig = ''
|
||||
client_max_body_size 100M;
|
||||
'';
|
||||
};
|
||||
};
|
||||
"files.shobu.fr" = {
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
{
|
||||
nodes,
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
sin-address = "192.168.1.14";
|
||||
unstable = import inputs.unstable { system = pkgs.system; };
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
@@ -19,9 +16,6 @@ in
|
||||
destination = "${sin-address}:22";
|
||||
}
|
||||
];
|
||||
|
||||
services.gitea-actions-runner.package = unstable.gitea-actions-runner;
|
||||
|
||||
# services.gitea-actions-runner.instances = {
|
||||
# "gitea.shobu.fr-runner" = {
|
||||
# enable = true;
|
||||
|
||||
Reference in New Issue
Block a user