Merge branch 'alpine/master' into framework/master, and update

nixos/programs/cosmic.nix

@@ -3,18 +3,6 @@
   config,
   ...
 }: {
-  # imports = [
-  #   inputs.nixos-cosmic.nixosModules.default
-  # ];
-  # nix.settings = {
-  #   substituters = ["https://cosmic.cachix.org/"];
-  #   trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="];
-  # };
   services.desktopManager.cosmic.enable = true;
   services.displayManager.cosmic-greeter.enable = true;
-  # services.system76-scheduler.enable = true;
-  # home-manager.users.${config.user}.imports = [
-  #   (inputs.hm-cosmic.homeManagerModules.cosmic)
-  #   ../../home/desktop/cosmic/.
-  # ];
 }

nixos/services/grafana.nix

@@ -5,9 +5,9 @@
     name = "dashboards";
     paths = map mkDashboard dashboards;
   };
-  mkDashboard = {name, url, sha256}: pkgs.writeTextFile {
+  mkDashboard = {name, url, sha256, patch ? lib.id}: pkgs.writeTextFile {
     inherit name;
-    text = builtins.readFile ( builtins.fetchurl {inherit url sha256;} );
+    text = patch (builtins.readFile ( builtins.fetchurl {inherit url sha256;} ));
     destination = "/dash/${name}.json";
   };
 in {
@@ -42,6 +42,8 @@ in {
         name = "node-exporter";
         url = "https://grafana.com/api/dashboards/1860/revisions/37/download";
         sha256 = "sha256:0qza4j8lywrj08bqbww52dgh2p2b9rkhq5p313g72i57lrlkacfl";
+        # https://github.com/rfmoz/grafana-dashboards/issues/169
+        patch = builtins.replaceStrings ["$__rate_interval"] ["$__range"];
       }
       {
         name = "synapse";

nixos/services/prometheus.nix

@@ -2,8 +2,8 @@
   inherit (config.services) prometheus;
   nodes = [
     "alpine"
-    "100.106.49.128"
-    "zenix"
+    "100.106.49.128" # laptop
+    "100.65.29.110" # gaming pc
   ];
   addPort = ip: "${ip}:${toString prometheus.exporters.node.port}";
 in {