diff --git a/flake.lock b/flake.lock
index 136a973..2900037 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,7 +5,7 @@
"crane": "crane",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs",
+ "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
@@ -29,7 +29,7 @@
"flake-compat": "flake-compat_3",
"flake-parts": "flake-parts",
"nix-github-actions": "nix-github-actions",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
@@ -49,16 +49,14 @@
},
"botcore-v4": {
"inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
+ "nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1683656302,
- "narHash": "sha256-I2eu+9/i0ktqNzQwkc0NuczQ2UThCBf8L9xnZ8v3NSM=",
+ "lastModified": 1733328542,
+ "narHash": "sha256-6JuFGSaK/U33XS4qfKQdku2MyyIQhVAi6mgskTAK/2U=",
"owner": "BotCore-Devs",
"repo": "BotCore-v4",
- "rev": "0e8738ba7df060782df050dc733b0bfc8c499830",
+ "rev": "b4079bcd76476b412ecb44a7c1e891c390bcf429",
"type": "gitlab"
},
"original": {
@@ -76,7 +74,7 @@
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2",
"nix-filter": "nix-filter",
- "nixpkgs": "nixpkgs_2"
+ "nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1730678249,
@@ -469,17 +467,17 @@
"flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_4",
"nix-filter": "nix-filter_2",
- "nixpkgs": "nixpkgs_4",
+ "nixpkgs": "nixpkgs_5",
"rocksdb": "rocksdb",
"rust-manifest": "rust-manifest"
},
"locked": {
"host": "gitlab.computer.surgery",
- "lastModified": 1732905593,
- "narHash": "sha256-mcW64goCqTVFnBOWRZzLsx8uYrPmyrbwQr0WAQeSfRg=",
+ "lastModified": 1733098685,
+ "narHash": "sha256-6EF0YQcwcDnn6aXDSX5/CkdvywiS5vg6Db8PFzbu+gM=",
"owner": "matrix",
"repo": "grapevine-fork",
- "rev": "2f8e0e3e52620bf36756989f2d71d03b75fe8f50",
+ "rev": "a5fe9129f13844fe1ad67b5aab1d00d4bd7fa9e9",
"type": "gitlab"
},
"original": {
@@ -491,14 +489,14 @@
},
"home-manager": {
"inputs": {
- "nixpkgs": "nixpkgs_5"
+ "nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1732884235,
- "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=",
+ "lastModified": 1733299177,
+ "narHash": "sha256-TvDEljXVpgJ7mPLyh9KKJLZkOypF+LCkcvJq/jBz9MU=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "819f682269f4e002884702b87e445c82840c68f2",
+ "rev": "70803283187c8f775ff561be4117e5b1a11b296e",
"type": "github"
},
"original": {
@@ -634,7 +632,7 @@
"inputs": {
"flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_6",
- "nixpkgs": "nixpkgs_6"
+ "nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1731682434,
@@ -652,16 +650,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1702539185,
- "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=",
+ "lastModified": 1733212471,
+ "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447",
+ "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixpkgs-unstable",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -716,11 +714,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1732989265,
- "narHash": "sha256-uJH9OjABOf4k4Nt6tqQlBVUPGdDakN01L4qNq7lTed4=",
+ "lastModified": 1733299745,
+ "narHash": "sha256-6rrg0srML5aAh3jKY1gcStZ9p5Gu2lpCuAW3h4lW7jI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9b3a550e96b95e03585b8dd15e38eb324fedbe8b",
+ "rev": "cbba67d309432e65213ac7bf6bf7bddfd44ec58c",
"type": "github"
},
"original": {
@@ -764,11 +762,11 @@
},
"nixpkgs-stable_3": {
"locked": {
- "lastModified": 1732749044,
- "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
+ "lastModified": 1733220138,
+ "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
+ "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce",
"type": "github"
},
"original": {
@@ -780,6 +778,22 @@
},
"nixpkgs_2": {
"locked": {
+ "lastModified": 1702539185,
+ "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
"lastModified": 1709479366,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"owner": "NixOS",
@@ -794,7 +808,7 @@
"type": "github"
}
},
- "nixpkgs_3": {
+ "nixpkgs_4": {
"locked": {
"lastModified": 1726042813,
"narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=",
@@ -810,7 +824,7 @@
"type": "github"
}
},
- "nixpkgs_4": {
+ "nixpkgs_5": {
"locked": {
"lastModified": 1731676054,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
@@ -826,13 +840,13 @@
"type": "github"
}
},
- "nixpkgs_5": {
+ "nixpkgs_6": {
"locked": {
- "lastModified": 1732521221,
- "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+ "lastModified": 1733212471,
+ "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+ "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
"type": "github"
},
"original": {
@@ -842,7 +856,7 @@
"type": "github"
}
},
- "nixpkgs_6": {
+ "nixpkgs_7": {
"locked": {
"lastModified": 1729973466,
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
@@ -858,13 +872,13 @@
"type": "github"
}
},
- "nixpkgs_7": {
+ "nixpkgs_8": {
"locked": {
- "lastModified": 1732758367,
- "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=",
+ "lastModified": 1733212471,
+ "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59",
+ "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
"type": "github"
},
"original": {
@@ -874,7 +888,7 @@
"type": "github"
}
},
- "nixpkgs_8": {
+ "nixpkgs_9": {
"locked": {
"lastModified": 1731763621,
"narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=",
@@ -919,7 +933,7 @@
"mtxclientSrc": "mtxclientSrc",
"nhekoSrc": "nhekoSrc",
"nixos-wsl": "nixos-wsl",
- "nixpkgs": "nixpkgs_7",
+ "nixpkgs": "nixpkgs_8",
"nixpkgs-Draupnir": "nixpkgs-Draupnir",
"nixpkgs-RoryNix": "nixpkgs-RoryNix",
"nixpkgs-keydb": "nixpkgs-keydb",
@@ -976,14 +990,14 @@
},
"sops-nix": {
"inputs": {
- "nixpkgs": "nixpkgs_8"
+ "nixpkgs": "nixpkgs_9"
},
"locked": {
- "lastModified": 1732575825,
- "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=",
+ "lastModified": 1733128155,
+ "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa",
+ "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 7365834..a20f85f 100755
--- a/flake.nix
+++ b/flake.nix
@@ -50,7 +50,7 @@
# Own projects
botcore-v4 = {
url = "gitlab:BotCore-Devs/BotCore-v4/staging";
- inputs.nixpkgs.follows = "nixpkgs"; # We need this to avoid a LIBC error.
+ #inputs.nixpkgs.follows = "nixpkgs-RoryNix"; # We need this to avoid a LIBC error.
};
# Packages built from git
diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index 7d0903e..11f27eb 100755
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -22,11 +22,14 @@
./services/nginx/nginx.nix
#./services/jitsi.nix
./services/cgit.nix
- #./services/ollama.nix
+ ./services/ollama.nix
./services/prometheus.nix
./services/email/root.nix
];
+
+
+
users.groups.ocp = { };
networking = {
hostName = "Rory-nginx";
@@ -66,8 +69,11 @@
nginxSsl = true;
};
- nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ];
-
+ nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16"
+ "dotnet-runtime-wrapped-7.0.20"
+ "dotnet-runtime-7.0.20"
+ "dotnet-sdk-7.0.20"
+ ];
services.irqbalance.enable = true;
environment.memoryAllocator.provider = "jemalloc";
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix b/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix
index fd75817..81d07e7 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix
@@ -21,7 +21,7 @@ let
"~ ^/_matrix/federation/(v1|v2)/send_leave/"
"~ ^/_matrix/federation/v1/make_knock/"
"~ ^/_matrix/federation/v1/send_knock/"
- # "~ ^/_matrix/federation/(v1|v2)/invite/" # Needs special handling, define manually
+ "~ ^/_matrix/federation/(v1|v2)/invite/" # Needs special handling, define manually
"~ ^/_matrix/federation/(v1|v2)/query_auth/"
"~ ^/_matrix/federation/(v1|v2)/event_auth/"
"~ ^/_matrix/federation/v1/timestamp_to_event/"
@@ -135,13 +135,13 @@ in
)
);
- virtualHosts."${cfg.nginxVirtualHostName}".locations."~ ^/_matrix/federation/(v1|v2)/invite/" = {
- proxyPass = "http://${workerName}-federation";
- extraConfig = ''
- proxy_http_version 1.1;
- proxy_set_header Connection "";
- '';
- };
+ #virtualHosts."${cfg.nginxVirtualHostName}".locations."~ ^/_matrix/federation/(v1|v2)/invite/" = {
+ # proxyPass = "http://${workerName}-federation";
+ # extraConfig = ''
+ # proxy_http_version 1.1;
+ # proxy_set_header Connection "";
+ # '';
+ #};
};
};
}
diff --git a/host/Rory-nginx/services/ollama.nix b/host/Rory-nginx/services/ollama.nix
index c9709da..b9ebe66 100755
--- a/host/Rory-nginx/services/ollama.nix
+++ b/host/Rory-nginx/services/ollama.nix
@@ -10,8 +10,7 @@
environmentVariables = {
OLLAMA_LLM_LIBRARY = "cpu_avx2";
};
- writablePaths = [ "/data/ollama/home" ];
- listenAddress = "0.0.0.0:11434";
- sandbox = false;
+ #listenAddress = "0.0.0.0:11434";
+ host = "0.0.0.0";
};
}
diff --git a/modules/monitoring/module.nix b/modules/monitoring/module.nix
index 62ff1ea..c8d1d61 100644
--- a/modules/monitoring/module.nix
+++ b/modules/monitoring/module.nix
@@ -40,7 +40,13 @@ in
prometheus = lib.mkIf (cfg.localPrometheus) {
enable = true;
listenAddress = "127.0.0.1";
- extraFlags = [ "--storage.tsdb.wal-compression" ];
+ extraFlags = [
+ "--storage.tsdb.wal-compression"
+ "--query.max-concurrency 128"
+ "--rules.max-concurrent-evals 64"
+ "--storage.tsdb.retention.size 250GB"
+ "--enable-feature concurrent-rule-eval"
+ ];
};
grafana = lib.mkIf (cfg.localGrafana) {
enable = true;
|
