diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/linde.nix | 21 | ||||
| -rwxr-xr-x | system/nanopi.nix | 9 | ||||
| -rw-r--r-- | system/settings/hardware/audio.nix | 2 | ||||
| -rw-r--r-- | system/settings/services/git-server.nix | 5 | ||||
| -rw-r--r-- | system/settings/user-interface.nix | 1 |
5 files changed, 19 insertions, 19 deletions
diff --git a/system/linde.nix b/system/linde.nix index ee680eb0..730e0a14 100644 --- a/system/linde.nix +++ b/system/linde.nix @@ -24,7 +24,6 @@ in imports = [ <personal/modules/nixos/laminar.nix> - <personal/modules/nixos/goatcounter.nix> <home-manager/nixos> <agenix/modules/age.nix> <searchix/nix/modules> @@ -352,15 +351,17 @@ in services.goatcounter = { enable = true; - listenAddress = "localhost"; + address = "localhost"; port = 8082; - package = (import <personal> { inherit pkgs; }).goatcounter; - settings = { - tls = "proxy"; - websocket = true; - automigrate = true; - smtp = "smtp://localhost:25"; - }; + proxy = true; + extraArgs = [ + "-db" + "sqlite3+db/goatcounter.sqlite3" + "-websocket" + "-automigrate" + "-smtp" + "smtp://localhost:25" + ]; }; services.powerdns = @@ -805,7 +806,7 @@ in useACMEHost = "stats.alanpearce.eu"; serverAliases = [ "*.stats.alanpearce.eu" ]; extraConfig = '' - reverse_proxy ${srv.listenAddress}:${toString srv.port} + reverse_proxy ${srv.address}:${toString srv.port} ''; }; "go.alanpearce.eu" = { diff --git a/system/nanopi.nix b/system/nanopi.nix index 1e7411fa..5bd3d239 100755 --- a/system/nanopi.nix +++ b/system/nanopi.nix @@ -342,7 +342,8 @@ in networkConfig = { DHCP = "yes"; IPv6AcceptRA = true; - IPForward = "yes"; + IPv4Forwarding = true; + IPv6Forwarding = true; }; dhcpV4Config = { UseDNS = false; @@ -373,7 +374,8 @@ in networkConfig = { DHCP = "yes"; IPv6AcceptRA = true; - IPForward = "yes"; + IPv4Forwarding = true; + IPv6Forwarding = true; }; dhcpV4Config = { UseDNS = false; @@ -430,7 +432,8 @@ in matchConfig.MACAddress = "9c:53:22:33:bf:e9"; networkConfig = { DHCP = "yes"; - IPForward = "yes"; + IPv4Forwarding = true; + IPv6Forwarding = true; IgnoreCarrierLoss = "3s"; }; dhcpV4Config = { diff --git a/system/settings/hardware/audio.nix b/system/settings/hardware/audio.nix index 0afb38bb..78c7775a 100644 --- a/system/settings/hardware/audio.nix +++ b/system/settings/hardware/audio.nix @@ -9,8 +9,6 @@ pulse.enable = true; }; - sound.enable = true; - environment.systemPackages = with pkgs; [ pamixer ]; diff --git a/system/settings/services/git-server.nix b/system/settings/services/git-server.nix index 72c441f5..1560e8f5 100644 --- a/system/settings/services/git-server.nix +++ b/system/settings/services/git-server.nix @@ -64,7 +64,7 @@ let mkMirrorWants = repo: map (target: "mirror-to-${target}@${repo}.path"); in { - services.fcgiwrap.gitolite = { + services.fcgiwrap.instances.gitolite = { process = { user = "gitolite"; group = "gitolite"; @@ -117,7 +117,7 @@ in services.caddy.virtualHosts = { "git.alanpearce.eu" = let - fcgi = config.services.fcgiwrap.gitolite; + fcgi = config.services.fcgiwrap.instances.gitolite; fcgisocket = "${fcgi.socket.type}/${fcgi.socket.address}"; in { @@ -176,7 +176,6 @@ in enable-log-linecount=1 max-stats=year snapshots=tar.lz tar.zst zip - cache-size=10240 enable-http-clone=1 enable-commit-graph=1 mimetype-file=${pkgs.nginx}/conf/mime.types diff --git a/system/settings/user-interface.nix b/system/settings/user-interface.nix index d9d3297f..d8ae301a 100644 --- a/system/settings/user-interface.nix +++ b/system/settings/user-interface.nix @@ -58,7 +58,6 @@ extraArgs = "--keep-since 14d"; }; }; - nix.gc.automatic = ! config.programs.nh.enable; imports = [ ./services/xserver.nix |