From 04c18c06a7b80fdcab7dde897d3dd2d0ffbad86c Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Tue, 5 Mar 2024 21:45:59 +0100 Subject: [PATCH] Add git module --- home-manager/cli/default.nix | 1 - home-manager/cli/git.nix | 9 ------- hosts/luci/home-config.nix | 1 + modules/home-manager/cli/git/default.nix | 30 ++++++++++++++++++++++++ modules/home-manager/default.nix | 1 + 5 files changed, 32 insertions(+), 10 deletions(-) delete mode 100644 home-manager/cli/git.nix create mode 100644 modules/home-manager/cli/git/default.nix diff --git a/home-manager/cli/default.nix b/home-manager/cli/default.nix index 60c17db..f495cb0 100644 --- a/home-manager/cli/default.nix +++ b/home-manager/cli/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ - ./git.nix ./pass.nix ./gnupg.nix ./bat.nix diff --git a/home-manager/cli/git.nix b/home-manager/cli/git.nix deleted file mode 100644 index 8edf5c9..0000000 --- a/home-manager/cli/git.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - programs.git = { - enable = true; - package = pkgs.gitFull; - userName = "Yorick Barbanneau"; - userEmail = "ephase@xieme-art.org"; - }; -} diff --git a/hosts/luci/home-config.nix b/hosts/luci/home-config.nix index af30a63..3161587 100644 --- a/hosts/luci/home-config.nix +++ b/hosts/luci/home-config.nix @@ -4,6 +4,7 @@ zathura.enable = true; }; cli = { + git.enable = true; neovim.enable = true; vifm.enable = true; zsh.enable = true; diff --git a/modules/home-manager/cli/git/default.nix b/modules/home-manager/cli/git/default.nix new file mode 100644 index 0000000..c4f21ce --- /dev/null +++ b/modules/home-manager/cli/git/default.nix @@ -0,0 +1,30 @@ +{ lib, config, pkgs, ... }: +with lib; +let + cfg = config.modules.cli.git; +in +{ + options.modules.cli.git = { + enable = mkEnableOption "enable git"; + + userName = mkOption { + type = types.str; + default = "Yorick Barbanneau"; + description = "git username"; + }; + + userEmail = mkOption { + type = types.str; + default = "ephase@xieme-art.org"; + description = "git email"; + }; + }; + config = mkIf cfg.enable { + programs.git = { + enable = true; + package = pkgs.gitFull; + userName = "${cfg.userName}"; + userEmail = "${cfg.userEmail}"; + }; + }; +} diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 5fe7f9b..376a42b 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -3,6 +3,7 @@ imports = [ ./application/imv ./application/zathura + ./cli/git ./cli/neovim ./cli/vifm ./cli/zsh