about summary refs log tree commit diff
path: root/modules/user/aszlig/git/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user/aszlig/git/default.nix')
-rw-r--r--modules/user/aszlig/git/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/user/aszlig/git/default.nix b/modules/user/aszlig/git/default.nix
index 65aefb45..0090b617 100644
--- a/modules/user/aszlig/git/default.nix
+++ b/modules/user/aszlig/git/default.nix
@@ -3,6 +3,8 @@
 with lib;
 
 let
+  cfg = config.vuizvui.user.aszlig.programs.git;
+
   genConf = attrs: let
     escStr = s: "\"${escape [ "\"" "\\" ] s}\"";
     mkVal = v: if isBool v && v  then "true"
@@ -30,13 +32,13 @@ let
   gitPatched = overrideDerivation pkgs.gitFull (git: {
     makeFlags = let
       oldFlags = git.makeFlags or [];
-      newVal = "ETC_GITCONFIG=${config.vuizvui.git.config}";
+      newVal = "ETC_GITCONFIG=${cfg.config}";
     in if isList oldFlags
        then oldFlags ++ [ newVal ]
        else "${oldFlags} ${newVal}";
   });
 in {
-  options.vuizvui.git = {
+  options.vuizvui.user.aszlig.programs.git = {
     enable = mkEnableOption "Git";
 
     config = mkOption {
@@ -62,7 +64,7 @@ in {
     };
   };
 
-  config = mkIf config.vuizvui.git.enable {
+  config = mkIf cfg.enable {
     environment.systemPackages = [
       gitPatched
       pkgs.gitAndTools.git-remote-hg