From 0e2a86abb6ed76c330ae41ed4da6a52517694f70 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Wed, 27 Nov 2024 18:18:23 +0000
Subject: [PATCH] Fix Neovim imports in WSL
---
nix/lib/shared/home-manager.nix | 1 +
nix/modules/home-manager/default.nix | 19 +++++++++++++++++--
.../home-manager/features/cli/default.nix | 19 ++++++++++---------
3 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/nix/lib/shared/home-manager.nix b/nix/lib/shared/home-manager.nix
index e4ed054f..0cae3665 100644
--- a/nix/lib/shared/home-manager.nix
+++ b/nix/lib/shared/home-manager.nix
@@ -48,6 +48,7 @@
config
inputs
lib
+ self
pkgs
;
})
diff --git a/nix/modules/home-manager/default.nix b/nix/modules/home-manager/default.nix
index 9f44b44b..f6fe1b8a 100644
--- a/nix/modules/home-manager/default.nix
+++ b/nix/modules/home-manager/default.nix
@@ -1,8 +1,23 @@
-{ ... }:
+{
+ config,
+ inputs,
+ lib,
+ self,
+ pkgs,
+ ...
+}:
{
imports = [
- ./features/cli
+ (import ./features/cli {
+ inherit
+ config
+ inputs
+ lib
+ self
+ pkgs
+ ;
+ })
./features/desktop
];
}
diff --git a/nix/modules/home-manager/features/cli/default.nix b/nix/modules/home-manager/features/cli/default.nix
index 75604cf0..cd1c7e0f 100644
--- a/nix/modules/home-manager/features/cli/default.nix
+++ b/nix/modules/home-manager/features/cli/default.nix
@@ -3,19 +3,21 @@
inputs,
lib,
pkgs,
+ self,
...
}:
{
imports = [
- # (import ./neovim.nix {
- # inherit
- # config
- # inputs
- # lib
- # pkgs
- # ;
- # })
+ (import ./neovim.nix {
+ inherit
+ config
+ inputs
+ lib
+ pkgs
+ self
+ ;
+ })
./bat.nix
./bin.nix
@@ -25,7 +27,6 @@
./git.nix
./htop.nix
./lsd.nix
- ./neovim.nix
./pet.nix
./phpactor.nix
./ripgrep.nix