From e6f79b30e620cf7bd5b06e2579e979ff090e925a Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 18 Oct 2024 03:10:35 -0400 Subject: more refactors & outsource some things (#477) * tree-wide: drop flake-parts * drop nixinate * justfile: cleanup * drop treefmt-nix * doc: update READMEs * flake: cleanup * seth: don't use `./.` * modules/nixos,darwin: bundle all modules They all depend on each other anyways so * systems: manually import internal modules * seth: use riff module from nix-exprs * flake: back to flake-parts * Revert "flake: back to flake-parts" This reverts commit 35334882f7c0c23991a4efd65ea08b216006b2b0. Saving the last commit so I can go back if I want * flake: use lib.const this looks better...right? * flake: declare systems like a normal person --- modules/home/riff.nix | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 modules/home/riff.nix (limited to 'modules/home/riff.nix') diff --git a/modules/home/riff.nix b/modules/home/riff.nix deleted file mode 100644 index 3a3e748..0000000 --- a/modules/home/riff.nix +++ /dev/null @@ -1,49 +0,0 @@ -# TODO: Upstream this -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.programs.git.riff; - cfg' = config.programs.git; - - exe = baseNameOf (lib.getExe cfg.package); -in -{ - options.programs.git.riff = { - enable = lib.mkEnableOption "diff filtering through riff"; - package = lib.mkPackageOption pkgs "riffdiff" { }; - }; - - config = lib.mkIf cfg.enable { - assertions = [ - { - assertion = - let - enabled = [ - cfg'.delta.enable - cfg'.diff-so-fancy.enable - cfg'.difftastic.enable - cfg.enable - ]; - in - lib.count lib.id enabled <= 1; - message = "Only one of 'programs.git.delta.enable' or 'programs.git.difftastic.enable' or 'programs.git.diff-so-fancy.enable' or `programs.git.riff.enable` can be set to true at the same time."; - } - ]; - - home.packages = [ cfg.package ]; - - programs.git.iniContent = { - pager = { - diff = exe; - log = exe; - show = exe; - }; - - interactive.diffFilter = exe + " --color=on"; - }; - }; -} -- cgit v1.2.3