diff --git a/provision/modules/base/default.nix b/provision/modules/base/default.nix index 6160470a..4a94846a 100644 --- a/provision/modules/base/default.nix +++ b/provision/modules/base/default.nix @@ -2,5 +2,6 @@ { imports = [ ./terminal.nix + ../programs/git.nix ]; } diff --git a/provision/modules/programs/default.nix b/provision/modules/programs/default.nix index 87a20657..fa3193d4 100644 --- a/provision/modules/programs/default.nix +++ b/provision/modules/programs/default.nix @@ -6,7 +6,6 @@ ./borg.nix ./chrome.nix ./firefox.nix - ./git.nix ./chezmoi.nix ./kitty.nix ./nvim.nix diff --git a/provision/modules/programs/git.nix b/provision/modules/programs/git.nix index e2612d50..8de77862 100644 --- a/provision/modules/programs/git.nix +++ b/provision/modules/programs/git.nix @@ -3,17 +3,13 @@ let cfg = config.modules.programs.git; in { options.modules.programs.git = with lib; { - enable = lib.mkOption { - type = with types; bool; - default = true; - }; keys = lib.mkOption { type = with types; bool; default = true; }; }; - config = lib.mkIf cfg.enable { + config = { environment.systemPackages = with pkgs; [ git # Version control system for tracking changes in source code during software development git-annex # Manages files with git, without checking the file contents into git