diff --git a/users/patriot/default.nix b/users/patriot/default.nix
index a0733e8..f49e721 100644
--- a/users/patriot/default.nix
+++ b/users/patriot/default.nix
@@ -527,31 +527,6 @@ in
             '';
         };
         git = {
-          enable = true;
-          aliases = {
-            a = "add";
-            b = "branch";
-            c = "commit";
-            d = "diff";
-            l = "log";
-            s = "status";
-            co = "checkout";
-            dc = "diff --cached";
-            qc = "commit -am";
-            pl = "pull";
-            ps = "push";
-            rb = "rebase";
-            rs = "restore";
-            rv = "revert";
-            ss = "stash";
-            rst = "reset";
-            rss = "restore --staged";
-            ssp = "stash pop";
-            ssl = "stash list";
-            ssd = "stash drop";
-          };
-          extraConfig = { pull.rebase = true; };
-          lfs.enable = true;
           signing = {
             key = "E1C119F91F4CAE53E8445CAFBB57FCE7E35984F6";
             signByDefault = true;
@@ -632,24 +607,6 @@ in
             '';
           };
         };
-        starship = {
-          enable = true;
-          settings = {
-            add_newline = false;
-            character = {
-              success_symbol = "[>](bold green)";
-              error_symbol = "[>](bold red)";
-            };
-            directory = {
-              truncation_length = 2;
-              truncate_to_repo = false;
-            };
-          };
-        };
-        direnv = {
-          enable = true;
-          enableNixDirenvIntegration = true;
-        };
         fzf.enable = true;
         rofi =
           let
diff --git a/users/profiles/git/default.nix b/users/profiles/git/default.nix
index 4c9637e..5b70e61 100644
--- a/users/profiles/git/default.nix
+++ b/users/profiles/git/default.nix
@@ -1,33 +1,36 @@
 {
   programs.git = {
     enable = true;
-
-    extraConfig = {
-      pull.rebase = false;
-    };
-
+    extraConfig = { pull.rebase = true; };
+    lfs.enable = true;
     aliases = {
       a = "add -p";
       co = "checkout";
       cob = "checkout -b";
       f = "fetch -p";
       c = "commit";
-      p = "push";
+      ps = "push";
+      pl = "pull";
+      rb = "rebase";
       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";
+      rs = "restore";
+      rss = "restore --staged";
+      s = "status -sb";
+      ss = "stash";
+      ssp = "stash pop";
+      ssl = "stash list";
+      ssd = "stash drop";
 
       # reset
-      soft = "reset --soft";
-      hard = "reset --hard";
-      s1ft = "soft HEAD~1";
-      h1rd = "hard HEAD~1";
+      rsoft = "reset --soft";
+      rhard = "reset --hard";
+      rs1ft = "soft HEAD~1";
+      rh1rd = "hard HEAD~1";
 
       # logging
       lg =
diff --git a/users/profiles/starship/default.nix b/users/profiles/starship/default.nix
new file mode 100644
index 0000000..1f5d098
--- /dev/null
+++ b/users/profiles/starship/default.nix
@@ -0,0 +1,16 @@
+{ ... }: {
+  programs.starship = {
+    enable = true;
+    settings = {
+      add_newline = false;
+      character = {
+        success_symbol = "[>](bold green)";
+        error_symbol = "[>](bold red)";
+      };
+      directory = {
+        truncation_length = 2;
+        truncate_to_repo = false;
+      };
+    };
+  };
+}
diff --git a/users/profiles/wtf/default.nix b/users/profiles/wtf/default.nix
new file mode 100644
index 0000000..b565c7f
--- /dev/null
+++ b/users/profiles/wtf/default.nix
@@ -0,0 +1,3 @@
+{ pkgs, ... }: {
+  home.packages = [ pkgs.wtf ];
+}