flake.nix

@@ -34,6 +34,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    goatcounter = {
+      url = "github:asmir-abdulahovic/goatcounter-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -51,6 +56,7 @@
   };
 
   outputs = inputs @ {
+    goatcounter,
     home-manager,
     nixpkgs,
     nix-xilinx,
@@ -160,6 +166,7 @@
           {nix.registry.nixpkgs.flake = nixpkgs;}
           ./magpie/configuration.nix
           ./magpie/hardware-configuration.nix
+          goatcounter.nixosModules.goatcounter
           simple-nixos-mailserver.nixosModule
           sops-nix.nixosModules.sops
           (builtins.toPath "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix")

magpie/configuration.nix

@@ -3,6 +3,7 @@
   pkgs,
   lib,
   project-cloud,
+  goatcounter,
   nvim,
   system,
   ...
@@ -21,18 +22,18 @@
   boot.loader.systemd-boot.configurationLimit = 2;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelParams = ["ip=dhcp"];
   boot.kernel.sysctl = {
     "net.core.default_qdisc" = "fq";
     "net.ipv4.tcp_congestion_control" = "bbr";
   };
 
   boot.initrd = {
+    systemd.enable = true;
     compressor = "zstd";
     availableKernelModules = ["virtio-pci"];
-    systemd.enable = true;
     network = {
       enable = true;
+      udhcpc.enable = true;
       ssh = {
         enable = true;
         hostKeys = [/etc/ssh_dummy_ed25519_key];
@@ -56,6 +57,7 @@
     fzf
     fzy
     git
+    goatcounter.packages.${system}.goatcounter
     nvim.packages.${system}.nvim
     htop-vim
     nvim
@@ -117,9 +119,14 @@
 
   services.goatcounter = {
     enable = true;
-    port = 8002;
+    environmentFile = "/var/lib/goatcounter.env";
-    proxy = true;
+    extraArgs = ["-listen='*:8002'" "-tls=proxy"];
-    address = "127.0.0.1";
+    database = {
+      backend = "sqlite";
+      name = "goatcounter";
+      user = "goatcounter";
+      automigrate = true;
+    };
   };
 
   services.nextcloud = {
@@ -169,14 +176,12 @@
       root = "${project-cloud.packages.${system}.default}/public";
     };
 
-    /*
     virtualHosts.${config.services.nextcloud.hostName} = {
       quic = true;
       http3 = true;
       forceSSL = true;
       enableACME = true;
     };
-    */
 
     virtualHosts."miniflux.project-cloud.net" = {
       quic = true;
@@ -308,12 +313,10 @@
         sopsFile = ./secrets/gitea_db.yaml;
         owner = config.users.users.gitea.name;
       };
-      /*
       "nextcloud_admin" = {
         sopsFile = ./secrets/nextcloud_admin.yaml;
         owner = config.users.users.nextcloud.name;
       };
-      */
     };
   };