diff --git a/home.nix b/home.nix
index 39c0052..d6a5a31 100644
--- a/home.nix
+++ b/home.nix
@@ -2,9 +2,10 @@
 
 {
   imports = [
+    ./shell
+
     ./git.nix
     ./kitty.nix
-    ./shell/shell.nix
     ./ssh.nix
   ];
 
diff --git a/shell/default.nix b/shell/default.nix
new file mode 100644
index 0000000..d0a4d71
--- /dev/null
+++ b/shell/default.nix
@@ -0,0 +1,39 @@
+{ config, pkgs, lib, ... }:
+{
+  imports = [
+    ./bash.nix
+    ./zsh.nix
+  ];
+
+  home.sessionVariables = {
+    EDITOR = "nvim";
+  };
+
+  home.shellAliases = {
+    clstat = "clear && git status";
+    vim = "nvim";
+
+    ga = "git add";
+    gaa = "git add .";
+    gc = "git commit --message";
+    gca = "git commit --amend";
+    "gca!" = "git commit --amend --no-edit";
+    gd = "git diff";
+    gds = "git diff --staged";
+    glol = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset\"";
+    glola = "git log --graph --pretty=\"%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset\" --all";
+    gp = "git push";
+    "gp!" = "git push --force";
+    gpl = "git pull";
+  };
+
+  programs.starship = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+
+  programs._1password-shell-plugins = {
+    enable = true;
+  };
+}
+
diff --git a/shell/shell.nix b/shell/shell.nix
deleted file mode 100644
index ccba940..0000000
--- a/shell/shell.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  imports = [
-    ./bash.nix
-    ./zsh.nix
-  ];
-
-  home.sessionVariables = {
-    EDITOR = "nvim";
-  };
-
-  home.shellAliases = {
-    clstat = "clear && git status";
-    gpl = "git pull";
-    vim = "nvim";
-  };
-
-  programs.starship = {
-    enable = true;
-    enableZshIntegration = true;
-  };
-
-  programs._1password-shell-plugins = {
-    enable = true;
-  };
-}
-