feat(treewide): Specify nvim plugins in my flake

3 files changed, 8 insertions, 82 deletions

diff --git a/flake.lock b/flake.lock
index e0f06e94..c8fe392d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -332,11 +332,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702110948,
-        "narHash": "sha256-GzK0k5kFgZLbeaOPPoFS4C2BP8vZ0fAH36UtbFRnrWs=",
+        "lastModified": 1702124454,
+        "narHash": "sha256-+lwBEFPxQ8VM3ht6qEcR92A/M9GF6mDtAwKgPI3YgXQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "efa36e896951bec8d96e38ea40a22c010bd1bd8f",
+        "rev": "fa91c109b0dd12e680dd29010e262884f7b26186",
         "type": "github"
       },
       "original": {
@@ -427,22 +427,6 @@
         "url": "https://codeberg.org/soispha/lf-rename.git"
       }
     },
-    "neovim_config": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1684612007,
-        "narHash": "sha256-V7pnVTC3cDoyXkQM3/6KL9T9uzKIVoS0HZPzM92XT9k=",
-        "ref": "refs/heads/prime",
-        "rev": "0ebe3665717941ce87ade67fba4edad98c38c9a0",
-        "revCount": 11,
-        "type": "git",
-        "url": "https://codeberg.org/soispha/neovim-config.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://codeberg.org/soispha/neovim-config.git"
-      }
-    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -464,32 +448,6 @@
         "type": "github"
       }
     },
-    "nixNeovimPlugins": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "poetry2nix": [
-          "poetry2nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1701958806,
-        "narHash": "sha256-U6K2t6Rck/4PTbtrAKUhYnIxG3K3t6pe2IRmygV5Rpk=",
-        "owner": "nixNeovim",
-        "repo": "nixNeovimPlugins",
-        "rev": "5010b91eb03696574c3c293f072a090618227e87",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixNeovim",
-        "repo": "nixNeovimPlugins",
-        "type": "github"
-      }
-    },
     "nixVim": {
       "inputs": {
         "flake-utils": [
@@ -503,11 +461,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702118070,
-        "narHash": "sha256-R8aDOiCkjImFycO/VVmyIZBGBEPyPBYPGUc1t0nRNSg=",
+        "lastModified": 1702132935,
+        "narHash": "sha256-QVR1dpU2r4TV7G5baYJlf6zgGsqOpWyNQZgoS4wnpmA=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "dc14748fe759cbf554330bd1379aad21b8fa05da",
+        "rev": "1f652b60e52b35cc011b69163c65aa0d6e73d47e",
         "type": "github"
       },
       "original": {
@@ -726,8 +684,6 @@
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
         "lf_rename": "lf_rename",
-        "neovim_config": "neovim_config",
-        "nixNeovimPlugins": "nixNeovimPlugins",
         "nixVim": "nixVim",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
diff --git a/flake.nix b/flake.nix
index 9f39d330..ed5470f7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,14 +48,6 @@
         gitignore.follows = "gitignore";
       };
     };
-    nixNeovimPlugins = {
-      url = "github:nixNeovim/nixNeovimPlugins";
-      inputs = {
-        flake-utils.follows = "flake-utils";
-        nixpkgs.follows = "nixpkgs";
-        poetry2nix.follows = "poetry2nix";
-      };
-    };
     flake-compat = {
       url = "github:edolstra/flake-compat";
       flake = false;
@@ -93,23 +85,12 @@
         nixpkgs.follows = "nixpkgs";
       };
     };
-    nixNeovim = {
-      url = "github:nixNeovim/nixNeovim";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        haumea.follows = "haumea";
-        flake-utils.follows = "flake-utils";
-        home-manager.follows = "home-manager";
-        nixneovimplugins.follows = "nixNeovimPlugins";
-      };
-    };
     nixVim = {
       url = "github:nix-community/nixvim";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
         pre-commit-hooks.follows = "pre-commit-hooks";
-        beautysh.follows = "beautysh";
       };
     };
     agenix = {
@@ -162,10 +143,6 @@
     };
 
     # my configs
-    neovim_config = {
-      url = "git+https://codeberg.org/soispha/neovim-config.git";
-      flake = false;
-    };
     templates = {
       url = "git+https://codeberg.org/soispha/flake-templates.git";
       inputs = {
@@ -295,10 +272,8 @@
     serverphone,
     disko,
     lanzaboote,
-    nixNeovim,
     nixVim,
     # external dependencies
-    neovim_config,
     user_js,
     templates,
     # my binaries
@@ -319,7 +294,7 @@
     pkgs = import nixpkgs (import ./sys/nixpkgs {
       inherit (nixpkgs) lib;
       inherit system sysLib;
-      overlays = [nixNeovim.overlays.default];
+      overlays = [];
     });
     # FIXME: this `nixpkgs` misses the configs applied to the other one
     nixpkgs_as_input = nixpkgs;
@@ -334,7 +309,6 @@
         # modules
         
         home-manager
-        nixNeovim
         nixVim
         nixos-generators
         impermanence
@@ -345,7 +319,6 @@
         lanzaboote
         # external dependencies
         
-        neovim_config
         user_js
         templates
         # my binaries
diff --git a/flake/default.nix b/flake/default.nix
index 9ee92021..8a751e15 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -7,7 +7,6 @@
   nixpkgs_as_input,
   # modules
   home-manager,
-  nixNeovim,
   nixVim,
   nixos-generators,
   impermanence,
@@ -17,7 +16,6 @@
   disko,
   lanzaboote,
   # external dependencies
-  neovim_config,
   user_js,
   templates,
   # my binaries
@@ -53,11 +51,9 @@
       # external deps
       
       user_js
-      neovim_config
       # modules
       
       impermanence
-      nixNeovim
       nixVim
       ;
   };
@@ -138,6 +134,7 @@ in {
 
         # update
         generate_firefox_extensions.packages."${system}".default # needed for the firefox extension update script
+        update-vim-plugins
       ];
     };
   };