Using nixvim flake

3 files changed, 88 insertions, 12 deletions

diff --git a/flake.lock b/flake.lock
index 9a777c5..a9e6453 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,6 +18,27 @@
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1765495779,
+        "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -41,11 +62,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765606130,
-        "narHash": "sha256-KOP4QnkiRwiD5KEOr6ceF67rfTP1OqPmCCft6xDC3k4=",
+        "lastModified": 1765682243,
+        "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d787ec69c3216ea33be1c0424fe65cb23aa8fb31",
+        "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
         "type": "github"
       },
       "original": {
@@ -71,11 +92,63 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1765425892,
+        "narHash": "sha256-jlQpSkg2sK6IJVzTQBDyRxQZgKADC2HKMRfGCSgNMHo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5d6bdbddb4695a62f0d00a3620b37a15275a5093",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixvim": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_2",
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1765646394,
+        "narHash": "sha256-yqeB023/s/SOxhpm4SFKBDHagzn5L/KF7bCA10ZH/Q4=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "c97e8e34250c7fe5d4e0c3333a0ca4a9d28957d0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "base16": "base16",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nixvim": "nixvim"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 1261eb8..5e335e0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,9 +8,10 @@
 			inputs.nixpkgs.follows = "nixpkgs";
 		};
 		base16.url = "github:SenchoPens/base16.nix";
+		nixvim.url = "github:nix-community/nixvim";
 	};
 
-	outputs = { nixpkgs, home-manager, base16, ... }@inputs: {
+	outputs = { nixpkgs, home-manager, base16, nixvim, ... }: {
 		homeConfigurations = {
 			arpit = let
 				system = "x86_64-linux";
@@ -24,7 +25,9 @@
 					{
 						scheme = ./assets/onedark-dark.yml;
 					}
+					nixvim.homeModules.nixvim
 				];
+				minimal = true;
 			};
 		};
 	};
diff --git a/modules/tools/nixvim/default.nix b/modules/tools/nixvim/default.nix
index bca3451..56c55e6 100644
--- a/modules/tools/nixvim/default.nix
+++ b/modules/tools/nixvim/default.nix
@@ -1,12 +1,7 @@
-{ pkgs, config, lib, ... }:
+{ config, lib, ... }:
 
-let
-	nixvim = import (builtins.fetchGit {
-		url = "https://github.com/nix-community/nixvim";
-	});
-in {
+{
 	imports = [
-		nixvim.homeModules.nixvim
 		./colorscheme.nix
 		./keymaps.nix
 		./plugins
@@ -20,6 +15,7 @@ in {
 	{
 		programs.nixvim = {
 			enable = true;
+			defaultEditor = true;
 			opts = {
 				number = true;
 				relativenumber = true;
@@ -69,5 +65,9 @@ in {
 				combinePlugins.enable = true;
 			};
 		};
+
+		home.sessionVariables = {
+			EDITOR = "nvim";
+		};
 	};
 }