From 41665a5b2f8050e70acaf1e19730ed101e128764 Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Fri, 27 Jun 2025 06:46:43 +0200 Subject: tweak(workstation): switch from tokei to scc tokei is pretty much unmaintained (a bug fix for a crash hasn't been merged in half a year[1]) and since there's other things that are bothering me (e.g. the format flag being named `-o` and `-o json` outputting the counts for every single file), I'm switching to scc, which is very actively maintained. [1]: https://github.com/XAMPPRocky/tokei/pull/1209 --- nixos/profiles/common/nixpkgs/overlays.nix | 11 +++++++++++ nixos/profiles/workstation/dev.nix | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/profiles/common/nixpkgs/overlays.nix b/nixos/profiles/common/nixpkgs/overlays.nix index 63e9de9..2834325 100644 --- a/nixos/profiles/common/nixpkgs/overlays.nix +++ b/nixos/profiles/common/nixpkgs/overlays.nix @@ -2,6 +2,17 @@ { pkgs, ... }: [ # features + (final: prev: { + scc = prev.scc.overrideAttrs (old: { + # https://github.com/boyter/scc/pull/622 + src = pkgs.fetchFromGitHub { + owner = "boyter"; + repo = "scc"; + rev = "b73ea06bdc5890821d03502a2cfc4224b19a9b67"; + hash = "sha256-vcuoKrvludBE0KpXVLkKzB38n0mZJWVB8bYrgJDHKfY="; + }; + }); + }) (final: prev: { skim = prev.skim.overrideAttrs (old: { patches = old.patches ++ [ diff --git a/nixos/profiles/workstation/dev.nix b/nixos/profiles/workstation/dev.nix index 87e461b..2cad67b 100644 --- a/nixos/profiles/workstation/dev.nix +++ b/nixos/profiles/workstation/dev.nix @@ -14,7 +14,7 @@ jq just sqlite-interactive - tokei + scc fastmod license-generator -- cgit v1.2.3