diff --git a/dev-flakes/cpp/.envrc b/dev-flakes/cpp/.envrc
new file mode 100644
index 0000000..24d0b01
--- /dev/null
+++ b/dev-flakes/cpp/.envrc
@@ -0,0 +1,3 @@
+export FLAKEDIR=~/Developer/nix/NixOSDots/dev-flakes
+
+use flake ${FLAKEDIR}/cpp
diff --git a/flake.lock b/flake.lock
index 00cb948..f0c1dc4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -88,6 +88,27 @@
         "type": "github"
       }
     },
+    "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1769996383,
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -631,6 +652,28 @@
         "type": "github"
       }
     },
+    "nixvim": {
+      "inputs": {
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1770388595,
+        "narHash": "sha256-0NvpmDqFcJAtRFJE3RDZWnN7PDJBZutoDtN+Cl8a3DY=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "51abc532525e486176f9a7b24b17908c60017b54",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -662,6 +705,7 @@
         "nix-darwin": "nix-darwin",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
+        "nixvim": "nixvim",
         "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix",
         "zen-browser": "zen-browser"
@@ -690,7 +734,7 @@
     "spicetify-nix": {
       "inputs": {
         "nixpkgs": "nixpkgs_4",
-        "systems": "systems_3"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1769316930,
@@ -751,6 +795,21 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 42a19d7..8db3444 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,6 +37,11 @@
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nixvim =  {
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { self, nix-darwin ,nixpkgs, ... }@inputs: {
diff --git a/hosts/common/home.nix b/hosts/common/home.nix
index c90b8d0..5a2380b 100644
--- a/hosts/common/home.nix
+++ b/hosts/common/home.nix
@@ -10,6 +10,7 @@ in
     modules.hm.spicetify
     modules.hm.zed
     modules.hm.zen
+    modules.hm.nvim
     modules.hm.shell
   ];
 
diff --git a/modules/default.nix b/modules/default.nix
index 04ea941..36b0ac6 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -19,6 +19,7 @@
     spicetify = ./home-manager/spicetify.nix;
     zed = ./home-manager/zed.nix;
     zen = ./home-manager/zen.nix;
+    nvim = ./home-manager/nvim.nix;
   };
 
   nixos = {
diff --git a/modules/home-manager/nvim.nix b/modules/home-manager/nvim.nix
new file mode 100644
index 0000000..36b3e58
--- /dev/null
+++ b/modules/home-manager/nvim.nix
@@ -0,0 +1,25 @@
+{inputs, pkgs, ...}:
+
+{
+  imports = [
+    inputs.nixvim.homeModules.nixvim
+  ];
+
+  programs = {
+    nixvim = {
+      enable = true;
+
+      colorschemes = { 
+        catppuccin = { 
+	  enable = true; 
+	};
+      };
+      plugins = {
+        lualine = {
+          enable = true;
+	};
+      };
+    }; # End of NixVIM
+  };
+
+}