From 908c3529323bc151b5dddc7ba2a2a1bea7067a90 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Mon, 2 Sep 2024 22:57:53 +0200 Subject: [PATCH] magpie/goatcounter: move to builting nixos module --- flake.nix | 7 ------- magpie/configuration.nix | 13 +++---------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index e5748bd..e5afb99 100644 --- a/flake.nix +++ b/flake.nix @@ -34,11 +34,6 @@ 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"; @@ -56,7 +51,6 @@ }; outputs = inputs @ { - goatcounter, home-manager, nixpkgs, nix-xilinx, @@ -166,7 +160,6 @@ {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") diff --git a/magpie/configuration.nix b/magpie/configuration.nix index 06d2af6..dd8c1dc 100644 --- a/magpie/configuration.nix +++ b/magpie/configuration.nix @@ -3,7 +3,6 @@ pkgs, lib, project-cloud, - goatcounter, nvim, system, ... @@ -57,7 +56,6 @@ fzf fzy git - goatcounter.packages.${system}.goatcounter nvim.packages.${system}.nvim htop-vim nvim @@ -119,14 +117,9 @@ services.goatcounter = { enable = true; - environmentFile = "/var/lib/goatcounter.env"; - extraArgs = ["-listen='*:8002'" "-tls=proxy"]; - database = { - backend = "sqlite"; - name = "goatcounter"; - user = "goatcounter"; - automigrate = true; - }; + port = 8002; + proxy = true; + address = "127.0.0.1"; }; services.nextcloud = {