diff --git a/.bashrc b/.bashrc
index 59d1b58..3d248d9 100644
--- a/.bashrc
+++ b/.bashrc
@@ -164,7 +164,7 @@ fi
 # Source ble.sh if it exists
 if [[ -f "${HOME}/.nix-profile/share/blesh/ble.sh" ]]; then
     source "${HOME}/.nix-profile/share/blesh/ble.sh"
-        
+
     # Custom function for fzf history search
     function fzf_history_search() {
         local selected
diff --git a/config/ansible/tasks/workstations/flatpaks.yml b/config/ansible/tasks/workstations/flatpaks.yml
index 435080c..15a3cbf 100644
--- a/config/ansible/tasks/workstations/flatpaks.yml
+++ b/config/ansible/tasks/workstations/flatpaks.yml
@@ -71,7 +71,6 @@
       - io.github.johannesboehler2.BmiCalculator
       - io.github.nokse22.Exhibit
       - net.nokyan.Resources
-      - dev.zed.Zed
       - io.github.flattool.Ignition
       - io.github.bytezz.IPLookup
       - org.gaphor.Gaphor
diff --git a/config/ansible/tasks/workstations/workstation.yml b/config/ansible/tasks/workstations/workstation.yml
index d3bf0a9..7fe3681 100644
--- a/config/ansible/tasks/workstations/workstation.yml
+++ b/config/ansible/tasks/workstations/workstation.yml
@@ -31,6 +31,9 @@
     - name: Include Firefox PWA tasks
       ansible.builtin.import_tasks: tasks/workstations/firefoxpwa.yml
 
+    - name: Include Zed Editor tasks
+      ansible.builtin.import_tasks: tasks/workstations/zed-editor.yml
+
     - name: Include purge LibreOffice tasks
       ansible.builtin.import_tasks: tasks/workstations/purge-libreoffice.yml
 
diff --git a/config/ansible/tasks/workstations/zed-editor.yml b/config/ansible/tasks/workstations/zed-editor.yml
new file mode 100644
index 0000000..118de5f
--- /dev/null
+++ b/config/ansible/tasks/workstations/zed-editor.yml
@@ -0,0 +1,11 @@
+- name: Check if Zed Editor is installed
+  ansible.builtin.command:
+    cmd: zed --version
+  register: zed_version
+  ignore_errors: true
+
+- name: Install Zed Editor
+  ansible.builtin.command:
+    cmd: curl -f https://zed.dev/install.sh | sh
+  ignore_errors: true
+  when: zed_version.rc != 0
diff --git a/config/git/gitconfig.linux b/config/git/gitconfig.linux
index befc56a..aaa9cee 100644
--- a/config/git/gitconfig.linux
+++ b/config/git/gitconfig.linux
@@ -32,3 +32,5 @@
 [credential "https://gist.github.com"]
 	helper = 
 	helper = !/home/menno/.nix-profile/bin/gh auth git-credential
+[gpg "ssh"]
+	program = /opt/1Password/op-ssh-sign