diff --git a/flake.lock b/flake.lock
index 72c6751..49ffa67 100644
--- a/flake.lock
+++ b/flake.lock
@@ -751,7 +751,8 @@
         "nixos-hardware": "nixos-hardware",
         "nixos-shell": "nixos-shell",
         "nixos-vscode-server": "nixos-vscode-server",
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_8",
+        "vim-eldar": "vim-eldar"
       }
     },
     "rotate-text": {
@@ -769,6 +770,22 @@
         "repo": "rotate-text.el",
         "type": "github"
       }
+    },
+    "vim-eldar": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1579240147,
+        "narHash": "sha256-O4TaWcrlhjqGIvAf6QvzUgE3ExcbTELR9JKc9waarMQ=",
+        "owner": "agude",
+        "repo": "vim-eldar",
+        "rev": "6c7117688e654abe89246a9baa42ab2ee8dd1304",
+        "type": "github"
+      },
+      "original": {
+        "owner": "agude",
+        "repo": "vim-eldar",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 7980c35..fe6f1e6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,12 +14,15 @@
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nixos-vscode-server.url = "github:iosmanthus/nixos-vscode-server/add-flake";
-    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
-    neovim-nightly-overlay.inputs.neovim-flake.url = "github:neovim/neovim/v0.7.0?dir=contrib";
     emacs-overlay.url = "github:nix-community/emacs-overlay";
     nix-doom-emacs.url = "github:nix-community/nix-doom-emacs";
     hercules-ci-agent.url = "github:hercules-ci/hercules-ci-agent/master";
     nixos-shell.url = "github:Mic92/nixos-shell";
+
+    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
+    neovim-nightly-overlay.inputs.neovim-flake.url = "github:neovim/neovim/v0.7.0?dir=contrib";
+    vim-eldar.url = "github:agude/vim-eldar";
+    vim-eldar.flake = false;
   };
 
   outputs = inputs@{ self, home-manager, nixpkgs, darwin, ... }:
diff --git a/home/neovim.nix b/home/neovim.nix
index 018932f..aa0f32f 100644
--- a/home/neovim.nix
+++ b/home/neovim.nix
@@ -40,6 +40,10 @@
       # Preferred theme
       tokyonight-nvim
       sonokai
+      (pkgs.vimUtils.buildVimPlugin {
+        name = "eldar";
+        src = inputs.vim-eldar;
+      })
 
       # Doom-emacs like experience
       {