diff --git a/README.md b/README.md
index c716cfb..95246d6 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Install homebrew separately with this command:
 Since git is configured with this repo, I recommend that you just download the ZIP of the repo and unpack locally, save it to `~/.config/nix/` and execute:
 
 ```bash
-sudo nix run nix-darwin --extra-experimental-features nix-command --extra-experimental-features flakes -- switch --flake ~/.config/nix#tbl-macbook
+sudo nix run nix-darwin --extra-experimental-features nix-command --extra-experimental-features flakes -- switch --flake ~/.config/nix#shai-hulud
 ```
 
 After that command, `nix-darwin` is installed and you can run this command to rebuild your config:
diff --git a/dotfiles/.gitconfig b/dotfiles/git/config
similarity index 100%
rename from dotfiles/.gitconfig
rename to dotfiles/git/config
diff --git a/dotfiles/.gitignore b/dotfiles/git/ignore
similarity index 100%
rename from dotfiles/.gitignore
rename to dotfiles/git/ignore
diff --git a/dotfiles/.alias b/dotfiles/shell/alias
similarity index 100%
rename from dotfiles/.alias
rename to dotfiles/shell/alias
diff --git a/dotfiles/oh-my-posh.omp.json b/dotfiles/shell/oh-my-posh.omp.json
similarity index 100%
rename from dotfiles/oh-my-posh.omp.json
rename to dotfiles/shell/oh-my-posh.omp.json
diff --git a/dotfiles/.zprofile b/dotfiles/shell/zprofile
similarity index 100%
rename from dotfiles/.zprofile
rename to dotfiles/shell/zprofile
diff --git a/dotfiles/.zshrc b/dotfiles/shell/zshrc
similarity index 100%
rename from dotfiles/.zshrc
rename to dotfiles/shell/zshrc
diff --git a/dotfiles/zed/settings.json b/dotfiles/zed/settings.json
new file mode 100644
index 0000000..d579a8d
--- /dev/null
+++ b/dotfiles/zed/settings.json
@@ -0,0 +1,20 @@
+// Zed settings
+//
+// For information on how to configure Zed, see the Zed
+// documentation: https://zed.dev/docs/configuring-zed
+//
+// To see all of Zed's default settings without changing your
+// custom settings, run `zed: open default settings` from the
+// command palette (shift-shift)
+{
+  "icon_theme": "Catppuccin Mocha",
+  "base_keymap": "JetBrains",
+  "vim_mode": false,
+  "ui_font_size": 16,
+  "buffer_font_size": 17.0,
+  "theme": {
+    "mode": "system",
+    "light": "Catppuccin Mocha",
+    "dark": "One Dark"
+  }
+}
diff --git a/flake.nix b/flake.nix
index e72c207..2ece0e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
   let
     system = "aarch64-darwin";
     username = "trueberryless";
-    hostname = "tbl-macbook";
+    hostname = "shai-hulud";
 
     specialArgs =
       inputs
diff --git a/modules/apps.nix b/modules/apps.nix
index 376047a..1f1a668 100644
--- a/modules/apps.nix
+++ b/modules/apps.nix
@@ -25,6 +25,7 @@ in {
       oh-my-posh
       postman
       raycast
+      spotify
       tmux
       tree
       zed-editor
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
index e3eb2e9..540fd03 100644
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@@ -11,11 +11,14 @@
   ];
 
   home.file = {
-    ".alias".source = ../dotfiles/.alias;
-    ".gitconfig".source = ../dotfiles/.gitconfig;
-    ".gitignore".source = ../dotfiles/.gitignore;
-    ".zprofile".source = ../dotfiles/.zprofile;
-    ".zshrc".source = ../dotfiles/.zshrc;
-    "oh-my-posh.omp.json".source = ../dotfiles/oh-my-posh.omp.json;
+    ".gitconfig".source = ../dotfiles/git/config;
+    ".gitignore".source = ../dotfiles/git/ignore;
+
+    ".alias".source = ../dotfiles/shell/alias;
+    ".zprofile".source = ../dotfiles/shell/zprofile;
+    ".zshrc".source = ../dotfiles/shell/zshrc;
+    "oh-my-posh.omp.json".source = ../dotfiles/shell/oh-my-posh.omp.json;
+
+    ".config/zed/settings.json".source = ../dotfiles/zed/settings.json;
   };
 }
diff --git a/modules/homebrew.nix b/modules/homebrew.nix
index 3b9173e..43953ab 100644
--- a/modules/homebrew.nix
+++ b/modules/homebrew.nix
@@ -8,9 +8,9 @@
     enable = true;
 
     onActivation = {
-      autoUpdate = false;
-      # 'zap': uninstalls all formulae(and related files) not listed here.
-      # cleanup = "zap";
+      autoUpdate = true;
+      upgrade = true;
+      cleanup = "zap";
     };
 
     # `brew install`
@@ -23,8 +23,6 @@
       "beeper"
       "clipbook"
       "firefox"
-      "spotify"
-      "visual-studio-code"
       "zen"
     ];
   };