From 38966c5b27d4e542604154909579db2d5a5877c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20R=C3=B6ger?= <jonas.kieran.roeger@iml.fraunhofer.de>
Date: Tue, 21 Oct 2025 16:04:42 +0200
Subject: [PATCH] Home Gen11 @ 2025-10-21-16:04 by
 admin-jroeger@T14-OE130-7-ubuntu

---
 home/admin-jroeger.nix     | 5 +++--
 modules/home/doom/doom.nix | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/home/admin-jroeger.nix b/home/admin-jroeger.nix
index 71f37c1..2da398f 100644
--- a/home/admin-jroeger.nix
+++ b/home/admin-jroeger.nix
@@ -1,4 +1,4 @@
-{...}: {
+{lib, ...}: {
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   home.username = "admin-jroeger";
@@ -12,6 +12,7 @@
   hive.nix-scripts.enable = true;
   hive.zsh.enable = true;
   hive.doom.enable = true;
+  hive.doom.asDefaultEditor = true;
   hive.doom.enableCopilot = true;
   hive.doom.withNixPkgs = true;
   hive.doom.withShellPkgs = true;
@@ -27,7 +28,7 @@
   home.stateVersion = "24.11"; # Please read the comment before changing.
 
   home.sessionVariables = {
-    EDITOR = "vim";
+    EDITOR = lib.mkDefault "vim";
   };
 
   # Let Home Manager install and manage itself.
diff --git a/modules/home/doom/doom.nix b/modules/home/doom/doom.nix
index a8f326b..13a81f4 100644
--- a/modules/home/doom/doom.nix
+++ b/modules/home/doom/doom.nix
@@ -166,6 +166,7 @@ in {
         // lib.optionalAttrs cfg.asDefaultEditor {
           EDITOR = "${doom-open}";
         };
+      packages = doom-pkgs ++ lib.optional cfg.asDefaultEditor doom-open;
     };
 
     systemd.user.services.doom-emacs-server = {
@@ -261,6 +262,5 @@ in {
         };
       };
     };
-    home.packages = doom-pkgs;
   };
 }