add reporting fix

common/general/fonts.nix

@@ -33,7 +33,6 @@ in
         default = true;
         description = "Enable jetbrains mono font";
       };
-
     };
 
   config = lib.mkIf cfg.jetbrainsMonoFont {

common/general/reporting.nix

@@ -7,6 +7,7 @@ let
   ccfg = import ../config.nix;
   cfg_path = [
     ccfg.custom_config_key
+    "general"
     "reporting"
   ];
   cfg = lib.attrsets.getAttrFromPath cfg_path config;
@@ -18,7 +19,7 @@ in
       enable = lib.mkEnableOption "Reporting node info and logs to grafana";
       lokiUrl = lib.mkOption {
         type = lib.types.str;
-        default = "http://100.64.0.13:3100/loki/api/v1/push";
+        default = "http://h001.net.joshuabell.xyz:3100/loki/api/v1/push";
         description = "URL of the Loki instance to send logs to";
       };
     };

hosts/lio/flake.lock

@@ -29,22 +29,17 @@
       "inputs": {
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_2",
         "ragenix": "ragenix"
       },
       "locked": {
-        "lastModified": 1750257055,
+        "path": "../../common",
-        "narHash": "sha256-Fuyc23OIqNy+HkesAeqAWje0/yuuvJEjTQUpayA3iDw=",
+        "type": "path"
-        "ref": "refs/heads/master",
-        "rev": "c04e866c3f604e4adc530c4a3c92a61fa9368386",
-        "revCount": 481,
-        "type": "git",
-        "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
       },
       "original": {
-        "type": "git",
+        "path": "../../common",
-        "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
+        "type": "path"
-      }
+      },
+      "parent": []
     },
     "crane": {
       "locked": {
@@ -161,26 +156,6 @@
         "type": "github"
       }
     },
-    "nixarr": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4",
-        "vpnconfinement": "vpnconfinement",
-        "website-builder": "website-builder"
-      },
-      "locked": {
-        "lastModified": 1750367617,
-        "narHash": "sha256-1kz35TbeqhJMdo1s/WHidoUT64IuoKCGlngv5/JCHiw=",
-        "owner": "rasmus-kirk",
-        "repo": "nixarr",
-        "rev": "450d76583ae6ec025577bde7da2a38cfc7fb0510",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rasmus-kirk",
-        "repo": "nixarr",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1749024892,
@@ -198,22 +173,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1749794982,
-        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1741379970,
         "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
@@ -229,29 +188,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
-        "lastModified": 1748662220,
+        "lastModified": 1750622754,
-        "narHash": "sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es=",
+        "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "59138c7667b7970d205d6a05a8bfa2d78caa3643",
+        "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1750133334,
-        "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "36ab78dab7da2e4e27911007033713bab534187b",
         "type": "github"
       },
       "original": {
@@ -261,7 +204,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1750188666,
         "narHash": "sha256-yAfLvtbCzSigTfbsJeOrvljS7VYLAwi2RZ6F+qd+A5E=",
@@ -1177,7 +1120,7 @@
         "agenix": "agenix",
         "crane": "crane",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
@@ -1197,14 +1140,13 @@
     "root": {
       "inputs": {
         "common": "common",
-        "nixarr": "nixarr",
+        "nixpkgs": "nixpkgs_3",
-        "nixpkgs": "nixpkgs_5",
         "ros_neovim": "ros_neovim"
       }
     },
     "ros_neovim": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_4",
         "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim",
         "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim",
         "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring",
@@ -1349,42 +1291,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "vpnconfinement": {
-      "locked": {
-        "lastModified": 1743810720,
-        "narHash": "sha256-kbv/W4gizUSa6qH2rUQdgPj9AJaeN9k2XSWUYqj7IMU=",
-        "owner": "Maroka-chan",
-        "repo": "VPN-Confinement",
-        "rev": "74ae51e6d18b972ecc918ab43e8bde60c21a65d8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Maroka-chan",
-        "repo": "VPN-Confinement",
-        "type": "github"
-      }
-    },
-    "website-builder": {
-      "inputs": {
-        "nixpkgs": [
-          "nixarr",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1750317638,
-        "narHash": "sha256-B4RWcXXOLO6gMeYyV+K4olu+kGGsYamKH+JAm0cIXqI=",
-        "owner": "rasmus-kirk",
-        "repo": "website-builder",
-        "rev": "b54192000a00e865947f45bacf3184d56363ee38",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rasmus-kirk",
-        "repo": "website-builder",
-        "type": "github"
-      }
     }
   },
   "root": "root",

hosts/lio/flake.nix

@@ -1,11 +1,10 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-    # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
     # Use relative to get current version for testing
-    # common.url = "path:../../common";
+    common.url = "path:../../common";
-    common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
+    # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
 
     ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
   };
@@ -15,7 +14,6 @@
       nixpkgs,
       common,
       ros_neovim,
-      nixarr,
       ...
     }@inputs:
     let
@@ -60,6 +58,7 @@
                     boot.systemd.enable = true;
                     secrets.enable = true;
                     general = {
+                      reporting.enable = true;
                       disableRemoteBuildsOnLio = true;
                     };
                     desktopEnvironment.gnome.enable = true;