diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index 4f56a7f..b1b3157 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -8,17 +8,21 @@ alsa-utils anki asciinema + bacon cachix calc + cargo-info cbonsai cinny-desktop cmus comma difftastic + dua element element-desktop evince eza + fselect gcc gh grc @@ -41,6 +45,7 @@ librewolf links2 linuxHeaders + mprocs mpv networkmanagerapplet nil @@ -56,9 +61,11 @@ pfetch playerctl polkit + presenterm pulsemixer ripgrep rmpc + rusty-man signal-desktop smartmontools telegram-desktop @@ -69,6 +76,7 @@ v4l-utils vlc vscodium + wiki-tui wireguard-tools wordgrinder xournalpp diff --git a/modules/programs/cli/jj/module.nix b/modules/programs/cli/jj/module.nix index 9aca621..8d619a5 100644 --- a/modules/programs/cli/jj/module.nix +++ b/modules/programs/cli/jj/module.nix @@ -98,5 +98,5 @@ ''; }; in { - environment.systemPackages = [jj-wrapped]; + # environment.systemPackages = [jj-wrapped]; } diff --git a/modules/services/forgejo/module.nix b/modules/services/forgejo/module.nix index fec84d6..146dc0a 100644 --- a/modules/services/forgejo/module.nix +++ b/modules/services/forgejo/module.nix @@ -14,7 +14,6 @@ port = 3000; domain = "copeberg.org"; img = ./img; - acmeRoot = "/var/lib/acme/challenges-forgejo"; dataDir = "/srv/data/forgejo"; dumpDir = "/srv/data/forgejo-dump"; in { @@ -107,7 +106,7 @@ in { }; dump = { - enable = true; + enable = false; backupDir = dumpDir; interval = "06:00"; type = "tar.xz"; diff --git a/modules/services/grafana/module.nix b/modules/services/grafana/module.nix index ebdfd1f..bc3c6c8 100644 --- a/modules/services/grafana/module.nix +++ b/modules/services/grafana/module.nix @@ -4,6 +4,7 @@ pkgs, ... }: let + inherit (builtins) fetchurl; inherit (lib.modules) mkIf; 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 = {