mirror of
https://git.sr.ht/~rouven/nixos-config
synced 2024-11-15 05:13:10 +01:00
Compare commits
3 commits
3dc025762f
...
11b11c2be7
Author | SHA1 | Date | |
---|---|---|---|
Rouven Seifert | 11b11c2be7 | ||
Rouven Seifert | ec8ee61cdf | ||
Rouven Seifert | e05b987ff7 |
12
flake.lock
12
flake.lock
|
@ -281,11 +281,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1707620986,
|
"lastModified": 1708225687,
|
||||||
"narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=",
|
"narHash": "sha256-NJBDfvknI26beOFmjO2coeJMTTUCCtw2Iu+rvJ1Zb9k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "0cb4345704123492e6d1f1068629069413c80de0",
|
"rev": "17352eb241a8d158c4ac523b19d8d2a6c8efe127",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -296,11 +296,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1707956935,
|
"lastModified": 1708118438,
|
||||||
"narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=",
|
"narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c",
|
"rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -7,9 +7,9 @@
|
||||||
./modules/networks
|
./modules/networks
|
||||||
./modules/backup
|
./modules/backup
|
||||||
./modules/cache
|
./modules/cache
|
||||||
./modules/grafana
|
# ./modules/grafana
|
||||||
./modules/hydra
|
./modules/hydra
|
||||||
./modules/prometheus
|
# ./modules/prometheus
|
||||||
./modules/matrix
|
./modules/matrix
|
||||||
./modules/seafile
|
./modules/seafile
|
||||||
./modules/uptime-kuma
|
./modules/uptime-kuma
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
{ config, ... }:
|
|
||||||
let
|
|
||||||
domain = "monitoring.${config.networking.domain}";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
services.grafana = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
server = {
|
|
||||||
inherit domain;
|
|
||||||
http_addr = "127.0.0.1";
|
|
||||||
http_port = 3000;
|
|
||||||
};
|
|
||||||
database = {
|
|
||||||
type = "postgres";
|
|
||||||
user = "grafana";
|
|
||||||
host = "/run/postgresql";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
services.postgresql = {
|
|
||||||
enable = true;
|
|
||||||
ensureUsers = [
|
|
||||||
{
|
|
||||||
name = "grafana";
|
|
||||||
ensureDBOwnership = true;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
ensureDatabases = [ "grafana" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."${domain}" = {
|
|
||||||
addSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://${toString config.services.grafana.settings.server.http_addr}:${toString config.services.grafana.settings.server.http_port}/";
|
|
||||||
proxyWebsockets = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,35 +0,0 @@
|
||||||
{ config, ... }:
|
|
||||||
let
|
|
||||||
exportersConfig = config.services.prometheus.exporters;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
services.prometheus = {
|
|
||||||
enable = true;
|
|
||||||
exporters = {
|
|
||||||
node = {
|
|
||||||
enable = true;
|
|
||||||
enabledCollectors = [ "systemd" ];
|
|
||||||
};
|
|
||||||
# postgres.enable = true;
|
|
||||||
};
|
|
||||||
scrapeConfigs = [
|
|
||||||
{
|
|
||||||
job_name = "node";
|
|
||||||
static_configs = [
|
|
||||||
{
|
|
||||||
targets = [ "127.0.0.1:${toString exportersConfig.node.port}" ];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
# {
|
|
||||||
# job_name = "postgres";
|
|
||||||
# static_configs = [
|
|
||||||
# {
|
|
||||||
# targets = [ "127.0.0.1:${toString exportersConfig.postgres.port}" ];
|
|
||||||
# }
|
|
||||||
# ];
|
|
||||||
# }
|
|
||||||
];
|
|
||||||
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -24,6 +24,7 @@
|
||||||
dnsutils
|
dnsutils
|
||||||
nmap
|
nmap
|
||||||
curlFull
|
curlFull
|
||||||
|
wireguard-tools
|
||||||
];
|
];
|
||||||
services.resolved = {
|
services.resolved = {
|
||||||
fallbackDns = [
|
fallbackDns = [
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
spiceUSBRedirection.enable = true;
|
spiceUSBRedirection.enable = true;
|
||||||
};
|
};
|
||||||
# allow libvirts internal network stuff
|
# allow libvirts internal network stuff
|
||||||
networking.firewall.trustedInterfaces = [ "virbr0" ];
|
networking.firewall.trustedInterfaces = [ "virbr0" "br0" ];
|
||||||
programs.virt-manager.enable = true;
|
programs.virt-manager.enable = true;
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
virt-viewer
|
virt-viewer
|
||||||
|
|
|
@ -7,8 +7,7 @@
|
||||||
./helix
|
./helix
|
||||||
./wayland
|
./wayland
|
||||||
./mpv
|
./mpv
|
||||||
# broken
|
./qutebrowser
|
||||||
# ./qutebrowser
|
|
||||||
./ssh
|
./ssh
|
||||||
./theme
|
./theme
|
||||||
./tex
|
./tex
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
|
|
||||||
# fancy tools
|
# fancy tools
|
||||||
just
|
just
|
||||||
himalaya
|
(himalaya.override { buildFeatures = [ "pgp-commands" ]; })
|
||||||
# strace but with colors
|
# strace but with colors
|
||||||
(strace.overrideAttrs (_: {
|
(strace.overrideAttrs (_: {
|
||||||
patches = [
|
patches = [
|
||||||
|
|
Loading…
Reference in a new issue