From 4390f2ae099f99aad814fdae54379991d3abcef5 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 29 Nov 2024 13:36:00 +0100 Subject: [PATCH] chore: remove redundant git filter rot8000 config Remove duplicate configurations for the rot8000 git filter from both mx and base modules. This change helps to streamline the code by ensuring that the unnecessary and redundant configurations are eliminated. --- modules/nixos/services/base/default.nix | 7 +------ systems/x86_64-linux/mx/default.nix | 4 ---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/modules/nixos/services/base/default.nix b/modules/nixos/services/base/default.nix index 7b92967..e817afc 100644 --- a/modules/nixos/services/base/default.nix +++ b/modules/nixos/services/base/default.nix @@ -9,11 +9,6 @@ with lib; with lib.metacfg; let cfg = config.metacfg.base; - gitconfig = pkgs.writeText "gitconfig" '' - [filter "rot8000"] - smudge = ${pkgs.metacfg.rot8000}/bin/rot8000 - clean = ${pkgs.metacfg.rot8000}/bin/rot8000 - ''; in { options.metacfg.base = with types; { @@ -166,10 +161,10 @@ in }; systemd.services.nixos-upgrade = { path = [ pkgs.metacfg.rot8000 ]; - environment.GIT_CONFIG_GLOBAL = toString gitconfig; }; programs.git.enable = true; + programs.git.config = { "filter \"rot8000\"" = { smudge = "${pkgs.metacfg.rot8000}/bin/rot8000"; diff --git a/systems/x86_64-linux/mx/default.nix b/systems/x86_64-linux/mx/default.nix index 8ae04f9..39c998e 100644 --- a/systems/x86_64-linux/mx/default.nix +++ b/systems/x86_64-linux/mx/default.nix @@ -47,10 +47,6 @@ programs.git.config = { safe.directory = "/var/lib/gitea/repositories/harald/nixcfg.git"; - "filter \"rot8000\"" = { - smudge = "${pkgs.metacfg.rot8000}/bin/rot8000"; - clean = "${pkgs.metacfg.rot8000}/bin/rot8000"; - }; }; environment.systemPackages = with pkgs; [