nvim bump

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765384171,
-        "narHash": "sha256-FuFtkJrW1Z7u+3lhzPRau69E0CNjADku1mLQQflUORo=",
+        "lastModified": 1766292113,
+        "narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "44777152652bc9eacf8876976fa72cc77ca8b9d8",
+        "rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762964643,
-        "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
+        "lastModified": 1765682243,
+        "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "827f2a23373a774a8805f84ca5344654c31f354b",
+        "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1765186076,
-        "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
+        "lastModified": 1766309749,
+        "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
+        "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1765311797,
-        "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=",
+        "lastModified": 1766201043,
+        "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b",
+        "rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1764947035,
-        "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=",
+        "lastModified": 1766125104,
+        "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a672be65651c80d3f592a89b3945466584a22069",
+        "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059",
         "type": "github"
       },
       "original": {
@@ -139,11 +139,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1765553226,
-        "narHash": "sha256-Ii16Nq5jL2wURXpV3D3tOM3vPpbKh18roHLkyZCHK4Q=",
+        "lastModified": 1766289575,
+        "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "496a6f625f63b780ce849891868f2fad22fd49c6",
+        "rev": "9836912e37aef546029e48c8749834735a6b9dad",
         "type": "github"
       },
       "original": {
@@ -160,11 +160,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765578056,
-        "narHash": "sha256-sE/iRR3LxCWZYOyIxC25Y7O7vUg/uCQZxePWiFr2JY0=",
+        "lastModified": 1766410104,
+        "narHash": "sha256-Eh+TUdb4CGscBLG3Q6QOQOjEdPCmHPClGyeHf4F67Mk=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "a2495cfc0e8e0b1d7d6cece49d88b6dbe1ef997d",
+        "rev": "eaff1bc54b9a8bd698c2dc47823400460e9f38a0",
         "type": "github"
       },
       "original": {

home-manager/core/dotfiles.nix

@@ -17,7 +17,19 @@
       recursive = true;
     };
     "nvim" = {
-      source = ./dotfiles/dot_config/nvim;
+      source = lib.cleanSourceWith {
+        src = ./dotfiles/dot_config/nvim;
+        filter = name: type: let
+          baseName = baseNameOf name;
+        in
+          ! (
+            (lib.hasPrefix "*/nvim/.*" name)
+            || (lib.hasPrefix "." baseName)
+            || (lib.hasPrefix "devenv" baseName)
+            || (lib.hasSuffix ".toml" baseName)
+            || (lib.hasSuffix ".yml" baseName)
+          );
+      };
       target = ".config/nvim";
       recursive = true;
     };

home-manager/homeserver/containers.nix

@@ -21,7 +21,7 @@
 
   imports = [
     ./containers/media.nix
-    ./containers/monitoring.nix
+    ./containers/metrics.nix
     ./containers/caddy.nix
     ./containers/work_tools.nix
     ./containers/nextcloud.nix

home-manager/homeserver/containers/caddy.nix

@@ -21,9 +21,11 @@
       volumes = [
         "/home/cianh/caddy/config:/etc/caddy"
         "/home/cianh/caddy/data:/data:Z"
+        "/home/cianh/caddy/logs:/var/log/caddy"
         "/home/cianh/caddy/placeholder_site:/var/www/site:Z"
         "/home/cianh/blog:/var/www/blog:Z"
         "/home/cianh/Nextcloud:/var/www/nextcloud:Z"
+        "/home/cianh/goaccess/site:/var/www/goaccess:Z"
       ];
     };
   };

home-manager/homeserver/containers/metrics.nix

@@ -0,0 +1,29 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  unstablePkgs,
+  ...
+}: {
+  services.podman = {
+    networks = {
+      metrics-net = {};
+    };
+    containers = {
+      goaccess = {
+        image = "docker.io/allinurl/goaccess:latest";
+        exec = "--output=/var/www/goaccess/index.html --log-file=/var/log/caddy/access.log --log-format=CADDY --tz=Europe/Dublin --anonymize-ip --real-time-html --ws-url=wss://metrics.example.com/ws --origin=https://metrics.bulba.space --port=7890";
+        autoUpdate = "registry";
+        network = [
+          "proxy-net"
+        ];
+        volumes = [
+          "/home/cianh/caddy/logs:/var/log/caddy"
+          "/home/cianh/goaccess/site:/var/www/goaccess"
+        ];
+      };
+    };
+  };
+}

home-manager/homeserver/containers/monitoring.nix

@@ -1,37 +0,0 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  unstablePkgs,
-  ...
-}: {
-  services.podman = {
-    networks = {
-      grafana-net = {};
-    };
-    containers = {
-      grafana = {
-        image = "docker.io/grafana/grafana:latest";
-        autoUpdate = "registry";
-        network = ["grafana-net"];
-        user = "1000:1000";
-        volumes = [
-          "/home/cianh/grafana:/var/lib/grafana:Z"
-        ];
-      };
-      prometheus = {
-        image = "docker.io/prom/prometheus:latest";
-        autoUpdate = "registry";
-        network = [
-          "grafana-net"
-          "proxy-net"
-        ];
-        volumes = [
-          "/home/cianh/prometheus/:/etc/prometheus/"
-        ];
-      };
-    };
-  };
-}