diff --git a/flake.nix b/flake.nix
index ce5c287..a1e32c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "My highly sofisticated and complicated flake";
+  description = "My highly sophisticated and complicated flake";
 
   inputs = {
     install-script = {
@@ -60,6 +60,8 @@
       url = "github:ghostty-org/ghostty";
     };
 
+    nvf.url = "github:notashelf/nvf";
+
     # Nix on Droid Configuration
     nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-24.05";
 
@@ -162,5 +164,13 @@
         };
       };
     };
+    packages."x86_64-linux".default =
+      (inputs.nvf.lib.neovimConfiguration {
+        pkgs = nixpkgs.legacyPackages."x86_64-linux";
+        modules = [
+          ./nixos/system/packages/nvf.nix
+        ];
+      })
+      .neovim;
   };
 }
diff --git a/nixos/home/apps/cli_tools.nix b/nixos/home/apps/cli_tools.nix
index 21f645b..a175ae0 100644
--- a/nixos/home/apps/cli_tools.nix
+++ b/nixos/home/apps/cli_tools.nix
@@ -30,7 +30,7 @@
       ++ (
         if pkgs.system == "x86_64-linux"
         then [
-          nvtopPackages.full
+          #nvtopPackages.full
           toybox
         ]
         else []
diff --git a/nixos/system/packages/nvf.nix b/nixos/system/packages/nvf.nix
new file mode 100644
index 0000000..9795194
--- /dev/null
+++ b/nixos/system/packages/nvf.nix
@@ -0,0 +1,31 @@
+{...}: {
+  vim = {
+    viAlias = true;
+    vimAlias = true;
+
+    theme = {
+      enable = true;
+      name = "catppuccin"; # catppuccin, tokyo-night, one-dark
+      style = "mocha";
+    };
+
+    languages = {
+      enableLSP = true;
+      enableTreesitter = true;
+
+      nix.enable = true;
+      rust.enable = true;
+      python.enable = true;
+      lua.enable = true;
+      csharp.enable = true;
+      go.enable = true;
+      markdown.enable = true;
+      clang.enable = true;
+      html.enable = true;
+    };
+
+    statusline.lualine.enable = true;
+    telescope.enable = true;
+    autocomplete.nvim-cmp.enable = true;
+  };
+}
diff --git a/nixos/system/settings/default-applications.nix b/nixos/system/settings/default-applications.nix
index 7fd53c1..6879b07 100644
--- a/nixos/system/settings/default-applications.nix
+++ b/nixos/system/settings/default-applications.nix
@@ -41,11 +41,14 @@
       "x-scheme-handler/https" = "${config.xdg.da.browser}.desktop";
       "x-scheme-handler/about" = "${config.xdg.da.browser}.desktop";
       "x-scheme-handler/unknown" = "${config.xdg.da.browser}.desktop";
+
       "text/plain" = "${userSettings.editor}.desktop";
       "application/pdf" = "org.gnome.Evince.desktop";
-      "image/svg+xml" = "org.gnome.Loupe.desktop";
+      "image/svg+xml" = "inkscape.desktop";
       "image/jpeg" = "org.gnome.Loupe.desktop";
       "image/png" = "org.gnome.Loupe.desktop";
+      "inode/directory" = "org.gnome.Nautilus.desktop";
+      "video/mp4" = "mpv.desktop";
     };
 
     programs.zsh.enable =