Feat(flake): Import the nixNeovim module

6 files changed, 209 insertions, 18 deletions

diff --git a/flake.lock b/flake.lock
index 719cbbf2..d7f9139d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -297,11 +297,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692260837,
-        "narHash": "sha256-2FpkX1zl+7ni7djK7NeE1ZGupRUwZgjW+RPCSBgDf4k=",
+        "lastModified": 1692448348,
+        "narHash": "sha256-/Wy9Bzw59A5OD82S9dWHshg+wiSzJNh95hPXNhO5K7E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6a94c1a59737783c282c4031555a289c28b961e4",
+        "rev": "bdb5bcad01ff7332fdcf4b128211e81905113f84",
         "type": "github"
       },
       "original": {
@@ -377,6 +377,100 @@
         "url": "https://codeberg.org/soispha/neovim-config.git"
       }
     },
+    "nix-flake-tests": {
+      "locked": {
+        "lastModified": 1677844186,
+        "narHash": "sha256-ErJZ/Gs1rxh561CJeWP5bohA2IcTq1rDneu1WT6CVII=",
+        "owner": "antifuchs",
+        "repo": "nix-flake-tests",
+        "rev": "bbd9216bd0f6495bb961a8eb8392b7ef55c67afb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "antifuchs",
+        "repo": "nix-flake-tests",
+        "type": "github"
+      }
+    },
+    "nix-github-actions": {
+      "inputs": {
+        "nixpkgs": [
+          "poetry2nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1688870561,
+        "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
+    "nixNeovim": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "home-manager": [
+          "home-manager"
+        ],
+        "nix-flake-tests": "nix-flake-tests",
+        "nixneovimplugins": [
+          "nixNeovimPlugins"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nmd": "nmd",
+        "nmt": "nmt"
+      },
+      "locked": {
+        "lastModified": 1692281989,
+        "narHash": "sha256-b1WPbUNVWahAHvMxWnp+0zzswUj8lReX/c28O2Au2Og=",
+        "owner": "NixNeovim",
+        "repo": "NixNeovim",
+        "rev": "929c6c4a188947801ac354e1c5d110937fca9449",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixNeovim",
+        "repo": "NixNeovim",
+        "type": "github"
+      }
+    },
+    "nixNeovimPlugins": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "poetry2nix": [
+          "poetry2nix"
+        ]
+      },
+      "locked": {
+        "lastModified": 1692290637,
+        "narHash": "sha256-uawy/RmvpdJbGNo6PMJiPVtmApmviU3XUdwEjJxyGEY=",
+        "owner": "nixNeovim",
+        "repo": "nixNeovimPlugins",
+        "rev": "6d711de39f60ff90971b638216f17cc4a2f82fcd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixNeovim",
+        "repo": "nixNeovimPlugins",
+        "type": "github"
+      }
+    },
     "nixlib": {
       "locked": {
         "lastModified": 1689469483,
@@ -415,11 +509,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1692174805,
-        "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=",
+        "lastModified": 1692356644,
+        "narHash": "sha256-AYkPFT+CbCVSBmh0WwIzPpwhEJ4Yy3A7JZvUkGJIg5o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e",
+        "rev": "8ecc900b2f695d74dea35a92f8a9f9b32c8ea33d",
         "type": "github"
       },
       "original": {
@@ -447,11 +541,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1692134936,
-        "narHash": "sha256-Z68O969cioC6I3k/AFBxsuEwpJwt4l9fzwuAMUhCCs0=",
+        "lastModified": 1692339729,
+        "narHash": "sha256-TUK76/Pqm9qIDjEGd27Lz9EiBIvn5F70JWDmEQ4Y5DQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bfd953b2c6de4f550f75461bcc5768b6f966be10",
+        "rev": "ae521bd4e460b076a455dca8b13f4151489a725c",
         "type": "github"
       },
       "original": {
@@ -461,6 +555,62 @@
         "type": "github"
       }
     },
+    "nmd": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1687627428,
+        "narHash": "sha256-7zGfXuNS5RHqhpEdz2fwrtqvF86JRo5U1hrxZSYgcm8=",
+        "owner": "~rycee",
+        "repo": "nmd",
+        "rev": "824a380546b5d0d0eb701ff8cd5dbafb360750ff",
+        "type": "sourcehut"
+      },
+      "original": {
+        "owner": "~rycee",
+        "repo": "nmd",
+        "type": "sourcehut"
+      }
+    },
+    "nmt": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1683843030,
+        "narHash": "sha256-2K9tFpypgSORyUTRAL7MFRKCXU4GykmhIDrrIydtPdI=",
+        "owner": "jooooscha",
+        "repo": "nmt",
+        "rev": "f30b96093eb056f1bcc60199545344b4e4a72c5a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jooooscha",
+        "repo": "nmt",
+        "type": "github"
+      }
+    },
+    "poetry2nix": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nix-github-actions": "nix-github-actions",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1692369730,
+        "narHash": "sha256-VcCb/XxybOv0Py1Gnhmih9mfwyCUVDds/gID2VcscAo=",
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "rev": "e4cd574cac251dd44bdbc77c1e98d790fe27b781",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": [
@@ -571,9 +721,12 @@
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
         "neovim_config": "neovim_config",
+        "nixNeovim": "nixNeovim",
+        "nixNeovimPlugins": "nixNeovimPlugins",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable_2",
+        "poetry2nix": "poetry2nix",
         "ragenix": "ragenix",
         "river_init_lesser": "river_init_lesser",
         "rust-overlay": "rust-overlay",
@@ -599,11 +752,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692238117,
-        "narHash": "sha256-gOoxig/GBuGOYWqE3+7OMrgPVduxjjsbo4qikRb1h3s=",
+        "lastModified": 1692410823,
+        "narHash": "sha256-YM1QCenpghNqgleUmoCJUArTuMEBqScyQuhepA6JZaI=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "3e0e4ec062706ebba759795ad18ad72ad69d41f3",
+        "rev": "598b2f04ed252eb5808b108d7a10084c0c548753",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index b81d2507..1cecae80 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,21 @@
     systems = {
       url = "github:nix-systems/x86_64-linux"; # only evaluate for this system
     };
+    poetry2nix = {
+      url = "github:nix-community/poetry2nix";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
+    };
+    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;
@@ -50,6 +65,15 @@
         nixpkgs.follows = "nixpkgs";
       };
     };
+    nixNeovim = {
+      url = "github:NixNeovim/NixNeovim";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+        home-manager.follows = "home-manager";
+        nixneovimplugins.follows = "nixNeovimPlugins";
+      };
+    };
     agenix = {
       url = "github:ryantm/agenix";
       inputs = {
@@ -225,6 +249,7 @@
     serverphone,
     disko,
     lanzaboote,
+    nixNeovim,
     # external dependencies
     neovim_config,
     user_js,
@@ -247,6 +272,7 @@
     pkgs = import nixpkgs (import ./system/nixpkgs {
       inherit (nixpkgs) lib;
       inherit system;
+      overlays = [nixNeovim.overlays.default];
     });
     # FIXME this `nixpkgs` misses the configs applied to the other one
     nixpkgs_as_input = nixpkgs;
@@ -261,6 +287,7 @@
         # modules
         
         home-manager
+        nixNeovim
         nixos-generators
         impermanence
         agenix
diff --git a/flake/default.nix b/flake/default.nix
index aed36d6a..a4b20dca 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -7,6 +7,7 @@
   nixpkgs_as_input,
   # modules
   home-manager,
+  nixNeovim,
   nixos-generators,
   impermanence,
   agenix,
@@ -55,6 +56,7 @@
       # modules
       
       impermanence
+      nixNeovim
       ;
   };
   defaultModules = [
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 0d1958f2..d34a4961 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -18,6 +18,7 @@
   snap-sync,
   # modules
   impermanence,
+  nixNeovim,
   ...
 }: {
   home-manager = {
@@ -49,6 +50,7 @@
         # modules
         
         impermanence
+        nixNeovim
         ;
     };
   };
diff --git a/home-manager/soispha/default.nix b/home-manager/soispha/default.nix
index 10043080..252c8f0b 100644
--- a/home-manager/soispha/default.nix
+++ b/home-manager/soispha/default.nix
@@ -1,4 +1,8 @@
-{impermanence, ...}: let
+{
+  impermanence,
+  nixNeovim,
+  ...
+}: let
   # TODO actually use this in the user config
   username = "soispha";
   homeDirectory = "/home/${username}";
@@ -12,12 +16,14 @@
   # TODO add XDG_RUNTIME_DIR
 in {
   imports = [
-    impermanence.nixosModules.home-manager.impermanence
+    ./config
+    ./files
     ./impermanence
     ./packages
-    ./config
     ./wms
-    ./files
+
+    impermanence.nixosModules.home-manager.impermanence
+    nixNeovim.nixosModules.default
   ];
 
   # I don't know what this does, but I've seen it a lot online, so it should be good, right?
diff --git a/system/nixpkgs/default.nix b/system/nixpkgs/default.nix
index 1e371e53..4f869e4a 100644
--- a/system/nixpkgs/default.nix
+++ b/system/nixpkgs/default.nix
@@ -1,9 +1,10 @@
 {
   lib,
   system,
-  ...
+  overlays ? [],
 }: {
-  inherit system;
+  # TODO inheriting system here is discouraged, localSystem or hostSystem should be inspected
+  inherit system overlays;
   config = {
     # TODO this fails because of the root tempsize, which should be increased
     #contentAddressedByDefault = true;