diff --git a/modules/home-manager/programs/neovim/default.nix b/modules/home-manager/programs/neovim/default.nix
index 224c365..c3488e3 100644
--- a/modules/home-manager/programs/neovim/default.nix
+++ b/modules/home-manager/programs/neovim/default.nix
@@ -8,7 +8,12 @@
 let
   inherit (lib) types mkOption;
   ollamaPackage =
-    if config.programs.neovim.ollama.type == "amd" then pkgs.ollama-rocm else pkgs.ollama-cuda;
+    if config.programs.neovim.ollama.type == "amd" then
+      pkgs.ollama-rocm
+    else if config.programs.neovim.ollama.type == "nvidia" then
+      pkgs.ollama-cuda
+    else
+      pkgs.ollama;
 in
 {
   options.programs.neovim = {
@@ -41,7 +46,6 @@ in
 
   config = {
     programs.neovim = {
-      enable = true;
       withNodeJs = true;
       withPython3 = true;
 
diff --git a/specific/desktop/home-manager.nix b/specific/desktop/home-manager.nix
index 18201c4..3cd7a67 100644
--- a/specific/desktop/home-manager.nix
+++ b/specific/desktop/home-manager.nix
@@ -117,6 +117,10 @@
   # MODULES #
   #
 
+  programs.neovim = {
+    enable = true;
+  };
+
   modules.hyprland = {
     # Enable scripts
     scripts = {
diff --git a/specific/laptop/home-manager.nix b/specific/laptop/home-manager.nix
index dd25a51..ae2073f 100644
--- a/specific/laptop/home-manager.nix
+++ b/specific/laptop/home-manager.nix
@@ -106,8 +106,13 @@
   # MODULES #
   #
 
-  # Set the hostname for nixd in neovim
-  programs.neovim.nixd.hostname = "wizlap";
+  # Enable neovim
+  programs.neovim = {
+    enable = true;
+
+    # Set the hostname for nixd in neovim
+    nixd.hostname = "wizlap";
+  };
 
   # Add monitor configuration to hyprland
   modules.hyprland = {