diff --git a/modules/hosts/base/configuration.nix b/modules/hosts/base/configuration.nix
index d2844f5..d370ec6 100644
--- a/modules/hosts/base/configuration.nix
+++ b/modules/hosts/base/configuration.nix
@@ -29,9 +29,6 @@
   services.displayManager.gdm.enable = true;
   programs.starship.enable = true;
   programs.mango.enable = true;
-  programs.niri = {
-    enable = true;
-  };
   services.upower.enable = true;
   services.xserver.xkb.layout = "us";
   services.pipewire = {
@@ -40,11 +37,12 @@
     pulse.enable = true;
   };
   security.rtkit.enable = true;
-
+  environment.pathsToLink = [ "/share/zsh" ];
   nixpkgs.config.allowUnfree = true;
   users.users.lucy = {
     isNormalUser = true;
     extraGroups = [ "wheel" ];
+    shell = pkgs.zsh;
     packages = [
       inputs.helium.packages.${pkgs.stdenv.hostPlatform.system}.default
     ];
diff --git a/modules/programs/default.nix b/modules/programs/default.nix
index 024948b..3b46e18 100644
--- a/modules/programs/default.nix
+++ b/modules/programs/default.nix
@@ -8,6 +8,7 @@
     ./quickshell.nix
     ./nixcord.nix
     ./mango.nix
-
+    ./zsh.nix
+    ./git.nix
   ];
 }
diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix
index 74b1f94..35c2954 100644
--- a/modules/programs/emacs.nix
+++ b/modules/programs/emacs.nix
@@ -38,7 +38,7 @@
       (use-package qml-mode)
       (use-package lua-mode)
       (use-package elcord :init (elcord-mode))
-      (setq inhibit-splash-screen 1)
+      (setq initial-buffer-choice "~/")
       (add-to-list
        'display-buffer-alist
        '("\\*compilation\\*" (display-buffer-reuse-window
diff --git a/modules/programs/git.nix b/modules/programs/git.nix
new file mode 100644
index 0000000..29f1d64
--- /dev/null
+++ b/modules/programs/git.nix
@@ -0,0 +1,10 @@
+{
+  programs.git = {
+    enable = true;
+    settings = {
+      user.name = "lucy";
+      user.email = "lucykaufmann@protonmail.com";
+      init.defaultBranch = "main";
+    };
+  };
+}
diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
new file mode 100644
index 0000000..5a9940b
--- /dev/null
+++ b/modules/programs/zsh.nix
@@ -0,0 +1,10 @@
+{
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+    oh-my-zsh.enable = true;
+    oh-my-zsh.theme = "gentoo";
+  };
+}