diff options
Diffstat (limited to 'modules/common')
| -rw-r--r-- | modules/common/common/nix/default.nix | 15 | ||||
| -rw-r--r-- | modules/common/profiles/dev/default.nix | 4 | ||||
| -rw-r--r-- | modules/common/profiles/headful.nix | 3 |
3 files changed, 14 insertions, 8 deletions
diff --git a/modules/common/common/nix/default.nix b/modules/common/common/nix/default.nix index 9f80838..b328e4c 100644 --- a/modules/common/common/nix/default.nix +++ b/modules/common/common/nix/default.nix @@ -4,7 +4,6 @@ lib, localUsername ? lib.my.username, pkgs, - pkgsPR, this, ... }: @@ -99,13 +98,16 @@ with lib; { patches = [./patches/alejandra-no-ads.patch]; }); - logcli = super.grafana-loki.overrideAttrs (_: _: { + logcli = super.grafana-loki.overrideAttrs (_: final: { + nativeBuildInputs = final.nativeBuildInputs ++ [pkgs.installShellFiles]; subPackages = ["cmd/logcli"]; + postInstall = '' + installShellCompletion --cmd logcli \ + --bash <($out/bin/logcli --completion--script-bash) \ + --zsh <($out/bin/logcli --completion-script-zsh) + ''; + preFixup = null; }); - - inherit (pkgsPR "215704" "sha256-o2F/ZAugljJKlVIAHMTBK6+Lj6BiBwteA5OuaWPKXm0=") dendrite; - - inherit (pkgsPR "216465" "sha256-ik3e+KM27hGkKWTOOUWj1YtiqHTJvl04dx0/X08P1A0=") amdvlk; } // (with super; let np = nodePackages; @@ -135,6 +137,7 @@ with lib; { environment.systemPackages = with pkgs; optionals this.isHeadful [ + hydra-check nix-top nix-tree ]; diff --git a/modules/common/profiles/dev/default.nix b/modules/common/profiles/dev/default.nix index 366590f..210924a 100644 --- a/modules/common/profiles/dev/default.nix +++ b/modules/common/profiles/dev/default.nix @@ -38,14 +38,14 @@ in { templates.params = rec { author-name = my.fullname; author-email = my.email; - copyright = "Copyright (c) ${author-name} <${author-email}>"; + copyright = "Copyright (c) 2023 ${author-name} <${author-email}>"; github-username = my.username; }; }; ".stack/global-project/stack.yaml".text = generators.toYAML {} { packages = []; - resolver = "lts-20.3"; + resolver = "lts-20.14"; }; }; diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix index 1c1f43b..809605c 100644 --- a/modules/common/profiles/headful.nix +++ b/modules/common/profiles/headful.nix @@ -33,10 +33,13 @@ in { packages = with pkgs; [ fd + logcli ripgrep ripgrep-all sd ]; + + sessionVariables.LOKI_ADDR = "https://loki.${config.networking.domain}"; }; accounts.email = { |