From 54336cf9d4bfbd0dfb7f34479b5c94d5a47260e9 Mon Sep 17 00:00:00 2001
From: fleaz <mail@felixbreidenstein.de>
Date: Wed, 15 May 2024 15:43:06 +0200
Subject: [PATCH] Added netrw~nvim and salt-lint

---
 default.nix            |  5 ++++-
 netrw-nvim/default.nix | 12 ++++++++++++
 salt-lint/default.nix  | 12 ++++++------
 test.nix               | 10 ++++------
 4 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 netrw-nvim/default.nix

diff --git a/default.nix b/default.nix
index dbb40ab..ff68bf4 100644
--- a/default.nix
+++ b/default.nix
@@ -6,7 +6,6 @@ self: super: {
     packageOverrides = python-self: python-super: {
       pytapo = python-self.callPackage ./pytapo { };
       brother-ql = python-self.callPackage ./brother-ql { };
-      salt-lint = python-self.callPackage ./salt-lint { };
     };
   };
 
@@ -19,4 +18,8 @@ self: super: {
   #mealie = self.callPackage ./mealie { };
   gohome = self.callPackage ./gohome { };
   matrix-alertmanager-receiver = self.callPackage ./matrix-alertmanager-receiver { };
+  vimPlugins = super.vimPlugins.extend ( self': super': {
+    netrw-nvim = super.callPackage ./netrw-nvim { };
+  });
+  salt-lint = super.callPackage ./salt-lint { };
 }
diff --git a/netrw-nvim/default.nix b/netrw-nvim/default.nix
new file mode 100644
index 0000000..3217929
--- /dev/null
+++ b/netrw-nvim/default.nix
@@ -0,0 +1,12 @@
+{ pkgs
+, ...
+}:
+pkgs.vimUtils.buildVimPlugin {
+  name = "netrw-nvim";
+  src = pkgs.fetchFromGitHub {
+    owner = "prichrd";
+    repo = "netrw.nvim";
+    rev = "master";
+    sha256 = "sha256-A4u1JttkLANO2xNf8T9/OAiPjSYgiEkTfvCRc0Sl4Nk=";
+  };
+}
diff --git a/salt-lint/default.nix b/salt-lint/default.nix
index fc5df4f..69856ce 100644
--- a/salt-lint/default.nix
+++ b/salt-lint/default.nix
@@ -1,9 +1,8 @@
-{ buildPythonPackage
+{ python3Packages
 , fetchFromGitHub
-, setuptools
 , lib
 }:
-buildPythonPackage rec {
+python3Packages.buildPythonPackage rec {
   pname = "salt-lint";
   version = "0.9.2";
   pyproject = true;
@@ -16,11 +15,12 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [
-    setuptools
+    python3Packages.setuptools
   ];
 
-  pythonImportsCheck = [
-    "saltlint"
+  propagatedBuildInputs = with python3Packages; [
+    pathspec
+    pyyaml
   ];
 
   meta = with lib; {
diff --git a/test.nix b/test.nix
index 965b63c..3bcd101 100644
--- a/test.nix
+++ b/test.nix
@@ -1,11 +1,9 @@
 { pkgs ? import <nixpkgs> { overlays = [ (import ./default.nix) ]; } }:
-let
-  mypython = pkgs.python3.withPackages (python-pkgs: [
-    python-pkgs.salt-lint
-  ]);
-in 
+  # mypython = pkgs.python3.withPackages (python-pkgs: [
+  #   python-pkgs.salt-lint
+  # ]);
 pkgs.mkShell {
   buildInputs = with pkgs; [
-    mypython
+    salt-lint
   ];
 }