diff --git a/flake.lock b/flake.lock index 39a84d1..87e236f 100755 --- a/flake.lock +++ b/flake.lock @@ -492,22 +492,6 @@ "type": "github" } }, - "nvim": { - "flake": false, - "locked": { - "lastModified": 1702383418, - "narHash": "sha256-EYArlahHMWj4yVXTKldVZsbHjg0gxvXqgTxO5BvEfQ8=", - "owner": "Guanran928", - "repo": "nvim", - "rev": "655e863d2548cf9883e94e837f803ed2ae0d6aec", - "type": "github" - }, - "original": { - "owner": "Guanran928", - "repo": "nvim", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -565,7 +549,6 @@ "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "nvfetcher": "nvfetcher", - "nvim": "nvim", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index b94217f..87e2ad9 100755 --- a/flake.nix +++ b/flake.nix @@ -148,13 +148,6 @@ inputs.hyprland-protocols.follows = "hyprland-protocols"; inputs.systems.follows = "systems-linux"; }; - - ## Non-Flake - ### My NeoVim configuration - nvim = { - url = "github:Guanran928/nvim"; - flake = false; - }; }; outputs = inputs: let diff --git a/users/guanranwang/home-manager/applications/neovim/default.nix b/users/guanranwang/home-manager/applications/neovim/default.nix index 5f482f5..7520a1b 100644 --- a/users/guanranwang/home-manager/applications/neovim/default.nix +++ b/users/guanranwang/home-manager/applications/neovim/default.nix @@ -1,9 +1,14 @@ -{inputs, ...}: { +{pkgs, ...}: { programs.neovim = { enable = true; #defaultEditor = true; viAlias = true; vimAlias = true; }; - xdg.configFile."nvim".source = inputs.nvim; + xdg.configFile."nvim".source = pkgs.fetchFromGitHub { + owner = "Guanran928"; + repo = "nvim"; + rev = "655e863d2548cf9883e94e837f803ed2ae0d6aec"; + hash = "sha256-EYArlahHMWj4yVXTKldVZsbHjg0gxvXqgTxO5BvEfQ8="; + }; }