Compare commits

...

4 commits

Author SHA1 Message Date
d742bcafc3
forgejo: cleanup, disable dump 2025-05-26 10:00:18 +02:00
89b240ddd0
jj: disable 2025-05-26 10:00:06 +02:00
7c04c06766
grafana: add dashboards 2025-05-26 09:59:56 +02:00
11d3888cc1
hermit: programs: add rusty tools 2025-05-26 09:59:33 +02:00
4 changed files with 29 additions and 3 deletions

View file

@ -8,17 +8,21 @@
alsa-utils alsa-utils
anki anki
asciinema asciinema
bacon
cachix cachix
calc calc
cargo-info
cbonsai cbonsai
cinny-desktop cinny-desktop
cmus cmus
comma comma
difftastic difftastic
dua
element element
element-desktop element-desktop
evince evince
eza eza
fselect
gcc gcc
gh gh
grc grc
@ -41,6 +45,7 @@
librewolf librewolf
links2 links2
linuxHeaders linuxHeaders
mprocs
mpv mpv
networkmanagerapplet networkmanagerapplet
nil nil
@ -56,9 +61,11 @@
pfetch pfetch
playerctl playerctl
polkit polkit
presenterm
pulsemixer pulsemixer
ripgrep ripgrep
rmpc rmpc
rusty-man
signal-desktop signal-desktop
smartmontools smartmontools
telegram-desktop telegram-desktop
@ -69,6 +76,7 @@
v4l-utils v4l-utils
vlc vlc
vscodium vscodium
wiki-tui
wireguard-tools wireguard-tools
wordgrinder wordgrinder
xournalpp xournalpp

View file

@ -98,5 +98,5 @@
''; '';
}; };
in { in {
environment.systemPackages = [jj-wrapped]; # environment.systemPackages = [jj-wrapped];
} }

View file

@ -14,7 +14,6 @@
port = 3000; port = 3000;
domain = "copeberg.org"; domain = "copeberg.org";
img = ./img; img = ./img;
acmeRoot = "/var/lib/acme/challenges-forgejo";
dataDir = "/srv/data/forgejo"; dataDir = "/srv/data/forgejo";
dumpDir = "/srv/data/forgejo-dump"; dumpDir = "/srv/data/forgejo-dump";
in { in {
@ -107,7 +106,7 @@ in {
}; };
dump = { dump = {
enable = true; enable = false;
backupDir = dumpDir; backupDir = dumpDir;
interval = "06:00"; interval = "06:00";
type = "tar.xz"; type = "tar.xz";

View file

@ -4,6 +4,7 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (builtins) fetchurl;
inherit (lib.modules) mkIf; inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption; inherit (lib.options) mkEnableOption;
@ -66,6 +67,24 @@ in {
}) })
]; ];
}; };
dashboards.settings.providers = [
{
# taken from https://grafana.com/grafana/dashboards/1860-node-exporter-full/
name = "system-status";
path = fetchurl {
url = "https://grafana.com/api/dashboards/1860/revisions/40/download";
hash = "sha256-zTsS/UEX6W8+qK3l2GtvdDfmwS8eVnnyZxZ++LtRLBA=";
};
}
{
# taken from https://grafana.com/grafana/dashboards/1860-node-exporter-full/
name = "PostgreSQL-status";
path = fetchurl {
url = "https://grafana.com/api/dashboards/9628/revisions/8/download";
hash = "sha256-UhusNAZbyt7fJV/DhFUK4FKOmnTpG0R15YO2r+nDnMc=";
};
}
];
}; };
}; };
services.nginx = { services.nginx = {