diff --git a/flake.lock b/flake.lock
index b337611..6e73e96 100644
--- a/flake.lock
+++ b/flake.lock
@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1697522715,
-        "narHash": "sha256-QXk+nnQtdfsShjXCYmH6aq3wVQqsQD8h5VIDFIust8A=",
+        "lastModified": 1697531492,
+        "narHash": "sha256-v813jggnyO+wLMKvbkeOruZCh6wubVZEdfxKqJS4bq8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "132f9851858986d78db0b08157256384bbc5738c",
+        "rev": "7a46e6cb3ca02a478bdafc53c0ac89da6efc050c",
         "type": "github"
       },
       "original": {
diff --git a/nix/systems/main/base/packages.nix b/nix/systems/main/base/packages.nix
index 6f207a2..6aadd23 100644
--- a/nix/systems/main/base/packages.nix
+++ b/nix/systems/main/base/packages.nix
@@ -59,9 +59,6 @@
         gcon = "git config user.name";
         all-switch = "nix-switch && home-switch";
         all-update = "nix flake update ${flake_path}# && all-switch";
-        vi = "nvim";
-        vim = "nvim";
-        vimdiff = "nvim -d";
       };
     };
   };
diff --git a/nix/users/base/default.nix b/nix/users/base/default.nix
index 40e8921..ddaf064 100644
--- a/nix/users/base/default.nix
+++ b/nix/users/base/default.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [
-    ./neovim.nix
+    ./neovim
     ./zsh.nix
     ./packages.nix
   ];
diff --git a/nix/users/base/neovim.nix b/nix/users/base/neovim.nix
deleted file mode 100644
index bae62f3..0000000
--- a/nix/users/base/neovim.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ inputs, pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    neovim
-    ripgrep
-
-    # Language Servers
-    lua-language-server # Lua
-    nixd # Nix
-    gopls # GoLang
-    rust-analyzer # Rust
-    zls # Zig
-    llvmPackages_15.clang-unwrapped #C, C++
-    python311Packages.jedi-language-server #Python
-    nodePackages_latest.vscode-langservers-extracted #HTML,CSS, JSON
-    nodePackages_latest.grammarly-languageserver #Markdown
-    nodePackages_latest.typescript-language-server #Javascript and Typescript
-    nodePackages_latest.bash-language-server #Bash
-    nodePackages_latest.dockerfile-language-server-nodejs #Dockerfiles
-    nodePackages_latest.yaml-language-server #Yaml
-  ];
-  xdg.configFile = {
-    "nvim".source = "${inputs.self}/nvim";
-  };
-}
diff --git a/nix/users/base/neovim/default.nix b/nix/users/base/neovim/default.nix
new file mode 100644
index 0000000..930310b
--- /dev/null
+++ b/nix/users/base/neovim/default.nix
@@ -0,0 +1,15 @@
+{ inputs, pkgs, ... }:
+{
+  programs.neovim =
+  let 
+    toLua = str: "lua << EOF\n${str}\nEOF\n";
+    toLuaFile = file: "lua << EOF\n${builtins.readFile file}\nEOF\n";
+  in
+  {
+    enable = true;
+
+    viAlias = true;
+    vimAlias = true;
+    vimdiffAlias = true;
+  };
+}
diff --git a/nix/users/nicolaivds/general/packages.nix b/nix/users/nicolaivds/general/packages.nix
index 8a05940..8e55113 100644
--- a/nix/users/nicolaivds/general/packages.nix
+++ b/nix/users/nicolaivds/general/packages.nix
@@ -31,7 +31,6 @@
     lutris
     mpv
     neofetch
-    neovim
     nix-prefetch-github
     obs-studio
     obs-studio-plugins.obs-pipewire-audio-capture
diff --git a/nvim/init.lua b/nvim/init.lua
deleted file mode 100644
index 1e7a750..0000000
--- a/nvim/init.lua
+++ /dev/null
@@ -1,5 +0,0 @@
---- Plugin Managers ---
-require(".lazy")
-
---- Colorschemes ---
-vim.cmd("runtime! lua/plugins/colorschemes/*.lua")
\ No newline at end of file
diff --git a/nvim/lua/lazy.lua b/nvim/lua/lazy.lua
deleted file mode 100644
index 5e26ac7..0000000
--- a/nvim/lua/lazy.lua
+++ /dev/null
@@ -1,26 +0,0 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable",
-    lazypath,
-    print([[
-      Installing lazy.vim and plugins....
-    ]])
-  })
-end
-vim.opt.rtp:prepend(lazypath)
-
-local plugins = {
-  --- Lazy ---
-  "folke/lazy.nvim" --- Lazy will manage itself
-
-  --- Colorschemes ---
-  { "catppuccin/nvim",           name = "catppuccin", lazy = false,   priority = 1000 },
-}
-
-local opts = {}
-require("lazy").setup(plugins, opts)
\ No newline at end of file
diff --git a/nvim/lua/plugins/colorschemes/catppuccin.lua b/nvim/lua/plugins/colorschemes/catppuccin.lua
deleted file mode 100644
index b71d444..0000000
--- a/nvim/lua/plugins/colorschemes/catppuccin.lua
+++ /dev/null
@@ -1,49 +0,0 @@
-local status, plugin = pcall(require, 'catppuccin')
-if not status then
-    print('Plugin Error: ', plugin)
-    return
-end
-
-plugin.setup({
-    flavour = "mocha", -- latte, frappe, macchiato, mocha
-     background = { -- :h background
-         light = "latte",
-         dark = "mocha",
-     },
-     transparent_background = false,
-     show_end_of_buffer = false, -- show the '~' characters after the end of buffers
-     term_colors = false,
-     dim_inactive = {
-         enabled = false,
-         shade = "dark",
-         percentage = 0.15,
-     },
-     no_italic = false, -- Force no italic
-     no_bold = false, -- Force no bold
-     no_underline = false, -- Force no underline
-     styles = {
-         comments = { "italic" },
-         conditionals = { "italic" },
-         loops = {},
-         functions = {},
-         keywords = {},
-         strings = {},
-         variables = {},
-         numbers = {},
-         booleans = {},
-         properties = {},
-         types = {},
-         operators = {},
-     },
-     color_overrides = {},
-     custom_highlights = {},
-     integrations = {
-         cmp = true,
-         gitsigns = true,
-         nvimtree = true,
-         telescope = true,
-         notify = false,
-         mini = false,
-         -- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations)
-     },
- })
\ No newline at end of file