From 93c596d4d1e7ca68950f19bb7ff4b3f7463d35c8 Mon Sep 17 00:00:00 2001
From: bad <badatnames@tutanota.com>
Date: Mon, 19 Sep 2022 15:51:26 +0200
Subject: [PATCH] Move default editor to neovim config

---
 users/maekasza/default.nix          | 1 -
 users/modules/alacritty/default.nix | 6 +++++-
 users/modules/neovim/default.nix    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/users/maekasza/default.nix b/users/maekasza/default.nix
index dce94e2..5c816d1 100644
--- a/users/maekasza/default.nix
+++ b/users/maekasza/default.nix
@@ -12,7 +12,6 @@
 
   home.sessionVariables = {
     XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share";
-    EDITOR = "${pkgs.neovim}/bin/nvim";
     MOZ_ENABLE_WAYLAND = 1;
   };
   gtk = {
diff --git a/users/modules/alacritty/default.nix b/users/modules/alacritty/default.nix
index 79dfb03..2902ca8 100644
--- a/users/modules/alacritty/default.nix
+++ b/users/modules/alacritty/default.nix
@@ -16,7 +16,11 @@ in
 {
   options.mae.alacritty = {
     enable = lib.mkEnableOption "Enable the alacritty terminal";
-    libglWrapper = lib.mkEnableOption "Wrap alacritty in libgl to make it work on non nixos systems";
+    libglWrapper = lib.mkOption {
+      default = false;
+      type = lib.types.bool;
+      description = "Wrap alacritty in libgl to make it work on non nixos systems";
+    };
   };
   config = lib.mkIf cfg.enable {
     fonts.fontconfig.enable = true;
diff --git a/users/modules/neovim/default.nix b/users/modules/neovim/default.nix
index cbf6b5b..c651ac6 100644
--- a/users/modules/neovim/default.nix
+++ b/users/modules/neovim/default.nix
@@ -18,6 +18,7 @@ in
     enable = mkEnableOption "enable neovim";
   };
   config = {
+    home.sessionVariables.EDITOR = "${pkgs.neovim}/bin/nvim";
     programs.neovim = mkIf cfg.enable {
       enable = true;
       vimdiffAlias = true;
@@ -31,7 +32,6 @@ in
           config = "colorscheme iceberg";
         }
         vim-sleuth
-
       ];
       extraPackages = with pkgs; [
         nodePackages.prettier