diff --git a/common/users/cameron/home-manager/nvim.nix b/common/users/cameron/home-manager/nvim.nix
index 43a7349..30b4e54 100644
--- a/common/users/cameron/home-manager/nvim.nix
+++ b/common/users/cameron/home-manager/nvim.nix
@@ -1,8 +1,8 @@
-{ pkgs, lib, config, osConfig, ... }:
+{ pkgs, lib, config, osConfig, inputs, ... }:
 
 {
   xdg.configFile."nvim" = {
-    source = ./other-files/nvim;
+    source = inputs.nvim-config;
     recursive = true;
   };
 
diff --git a/common/users/cameron/home-manager/other-files/nvim b/common/users/cameron/home-manager/other-files/nvim
deleted file mode 160000
index 4b08142..0000000
--- a/common/users/cameron/home-manager/other-files/nvim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4b08142700cc6ae9555248b4049478912d2ab3fd
diff --git a/flake.lock b/flake.lock
index 4cc2c6b..019c561 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "base16-schemes": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1689473676,
+        "narHash": "sha256-L0RhUr9+W5EPWBpLcmkKpUeCEWRs/kLzVMF3Vao2ZU0=",
+        "owner": "tinted-theming",
+        "repo": "base16-schemes",
+        "rev": "d95123ca6377cd849cfdce92c0a24406b0c6a789",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-schemes",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -57,6 +73,25 @@
         "type": "github"
       }
     },
+    "nix-colors": {
+      "inputs": {
+        "base16-schemes": "base16-schemes",
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1695388192,
+        "narHash": "sha256-2jelpE7xK+4M7jZNyWL7QYOYegQLYBDQS5bvdo8XRUQ=",
+        "owner": "misterio77",
+        "repo": "nix-colors",
+        "rev": "37227f274b34a3b51649166deb94ce7fec2c6a4c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "misterio77",
+        "repo": "nix-colors",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1706098335,
@@ -72,6 +107,21 @@
         "type": "indirect"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1694911725,
+        "narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "819180647f428a3826bfc917a54449da1e532ce0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1706191920,
@@ -87,13 +137,31 @@
         "type": "indirect"
       }
     },
+    "nvim-config": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1706674726,
+        "narHash": "sha256-PmdMMQyXk8TfPUBySRSgkgr3sBsO7QZSvUepLgoPDzs=",
+        "ref": "refs/heads/main",
+        "rev": "4b08142700cc6ae9555248b4049478912d2ab3fd",
+        "revCount": 2,
+        "type": "git",
+        "url": "https://gitea.cam123.dev/CameronReed/Neovim-Config"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitea.cam123.dev/CameronReed/Neovim-Config"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
         "home-manager-unstable": "home-manager-unstable",
         "lf-icons": "lf-icons",
+        "nix-colors": "nix-colors",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nvim-config": "nvim-config"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index b31bf32..68b2f7b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,15 +14,20 @@
     home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable";
 
 
+    nvim-config.url = "git+https://gitea.cam123.dev/CameronReed/Neovim-Config";
+    nvim-config.flake = false;
+
+    nix-colors.url = "github:misterio77/nix-colors";
+
     lf-icons.url = "github:gokcehan/lf";
     lf-icons.flake = false;
   };
 
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, home-manager-unstable, lf-icons }:
+  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, home-manager-unstable, nvim-config, nix-colors, lf-icons }:
   let
     common_dir = ./common;
-    inputs = { inherit lf-icons; };
+    inputs = { inherit common_dir nvim-config nix-colors lf-icons; };
   in {
     nixosConfigurations = {
 
@@ -36,7 +41,7 @@
             home-manager.useUserPackages = true;
             home-manager.users.cameron = import ./hosts/nixos/home-manager/cameron.nix;
 
-            home-manager.extraSpecialArgs = { inherit common_dir inputs; };
+            home-manager.extraSpecialArgs = { inherit inputs; };
           }
         ];
       };
@@ -51,7 +56,7 @@
             home-manager.useUserPackages = true;
             home-manager.users.cameron = import ./hosts/nixserver/home-manager/cameron.nix;
 
-            home-manager.extraSpecialArgs = { inherit common_dir inputs; };
+            home-manager.extraSpecialArgs = { inherit inputs; };
           }
         ];
       };
diff --git a/hosts/nixserver/configuration.nix b/hosts/nixserver/configuration.nix
index 88d9512..6e39eaa 100755
--- a/hosts/nixserver/configuration.nix
+++ b/hosts/nixserver/configuration.nix
@@ -2,10 +2,9 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, common_dir, ... }:
 
-let common_dir = ../../common;
-in {
+{
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix