diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..a5dbbcb
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake .
diff --git a/.gitignore b/.gitignore
index 739f8e6..f7f05d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ result
 bin/
 obj/
 .DS_Store
+.direnv/
diff --git a/darwin-configuration.nix b/darwin-configuration.nix
index 4668fe6..1024e55 100644
--- a/darwin-configuration.nix
+++ b/darwin-configuration.nix
@@ -7,10 +7,6 @@ in {
   # $ nix-env -qaP | grep wget
 
   environment.systemPackages = [
-    pkgs.alacritty
-    pkgs.rustup
-    pkgs.libiconv
-    pkgs.clang
     pkgs.python3
   ];
 
diff --git a/home-manager/home.nix b/home-manager/home.nix
index a7cff9d..9fdc514 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -33,8 +33,8 @@
     ./modules/tmux.nix
     ./modules/zsh.nix
     ./modules/ripgrep.nix
-    ./modules/alacritty.nix
     ./modules/rust.nix
+    ./modules/posix-sh.nix
     (import ./modules/mail.nix
       {
         inherit mbsync secretsPath;
@@ -269,7 +269,6 @@
       nixpkgs.difftastic
       nixpkgs.syncthing
       nixpkgs.nodePackages_latest.dockerfile-language-server-nodejs
-      nixpkgs.nodePackages_latest.bash-language-server
       nixpkgs.nodePackages_latest.vscode-json-languageserver
       nixpkgs.nodePackages_latest.vscode-langservers-extracted
       nixpkgs.hadolint
@@ -279,27 +278,20 @@
       nixpkgs.fsautocomplete
       nixpkgs.wget
       nixpkgs.yt-dlp
-      nixpkgs.cmake
-      nixpkgs.gnumake
-      nixpkgs.gcc
       nixpkgs.lldb
       nixpkgs.hledger
       nixpkgs.hledger-web
       dotnet
       nixpkgs.elan
       nixpkgs.coreutils-prefixed
-      nixpkgs.shellcheck
-      nixpkgs.universal-ctags
       nixpkgs.asciinema
       nixpkgs.git-lfs
       nixpkgs.imagemagick
       nixpkgs.nixpkgs-fmt
       nixpkgs.age
-      nixpkgs.nodejs
       nixpkgs.pyright
       nixpkgs.woodpecker-agent
       nixpkgs.lynx
-      nixpkgs.alejandra
       nixpkgs.ffmpeg
       nixpkgs.bat
       nixpkgs.pandoc
@@ -313,6 +305,8 @@
       nixpkgs.font-awesome
       nixpkgs.gopls
       nixpkgs.go
+      nixpkgs.libiconv
+      nixpkgs.ghostty
     ]
     ++ (
       if nixpkgs.stdenv.isLinux
diff --git a/home-manager/modules/alacritty.nix b/home-manager/modules/alacritty.nix
deleted file mode 100644
index b1a6861..0000000
--- a/home-manager/modules/alacritty.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{pkgs, ...}: {
-  programs.alacritty = {
-    enable = true;
-    settings = {
-      font = {
-        normal = {
-          family = "FiraCode Nerd Font Mono";
-        };
-      };
-      terminal = {shell = "${pkgs.zsh}/bin/zsh";};
-    };
-  };
-
-  home.packages = [
-    pkgs.alacritty
-    pkgs.nerd-fonts.fira-code
-    pkgs.nerd-fonts.droid-sans-mono
-  ];
-}
diff --git a/home-manager/modules/ghostty.nix b/home-manager/modules/ghostty.nix
new file mode 100644
index 0000000..c2960de
--- /dev/null
+++ b/home-manager/modules/ghostty.nix
@@ -0,0 +1,9 @@
+{pkgs, ...}: {
+  programs.ghostty = {
+    enable = true;
+  };
+
+  home.packages = [
+    pkgs.ghostty
+  ];
+}
diff --git a/home-manager/modules/posix-sh.nix b/home-manager/modules/posix-sh.nix
new file mode 100644
index 0000000..7951539
--- /dev/null
+++ b/home-manager/modules/posix-sh.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  home.packages = [
+    pkgs.shellcheck
+    pkgs.nodePackages_latest.bash-language-server
+  ];
+}
diff --git a/home-manager/modules/zsh/zshrc b/home-manager/modules/zsh/zshrc
index 7d9f7d2..e126162 100644
--- a/home-manager/modules/zsh/zshrc
+++ b/home-manager/modules/zsh/zshrc
@@ -29,8 +29,6 @@ zle -N edit-command-line
 bindkey '^X^E' edit-command-line
 bindkey -e
 
-PATH="$PATH:$HOME/.cargo/bin"
-
 if [[ -z "$TMUX" ]]; then
     tmux new-session -A -s default
 fi