fix: move direnv and git profiles to module

modules/terminal-life/default.nix

@@ -71,6 +71,9 @@ in {
           inherit pkgs;
           inherit lib;
         };
+
+        programs.git = import ./git {};
+        programs.direnv = import ./direnv {};
       };
     };
 }

modules/terminal-life/direnv/default.nix

@@ -0,0 +1,7 @@
+{ ... }:
+{
+  enable = true;
+  nix-direnv = {
+    enable = true;
+  };
+}

modules/terminal-life/git/default.nix

@@ -0,0 +1,41 @@
+{ ... }:
+{
+  enable = true;
+
+  extraConfig = {
+    pull.rebase = false;
+  };
+
+  aliases = {
+    a = "add -p";
+    co = "checkout";
+    cob = "checkout -b";
+    f = "fetch -p";
+    c = "commit";
+    p = "push";
+    ba = "branch -a";
+    bd = "branch -d";
+    bD = "branch -D";
+    d = "diff";
+    dc = "diff --cached";
+    ds = "diff --staged";
+    r = "restore";
+    rs = "restore --staged";
+    st = "status -sb";
+
+    # reset
+    soft = "reset --soft";
+    hard = "reset --hard";
+    s1ft = "soft HEAD~1";
+    h1rd = "hard HEAD~1";
+
+    # logging
+    lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
+    plog = "log --graph --pretty='format:%C(red)%d%C(reset) %C(yellow)%h%C(reset) %ar %C(green)%aN%C(reset) %s'";
+    tlog = "log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative";
+    rank = "shortlog -sn --no-merges";
+
+    # delete merged branches
+    bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d";
+  };
+}

users/profiles/direnv/default.nix

@@ -1,8 +0,0 @@
-{
-  programs.direnv = {
-    enable = true;
-    nix-direnv = {
-      enable = true;
-    };
-  };
-}

users/profiles/git/default.nix

@@ -1,42 +0,0 @@
-{
-  programs.git = {
-    enable = true;
-
-    extraConfig = {
-      pull.rebase = false;
-    };
-
-    aliases = {
-      a = "add -p";
-      co = "checkout";
-      cob = "checkout -b";
-      f = "fetch -p";
-      c = "commit";
-      p = "push";
-      ba = "branch -a";
-      bd = "branch -d";
-      bD = "branch -D";
-      d = "diff";
-      dc = "diff --cached";
-      ds = "diff --staged";
-      r = "restore";
-      rs = "restore --staged";
-      st = "status -sb";
-
-      # reset
-      soft = "reset --soft";
-      hard = "reset --hard";
-      s1ft = "soft HEAD~1";
-      h1rd = "hard HEAD~1";
-
-      # logging
-      lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
-      plog = "log --graph --pretty='format:%C(red)%d%C(reset) %C(yellow)%h%C(reset) %ar %C(green)%aN%C(reset) %s'";
-      tlog = "log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative";
-      rank = "shortlog -sn --no-merges";
-
-      # delete merged branches
-      bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d";
-    };
-  };
-}