From 4013b313d0c1348d5fab14291f445600820caf0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Sun, 14 Aug 2022 19:52:12 +0100
Subject: [PATCH] Try to use nvim as $EDITOR

---
 config/default.nix           |  1 +
 config/env.nix               | 13 +++++++++++++
 config/home-manager/base.nix |  6 +++---
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 config/env.nix

diff --git a/config/default.nix b/config/default.nix
index c027591b..068fc3fe 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -14,6 +14,7 @@
     ./services/restic.nix
     ./specialization.nix
     ./services/promtail.nix
+    ./env.nix
   ];
   services.openssh.enable = true;
   environment.systemPackages = with pkgs; [
diff --git a/config/env.nix b/config/env.nix
new file mode 100644
index 00000000..105a5002
--- /dev/null
+++ b/config/env.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, lib, ... }: {
+  config.environment.extraInit =
+    let
+      systemdBin = lib.getBin config.systemd.package;
+    in
+    ''
+      set -a
+      . /dev/fd/0 <<EOF
+        $(${systemdBin}/lib/systemd/user-environment-generators/30-systemd-environment-d-generator)
+      EOF
+      set +a
+    '';
+}
diff --git a/config/home-manager/base.nix b/config/home-manager/base.nix
index 2dd5ce1a..62c832c9 100644
--- a/config/home-manager/base.nix
+++ b/config/home-manager/base.nix
@@ -104,11 +104,11 @@ desktop: {pkgs, ...}: {
         userName = "mdelenk@hs-mittweida.de";
         primary = false;
       };
+    };
+  config.systemd.user.sessionVariables = {
+    EDITOR = "nvim";
   };
   home = {
-    sessionVariables = {
-      EDITOR = "nvim";
-    };
     shellAliases = {
       vim = "nvim";
       cat = "bat";