diff --git a/configuration.nix b/configuration.nix
index 23c6891..00ec6b2 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -46,7 +46,6 @@ in
     stremio
     fastfetch
     freetube
-    nextcloud-client
     discord
     nix-prefetch-github # Cmd to get rev and hash from GitHub
     gimp
diff --git a/home-manager/default.nix b/home-manager/default.nix
index c6d5bfa..128eb5d 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -14,11 +14,11 @@ in
     inputs.nixvim.homeManagerModules.nixvim
     ./cava.nix
     ./default-applications.nix
+    ./development
     ./fish.nix
-    ./git.nix
     ./gtk.nix
     ./mpv.nix
-    ./nixvim
+    ./nextcloud.nix
     ./rofi
     ./wlogout
     ./hyprland
diff --git a/home-manager/development/default.nix b/home-manager/development/default.nix
new file mode 100644
index 0000000..31a7d18
--- /dev/null
+++ b/home-manager/development/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./git.nix
+    ./nixvim
+    ./zed.nix
+  ];
+}
diff --git a/home-manager/git.nix b/home-manager/development/git.nix
similarity index 100%
rename from home-manager/git.nix
rename to home-manager/development/git.nix
diff --git a/home-manager/nixvim/default.nix b/home-manager/development/nixvim/default.nix
similarity index 100%
rename from home-manager/nixvim/default.nix
rename to home-manager/development/nixvim/default.nix
diff --git a/home-manager/development/zed.nix b/home-manager/development/zed.nix
new file mode 100644
index 0000000..b77091c
--- /dev/null
+++ b/home-manager/development/zed.nix
@@ -0,0 +1,32 @@
+{
+  programs.zed-editor = {
+    enable = true;
+    extensions = [
+      "html"
+      "catppuccin"
+      "toml"
+      "nix"
+      "git_firefly"
+    ];
+    userSettings =
+      let
+        theme = import ../../theme.nix;
+        font = "${theme.nerdFont} Nerd Font";
+        fontSize = 14;
+      in
+      {
+        autosave = "on_focus_change";
+        base_keymap = "JetBrains";
+        ui_font_family = font;
+        buffer_font_family = font;
+        ui_font_size = fontSize;
+        buffer_font_size = fontSize;
+        theme = {
+          mode = "system";
+          light = "Catppuccin Frappé";
+          dark = "Catppuccin Mocha";
+        };
+        lsp.nil.initialization_options.formatting.command = [ "nixfmt" ];
+      };
+  };
+}
diff --git a/home-manager/hyprland/settings.nix b/home-manager/hyprland/settings.nix
index 1be3f16..3312aab 100644
--- a/home-manager/hyprland/settings.nix
+++ b/home-manager/hyprland/settings.nix
@@ -14,7 +14,6 @@ in
     # Autostart
     exec-once = [
       "${app.browser}"
-      "nextcloud"
       "${app.terminal}"
       "hypridle"
       "systemctl --user start hyprpolkitagent"
diff --git a/home-manager/nextcloud.nix b/home-manager/nextcloud.nix
new file mode 100644
index 0000000..6d6bc7c
--- /dev/null
+++ b/home-manager/nextcloud.nix
@@ -0,0 +1,6 @@
+{
+  services.nextcloud-client = {
+    enable = true;
+    startInBackground = true;
+  };
+}
diff --git a/modules/development.nix b/modules/development.nix
index 9ad9761..404273f 100644
--- a/modules/development.nix
+++ b/modules/development.nix
@@ -6,7 +6,6 @@
     jetbrains.rust-rover
     jetbrains.webstorm
     vscodium # TODO set up extensions
-    zed-editor
     # Tools
     git
     rustup