diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index b1b3157..4f56a7f 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -8,21 +8,17 @@ 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 @@ -45,7 +41,6 @@ librewolf links2 linuxHeaders - mprocs mpv networkmanagerapplet nil @@ -61,11 +56,9 @@ pfetch playerctl polkit - presenterm pulsemixer ripgrep rmpc - rusty-man signal-desktop smartmontools telegram-desktop @@ -76,7 +69,6 @@ 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 8d619a5..9aca621 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 146dc0a..fec84d6 100644 --- a/modules/services/forgejo/module.nix +++ b/modules/services/forgejo/module.nix @@ -14,6 +14,7 @@ port = 3000; domain = "copeberg.org"; img = ./img; + acmeRoot = "/var/lib/acme/challenges-forgejo"; dataDir = "/srv/data/forgejo"; dumpDir = "/srv/data/forgejo-dump"; in { @@ -106,7 +107,7 @@ in { }; dump = { - enable = false; + enable = true; backupDir = dumpDir; interval = "06:00"; type = "tar.xz"; diff --git a/modules/services/grafana/module.nix b/modules/services/grafana/module.nix index bc3c6c8..ebdfd1f 100644 --- a/modules/services/grafana/module.nix +++ b/modules/services/grafana/module.nix @@ -4,7 +4,6 @@ pkgs, ... }: let - inherit (builtins) fetchurl; inherit (lib.modules) mkIf; inherit (lib.options) mkEnableOption; @@ -67,24 +66,6 @@ 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 = {