modules/nvim/plgs/lf-nvim: Switch to the upstream lf.nvim package

3 files changed, 3 insertions, 30 deletions

diff --git a/flake.lock b/flake.lock
index 19584aa4..6b1f16fb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -524,22 +524,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-lf": {
-      "locked": {
-        "lastModified": 1743256538,
-        "narHash": "sha256-fG19N9PvPtsV3UUwT7lauNJ7tE4ZB/EPKwwENrqqKCQ=",
-        "owner": "bpeetz",
-        "repo": "nixpkgs",
-        "rev": "e315c0e09beaf4daf4041d402067cbdbc84870d9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "bpeetz",
-        "ref": "init-lf.nvim",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-lib": {
       "locked": {
         "lastModified": 1743901752,
@@ -737,7 +721,6 @@
         "nixVim": "nixVim",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-lf": "nixpkgs-lf",
         "nixpkgs-lib": "nixpkgs-lib",
         "nixpkgs-stable": "nixpkgs-stable",
         "nuschtosSearch": "nuschtosSearch",
diff --git a/flake.nix b/flake.nix
index 8d8ce03a..0fa1c1e0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,8 +10,6 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     # open nixpkgs prs
-    # FIXME: Close these PRs <2024-09-07>
-    nixpkgs-lf.url = "github:bpeetz/nixpkgs/init-lf.nvim";
 
     library = {
       url = "git+https://git.foss-syndicate.org/vhack.eu/nix-library?ref=prime";
@@ -257,7 +255,6 @@
     self,
     nixpkgs,
     nixpkgs-stable,
-    nixpkgs-lf,
     library,
     # modules
     home-manager,
@@ -294,9 +291,6 @@
 
     nixpkgs_as_input = nixpkgs;
     nixpkgs_open_prs = {
-      inherit
-        nixpkgs-lf
-        ;
     };
 
     outputs = import ./flake {
diff --git a/modules/by-name/nv/nvim/plgs/lf-nvim/default.nix b/modules/by-name/nv/nvim/plgs/lf-nvim/default.nix
index 1e7c91e3..6c363ee1 100644
--- a/modules/by-name/nv/nvim/plgs/lf-nvim/default.nix
+++ b/modules/by-name/nv/nvim/plgs/lf-nvim/default.nix
@@ -2,22 +2,18 @@
   pkgs,
   lib,
   config,
-  nixpkgs_open_prs,
-  system,
   ...
 }: let
   cfg = config.soispha.programs.nvim;
 in {
+  # TODO: package lf-nvim though a module
+  # TODO: change the nvim path, when I change the path with lf
   home-manager.users.soispha.programs.nixvim = lib.mkIf cfg.enable {
-    # TODO: package lf-nvim though a module
-    # FIXME: change the nvim path, when I change the path with lf
     extraConfigLuaPost = ''
       ${lib.strings.fileContents ./lua/lf-nvim.lua}
     '';
     extraPlugins = [
-      nixpkgs_open_prs.nixpkgs-lf.legacyPackages."${system}".vimPlugins.lf-nvim
-
-      pkgs.vimPlugins.toggleterm-nvim # required by lf-nvim
+      pkgs.vimPlugins.lf-nvim
     ];
   };
 }