From 258ddad76d4d049448a31c779076a18da19a9e5f Mon Sep 17 00:00:00 2001 From: Jimbo Date: Tue, 25 Feb 2025 01:09:57 -0500 Subject: [PATCH] Move Git addon programs to home-manager --- modules/home/programs/terminal/git/default.nix | 9 +++++++-- modules/system/programs/git/default.nix | 2 -- modules/system/programs/git/gpg/default.nix | 5 ----- 3 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 modules/system/programs/git/gpg/default.nix diff --git a/modules/home/programs/terminal/git/default.nix b/modules/home/programs/terminal/git/default.nix index df3a416..b431e41 100644 --- a/modules/home/programs/terminal/git/default.nix +++ b/modules/home/programs/terminal/git/default.nix @@ -1,10 +1,15 @@ -{ pkgs, config, ... }: +{ config, pkgs, ... }: { programs.git = { enable = true; userName = "Jimbo"; userEmail = "jimbo@${config.domains.p2}"; }; - + programs.lazygit.enable = true; + + home.packages = with pkgs; [ + gnupg + git-crypt + ]; } diff --git a/modules/system/programs/git/default.nix b/modules/system/programs/git/default.nix index 6772d03..a887b85 100644 --- a/modules/system/programs/git/default.nix +++ b/modules/system/programs/git/default.nix @@ -1,7 +1,5 @@ { ... }: { - imports = [ ./gpg ]; - programs.git = { enable = true; lfs.enable = true; diff --git a/modules/system/programs/git/gpg/default.nix b/modules/system/programs/git/gpg/default.nix deleted file mode 100644 index 36327ea..0000000 --- a/modules/system/programs/git/gpg/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: -{ - programs.gnupg.agent.enable = true; - environment.systemPackages = with pkgs; [ git-crypt ]; -}