From 1eea96f31b0643684a6fb4926595390b7a8b95cb Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Sun, 24 Mar 2024 07:36:02 +0300 Subject: [PATCH] Nvim : Fix nixos build. --- module/Desktop.nix | 2 +- module/NixOnDroid.nix | 2 +- module/common/Nvim.nix | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/module/Desktop.nix b/module/Desktop.nix index 52355ce3..b044a546 100644 --- a/module/Desktop.nix +++ b/module/Desktop.nix @@ -20,7 +20,7 @@ bottles dxvk gamescope mangohud vkd3d wine64 calibre gimp - godot gdtoolkit + godot_4 gdtoolkit gradience jellyfin-media-player mpv diff --git a/module/NixOnDroid.nix b/module/NixOnDroid.nix index 805be510..ea98dc42 100644 --- a/module/NixOnDroid.nix +++ b/module/NixOnDroid.nix @@ -36,7 +36,7 @@ in { enable = true; viAlias = true; vimAlias = true; - extraConfig = (import ./common/Nvim.nix { inputs = inputs; }).customRc; + # extraConfig = (import ./common/Nvim.nix { inputs = inputs; }).customRc; }; }; diff --git a/module/common/Nvim.nix b/module/common/Nvim.nix index 5fc3e34d..58a8aa60 100644 --- a/module/common/Nvim.nix +++ b/module/common/Nvim.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: let +{ inputs, lib, ... }: let nvimRc = { cfgPath, runtimes, cfgs }: let runtimeRc = builtins.foldl' (acc: r: acc + "set runtimepath+=${r}\n" @@ -81,8 +81,6 @@ ]; }; in { - inherit customRc; - environment = { variables = { EDITOR = "nvim";