From 0c749f2d3c177ed87f04bda3cd8dbb221ba29cb0 Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 22 Dec 2024 14:12:25 -0500 Subject: [PATCH] add man pages and nix fmt --- home/yt/common.nix | 9 ++++++++- hosts/chunk/conduwuit.nix | 5 +++-- pkgs/conduwuit.nix | 21 ++++++++++++--------- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/home/yt/common.nix b/home/yt/common.nix index dc828b2..f4918ad 100644 --- a/home/yt/common.nix +++ b/home/yt/common.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { imports = [ ../tmux.nix @@ -12,4 +12,11 @@ xdg.configFile = { nvim.source = ../nvim; }; + + home.packages = with pkgs; [ + man-pages + man-pages-posix + man + man-db + ]; } diff --git a/hosts/chunk/conduwuit.nix b/hosts/chunk/conduwuit.nix index 65c152b..0b8f1ff 100644 --- a/hosts/chunk/conduwuit.nix +++ b/hosts/chunk/conduwuit.nix @@ -1,7 +1,8 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ services.conduwuit = { enable = true; - package = pkgs.callPackage ../../pkgs/conduwuit.nix {}; + package = pkgs.callPackage ../../pkgs/conduwuit.nix { }; settings.global = { port = [ 8448 ]; server_name = "cything.io"; diff --git a/pkgs/conduwuit.nix b/pkgs/conduwuit.nix index 0f3ec37..4ebd0e4 100644 --- a/pkgs/conduwuit.nix +++ b/pkgs/conduwuit.nix @@ -80,15 +80,18 @@ rustPlatform.buildRustPackage rec { # for available features. # We enable all default features except jemalloc and io_uring, which # we guard behind our own (default-enabled) flags. - buildFeatures = [ - "brotli_compression" - "element_hacks" - "gzip_compression" - "release_max_log_level" - "sentry_telemetry" - "systemd" - "zstd_compression" - ] ++ lib.optional enableJemalloc "jemalloc" ++ lib.optional enableLiburing "io_uring"; + buildFeatures = + [ + "brotli_compression" + "element_hacks" + "gzip_compression" + "release_max_log_level" + "sentry_telemetry" + "systemd" + "zstd_compression" + ] + ++ lib.optional enableJemalloc "jemalloc" + ++ lib.optional enableLiburing "io_uring"; passthru = { updateScript = nix-update-script { };