From 0fd68d8460070cb7cb6a836fba01ed8ff5e3246e Mon Sep 17 00:00:00 2001
From: Menno van Leeuwen <menno@vleeuwen.me>
Date: Tue, 20 May 2025 19:04:24 +0200
Subject: [PATCH] feat: add Zed Editor installation tasks and include in
 workstation setup

---
 .bashrc                                           |  2 +-
 config/ansible/tasks/workstations/flatpaks.yml    |  1 -
 config/ansible/tasks/workstations/workstation.yml |  3 +++
 config/ansible/tasks/workstations/zed-editor.yml  | 11 +++++++++++
 config/git/gitconfig.linux                        |  2 ++
 config/home-manager/flake.lock                    | 12 ++++++------
 vscode/settings.json                              |  2 +-
 7 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 config/ansible/tasks/workstations/zed-editor.yml

diff --git a/.bashrc b/.bashrc
index f3a0ed8..a75b3fd 100644
--- a/.bashrc
+++ b/.bashrc
@@ -149,7 +149,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 6737d89..4e0e785 100644
--- a/config/ansible/tasks/workstations/flatpaks.yml
+++ b/config/ansible/tasks/workstations/flatpaks.yml
@@ -71,7 +71,6 @@
       - io.github.flattool.Warehouse
       - 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 35ba9f9..278326b 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: Ensure workstation common packages are installed
       ansible.builtin.package:
         name:
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
diff --git a/config/home-manager/flake.lock b/config/home-manager/flake.lock
index 5ff5d5b..66e8932 100644
--- a/config/home-manager/flake.lock
+++ b/config/home-manager/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747209494,
-        "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=",
+        "lastModified": 1747485343,
+        "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5d736263df906c5da72ab0f372427814de2f52f8",
+        "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1747179050,
-        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
+        "lastModified": 1747542820,
+        "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
+        "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
         "type": "github"
       },
       "original": {
diff --git a/vscode/settings.json b/vscode/settings.json
index f09db13..e829e41 100755
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -6,7 +6,7 @@
     "*": true
   },
   "git.autofetch": true,
-  "workbench.iconTheme": "icons",
+  "workbench.iconTheme": "vscode-icons",
   "[jsonc]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },