From 53378cdfc9fc73f2ceb669e5b8bb8e4ea7f73ebe Mon Sep 17 00:00:00 2001
From: jasmine <its.jassy@pm.me>
Date: Thu, 8 Aug 2024 08:44:10 +0800
Subject: [PATCH] fix: remove nixvim hardcoded system

---
 flake.lock                                 | 62 +++++++++++-----------
 flake.nix                                  |  2 +-
 home-manager/sajenim/features/cli/nvim.nix |  4 +-
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/flake.lock b/flake.lock
index fd784c8..58b507c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -112,7 +112,7 @@
     "devshell_2": {
       "inputs": {
         "nixpkgs": [
-          "nixvim-config",
+          "nixvim",
           "nixvim",
           "nixpkgs"
         ]
@@ -198,7 +198,7 @@
     "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
-          "nixvim-config",
+          "nixvim",
           "nixvim",
           "nixpkgs"
         ]
@@ -291,18 +291,18 @@
     "git-hooks": {
       "inputs": {
         "flake-compat": [
-          "nixvim-config",
+          "nixvim",
           "nixvim",
           "flake-compat"
         ],
         "gitignore": "gitignore_2",
         "nixpkgs": [
-          "nixvim-config",
+          "nixvim",
           "nixvim",
           "nixpkgs"
         ],
         "nixpkgs-stable": [
-          "nixvim-config",
+          "nixvim",
           "nixvim",
           "nixpkgs"
         ]
@@ -346,7 +346,7 @@
     "gitignore_2": {
       "inputs": {
         "nixpkgs": [
-          "nixvim-config",
+          "nixvim",
           "nixvim",
           "git-hooks",
           "nixpkgs"
@@ -411,7 +411,7 @@
     "home-manager_3": {
       "inputs": {
         "nixpkgs": [
-          "nixvim-config",
+          "nixvim",
           "nixvim",
           "nixpkgs"
         ]
@@ -448,7 +448,7 @@
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
-          "nixvim-config",
+          "nixvim",
           "nixvim",
           "nixpkgs"
         ]
@@ -612,6 +612,26 @@
       }
     },
     "nixvim": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_4",
+        "nixvim": "nixvim_2"
+      },
+      "locked": {
+        "lastModified": 1723012155,
+        "narHash": "sha256-7AlUEGsbIOCQmIRc+lH/k2CJ32pdEkFszyMekTOVoJc=",
+        "ref": "refs/heads/master",
+        "rev": "e3dc3f07d69bcb0c9df5875aefd7dbf3877be794",
+        "revCount": 14,
+        "type": "git",
+        "url": "https://git.sajenim.dev/jasmine/nvim.nix.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.sajenim.dev/jasmine/nvim.nix.git"
+      }
+    },
+    "nixvim_2": {
       "inputs": {
         "devshell": "devshell_2",
         "flake-compat": "flake-compat_3",
@@ -637,31 +657,11 @@
         "type": "github"
       }
     },
-    "nixvim-config": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_4",
-        "nixvim": "nixvim"
-      },
-      "locked": {
-        "lastModified": 1723012155,
-        "narHash": "sha256-7AlUEGsbIOCQmIRc+lH/k2CJ32pdEkFszyMekTOVoJc=",
-        "ref": "refs/heads/master",
-        "rev": "e3dc3f07d69bcb0c9df5875aefd7dbf3877be794",
-        "revCount": 14,
-        "type": "git",
-        "url": "https://git.sajenim.dev/jasmine/nvim.nix.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.sajenim.dev/jasmine/nvim.nix.git"
-      }
-    },
     "nuschtosSearch": {
       "inputs": {
         "flake-utils": "flake-utils_4",
         "nixpkgs": [
-          "nixvim-config",
+          "nixvim",
           "nixvim",
           "nixpkgs"
         ]
@@ -718,7 +718,7 @@
         "nix-minecraft": "nix-minecraft",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable",
-        "nixvim-config": "nixvim-config"
+        "nixvim": "nixvim"
       }
     },
     "systems": {
@@ -814,7 +814,7 @@
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
-          "nixvim-config",
+          "nixvim",
           "nixvim",
           "nixpkgs"
         ]
diff --git a/flake.nix b/flake.nix
index 884b758..4e6e28c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
 
     # Add any other flake you might need.
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
-    nixvim-config.url = "git+https://git.sajenim.dev/jasmine/nvim.nix.git";
+    nixvim.url = "git+https://git.sajenim.dev/jasmine/nvim.nix.git";
   };
 
   outputs = { self, nixpkgs, home-manager, ... }@inputs:
diff --git a/home-manager/sajenim/features/cli/nvim.nix b/home-manager/sajenim/features/cli/nvim.nix
index 3161bff..6a9efa9 100644
--- a/home-manager/sajenim/features/cli/nvim.nix
+++ b/home-manager/sajenim/features/cli/nvim.nix
@@ -1,7 +1,7 @@
-{ inputs, ... }:
+{ inputs, pkgs, ... }:
 
 {
   # Install our nixvim configuration for neovim.
-  home.packages = [ inputs.nixvim-config.packages.x86_64-linux.default ];
+  home.packages = [ inputs.nixvim.packages.${pkgs.system}.default ];
 }