Compare commits
4 Commits
56f36d711f
...
faf97e2b3f
Author | SHA1 | Date | |
---|---|---|---|
|
faf97e2b3f | ||
|
07de18a9a9 | ||
|
394b5e5070 | ||
|
05a4fa074b |
18
flake.lock
generated
18
flake.lock
generated
@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1638267006,
|
"lastModified": 1638553958,
|
||||||
"narHash": "sha256-heZdDlD09rnoeEiZ4wKfbXNDkO5I9qVFvX9d790h/XE=",
|
"narHash": "sha256-leETjYMtD9y37CvfRSQhIGibcIl4dNVlFkY/8QgqmAM=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "3e93c4e8b2b479c712b7c20a428993b459118842",
|
"rev": "6ce1d64073f48b9bc9425218803b1b607454c1e7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -23,11 +23,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-unstable": {
|
"nixos-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1638286143,
|
"lastModified": 1638806821,
|
||||||
"narHash": "sha256-A+rgjbIpz3uPRKHPXwdmouVcVn5pZqLnaZHymjkraG4=",
|
"narHash": "sha256-v2qd2Bsmzft53s43eCbN+4ocrLksRdFLyF/MAGuWuDA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "29d1f6e1f625d246dcf84a78ef97b4da3cafc6ea",
|
"rev": "bc5d68306b40b8522ffb69ba6cff91898c2fbbff",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -39,11 +39,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1638279546,
|
"lastModified": 1638887115,
|
||||||
"narHash": "sha256-1KCwN7twjp1dBdp0jPgVdYFztDkCR8+roo0B34J9oBY=",
|
"narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "96b4157790fc96e70d6e6c115e3f34bba7be490f",
|
"rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -39,8 +39,10 @@ in {
|
|||||||
|
|
||||||
services.fwupd.enable = true;
|
services.fwupd.enable = true;
|
||||||
boot = {
|
boot = {
|
||||||
kernelParams =
|
kernelParams = [
|
||||||
[ "ip=${architect-lan}::10.0.0.1:255.255.255.0::${wan-if}:off" "nvme_core.default_ps_max_latency_us=5500" ];
|
"ip=${architect-lan}::10.0.0.1:255.255.255.0::${wan-if}:off"
|
||||||
|
"nvme_core.default_ps_max_latency_us=5500"
|
||||||
|
];
|
||||||
kernel.sysctl."net.ipv4.ip_forward" = 1;
|
kernel.sysctl."net.ipv4.ip_forward" = 1;
|
||||||
initrd = {
|
initrd = {
|
||||||
availableKernelModules = [ "igc" "r8169" ];
|
availableKernelModules = [ "igc" "r8169" ];
|
||||||
@ -70,6 +72,7 @@ in {
|
|||||||
|
|
||||||
supportedFilesystems = [ "zfs" ];
|
supportedFilesystems = [ "zfs" ];
|
||||||
zfs.requestEncryptionCredentials = true;
|
zfs.requestEncryptionCredentials = true;
|
||||||
|
tmpOnTmpfsSize = "75%";
|
||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
@ -5,9 +5,8 @@ with import ./network.nix; {
|
|||||||
domain = "git.giugl.io";
|
domain = "git.giugl.io";
|
||||||
appName = "Gitea";
|
appName = "Gitea";
|
||||||
rootUrl = "https://git.giugl.io";
|
rootUrl = "https://git.giugl.io";
|
||||||
ssh.clonePort = 10022;
|
ssh.clonePort = 22;
|
||||||
log.level = "Info";
|
settings.server.LFS_START_SERVER = true;
|
||||||
settings.server.START_SSH_SERVER = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx.virtualHosts.${gitdomain} = {
|
services.nginx.virtualHosts.${gitdomain} = {
|
||||||
@ -29,4 +28,5 @@ with import ./network.nix; {
|
|||||||
${architect-lan} ${gitdomain}
|
${architect-lan} ${gitdomain}
|
||||||
${architect-wg} ${gitdomain}
|
${architect-wg} ${gitdomain}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -42,12 +42,6 @@
|
|||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/tmp" = {
|
|
||||||
fsType = "tmpfs";
|
|
||||||
device = "tmpfs";
|
|
||||||
options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=29G" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [{
|
swapDevices = [{
|
||||||
device = "/dev/sdc1";
|
device = "/dev/sdc1";
|
||||||
size = 100000;
|
size = 100000;
|
||||||
|
@ -18,8 +18,8 @@ with import ./network.nix; {
|
|||||||
auto_join_rooms:
|
auto_join_rooms:
|
||||||
- "#infra:matrix.giugl.io"
|
- "#infra:matrix.giugl.io"
|
||||||
- "#general:matrix.giugl.io"
|
- "#general:matrix.giugl.io"
|
||||||
- "#gaming:matrix.giugl.io"
|
|
||||||
- "#movies:matrix.giugl.io"
|
- "#movies:matrix.giugl.io"
|
||||||
|
max_upload_size: "30M"
|
||||||
'';
|
'';
|
||||||
listeners = [{
|
listeners = [{
|
||||||
port = 8008;
|
port = 8008;
|
||||||
@ -42,6 +42,7 @@ with import ./network.nix; {
|
|||||||
|
|
||||||
postgresql = {
|
postgresql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs.postgresql_11;
|
||||||
ensureDatabases = [ "synapse" ];
|
ensureDatabases = [ "synapse" ];
|
||||||
ensureUsers = [{
|
ensureUsers = [{
|
||||||
name = "matrix-synapse";
|
name = "matrix-synapse";
|
||||||
@ -54,6 +55,9 @@ with import ./network.nix; {
|
|||||||
${matrixdomain} = {
|
${matrixdomain} = {
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
|
extraConfig = ''
|
||||||
|
client_max_body_size 30m;
|
||||||
|
'';
|
||||||
locations."= /.well-known/matrix/server".extraConfig =
|
locations."= /.well-known/matrix/server".extraConfig =
|
||||||
let server = { "m.server" = "${matrixdomain}:443"; };
|
let server = { "m.server" = "${matrixdomain}:443"; };
|
||||||
in ''
|
in ''
|
||||||
|
Loading…
Reference in New Issue
Block a user