From e796aae01fb71ef75e532da14c8349aeb82ab215 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Sat, 3 Feb 2024 21:29:36 +0800
Subject: [PATCH] flake-parts/setups: fix NixVim importing for home-manager and
 NixOS setups

---
 modules/flake-parts/setups/home-manager.nix | 6 +++++-
 modules/flake-parts/setups/nixos.nix        | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/flake-parts/setups/home-manager.nix b/modules/flake-parts/setups/home-manager.nix
index d74ebcf0..93da8d2b 100644
--- a/modules/flake-parts/setups/home-manager.nix
+++ b/modules/flake-parts/setups/home-manager.nix
@@ -150,7 +150,11 @@ let
 
         (lib.mkIf (config.nixvim.instance != null)
           ({ lib, ... }: {
-            programs.nixvim = {
+            imports = [
+              inputs.nixvim.homeManagerModules.nixvim
+            ];
+
+            config.programs.nixvim = { ... }: {
               enable = true;
               imports =
                 partsConfig.setups.nixvim.configs.${config.nixvim.instance}.modules
diff --git a/modules/flake-parts/setups/nixos.nix b/modules/flake-parts/setups/nixos.nix
index 2aa81c7a..5a6f21e4 100644
--- a/modules/flake-parts/setups/nixos.nix
+++ b/modules/flake-parts/setups/nixos.nix
@@ -401,7 +401,7 @@ let
           { config, lib, ... }: {
             imports = [ inputs.nixvim.nixosModules.nixvim ];
 
-            programs.nixvim = {
+            programs.nixvim = { ... }: {
               enable = true;
               imports =
                 partsConfig.setups.nixvim.${config.nixvim.instance}.modules