diff --git a/flake.nix b/flake.nix
index c492a1b..246d262 100755
--- a/flake.nix
+++ b/flake.nix
@@ -32,6 +32,11 @@
     };
     # Kakoune Plugins End
 
+    nixvim = {
+      url = "github:pta2002/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     xorg-git = {
       url = "gitlab:xorg/xserver?host=gitlab.freedesktop.org";
       flake = false;
diff --git a/system/configuration.nix b/system/configuration.nix
index 6fc55ea..46e2a97 100755
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -111,6 +111,14 @@
   security.audit.enable = false;
   security.auditd.enable = false;
 
+  security.pam.loginLimits = [{
+    domain = "*";
+    type = "soft";
+    item = "nofile";
+    value = "262144";
+  }];
+
+
   services.pipewire = {
     enable = true;
     alsa.enable = true;
diff --git a/user/configs/beets/beets.nix b/user/configs/beets/default.nix
similarity index 100%
rename from user/configs/beets/beets.nix
rename to user/configs/beets/default.nix
diff --git a/user/configs/cava/cava.nix b/user/configs/cava/default.nix
similarity index 100%
rename from user/configs/cava/cava.nix
rename to user/configs/cava/default.nix
diff --git a/user/configs/firefox/firefox.nix b/user/configs/firefox/default.nix
similarity index 100%
rename from user/configs/firefox/firefox.nix
rename to user/configs/firefox/default.nix
diff --git a/user/configs/fish/fish.nix b/user/configs/fish/default.nix
similarity index 95%
rename from user/configs/fish/fish.nix
rename to user/configs/fish/default.nix
index 2fc17e2..e20c21c 100755
--- a/user/configs/fish/fish.nix
+++ b/user/configs/fish/default.nix
@@ -42,7 +42,7 @@
 
       ec = ''
         pushd &> /dev/null
-        cd "${config.home.homeDirectory}"
+        cd "${config.home.homeDirectory}/.dotfiles"
         set "filename" (${pkgs.fd}/bin/fd -t f . ~/.dotfiles | \
                     ${pkgs.fzf}/bin/fzf -q "$argv[1]" \
                     --preview "${pkgs.python3Packages.pygments}/bin/pygmentize -g -O linenos=1 {}")
@@ -69,6 +69,7 @@
     };
     shellAliases = {
       nf = "${pkgs.pfetch}/bin/pfetch";
+      e = "${pkgs.neovim}/bin/nvim";
     };
   };
 }
diff --git a/user/configs/kakoune/kakoune.nix b/user/configs/kakoune/default.nix
similarity index 98%
rename from user/configs/kakoune/kakoune.nix
rename to user/configs/kakoune/default.nix
index 7d27282..e828af4 100755
--- a/user/configs/kakoune/kakoune.nix
+++ b/user/configs/kakoune/default.nix
@@ -13,7 +13,7 @@ let
 in
 {
   programs.kakoune = {
-    enable = true;
+    enable = false;
     plugins = with pkgs.kakounePlugins; [
       kak-lsp
       kakboard
diff --git a/user/configs/mpd/mpd.nix b/user/configs/mpd/default.nix
similarity index 100%
rename from user/configs/mpd/mpd.nix
rename to user/configs/mpd/default.nix
diff --git a/user/configs/mpv/mpv.nix b/user/configs/mpv/default.nix
similarity index 100%
rename from user/configs/mpv/mpv.nix
rename to user/configs/mpv/default.nix
diff --git a/user/configs/neovim/default.nix b/user/configs/neovim/default.nix
new file mode 100644
index 0000000..cefe0aa
--- /dev/null
+++ b/user/configs/neovim/default.nix
@@ -0,0 +1,60 @@
+{ config, pkgs, lib, inputs, ... }:
+{
+  imports = [
+    inputs.nixvim.homeManagerModules.nixvim
+  ];
+
+  programs.nixvim = {
+    enable = true;
+
+    globals = { };
+
+    colorschemes.gruvbox = {
+      enable = true;
+      transparentBg = true;
+    };
+
+    autoCmd = [
+    {
+      event = [ "VimEnter" ];
+      pattern = [ "*" ];
+      command = "hi! Normal ctermbg=NONE guibg=NONE";
+    }
+    ];
+
+    options = {
+      number = true;
+      ignorecase = true;
+      smartcase = true;
+      tabstop = 2;
+      shiftwidth = 2;
+      expandtab = true;
+      autoindent = true;
+    };
+
+    plugins = {
+      intellitab.enable = true;
+      airline = {
+        enable = true;
+        powerline = true;
+        theme = "base16_gruvbox_dark_medium";
+      };
+      fugitive.enable = true;
+      lsp.enable = true;
+      nvim-autopairs.enable = true;
+      nvim-colorizer.enable = true;
+      nvim-lightbulb.enable = true;
+      neo-tree.enable = true;
+      treesitter.enable = true;
+    };
+
+    maps = {
+      normal."<C-n>" = {
+        silent = true;
+        action = "<cmd>NeoTreeFocusToggle<CR>";
+      };
+    };
+
+  };
+}
+
diff --git a/user/home.nix b/user/home.nix
index 291fc6c..84b09d2 100755
--- a/user/home.nix
+++ b/user/home.nix
@@ -2,15 +2,16 @@
 {
   imports = [
     nix-colors.homeManagerModule
-    ./configs/beets/beets.nix
-    ./configs/cava/cava.nix
-    ./configs/kakoune/kakoune.nix
+    ./configs/beets
+    ./configs/cava
+    ./configs/kakoune
     ./configs/wayland/hyprland.nix
     #./configs/wayland/sway.nix
-    ./configs/fish/fish.nix
-    ./configs/mpd/mpd.nix
-    ./configs/mpv/mpv.nix
-    ./configs/firefox/firefox.nix
+    ./configs/fish
+    ./configs/mpd
+    ./configs/mpv
+    ./configs/neovim
+    ./configs/firefox
     ./configs/dircolors.nix
     ./configs/xdg-mime.nix
   ];
@@ -50,6 +51,7 @@
     sxiv
     thunderbird
     twemoji-color-font
+    vimv
     vulkan-tools
     vulkan-validation-layers
     webcord
@@ -60,7 +62,7 @@
   ];
 
   home.sessionVariables = {
-    EDITOR = "kak";
+    EDITOR = "nvim";
     WINEDLLOVERRIDES = "winemenubuilder.exe=d";
     RADV_PERFTEST = "gpl";
     NIXOS_OZONE_WL = "1";