diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..488967f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "common/users/cameron/home-manager/other-files/nvim"]
+	path = common/users/cameron/home-manager/other-files/nvim
+	url = ssh://gitea@gitea.cam123.dev:9024/CameronReed/Neovim-Config.git
diff --git a/common/users/cameron/home-manager/hyprpaper.nix b/common/users/cameron/home-manager/hyprpaper.nix
index 506cd97..af0bf3f 100644
--- a/common/users/cameron/home-manager/hyprpaper.nix
+++ b/common/users/cameron/home-manager/hyprpaper.nix
@@ -6,9 +6,9 @@
 
     target = ".config/hypr/hyprpaper.conf";
     text = ''
-preload = ${./wallpapers/lake.jpg}
+preload = ${./other-files/wallpapers/lake.jpg}
 
-wallpaper = ,${./wallpapers/lake.jpg}
+wallpaper = ,${./other-files/wallpapers/lake.jpg}
 
 splash = false
     '';
diff --git a/common/users/cameron/home-manager/nvim.nix b/common/users/cameron/home-manager/nvim.nix
new file mode 100644
index 0000000..43a7349
--- /dev/null
+++ b/common/users/cameron/home-manager/nvim.nix
@@ -0,0 +1,14 @@
+{ pkgs, lib, config, osConfig, ... }:
+
+{
+  xdg.configFile."nvim" = {
+    source = ./other-files/nvim;
+    recursive = true;
+  };
+
+  home.packages = with pkgs; [
+    lua-language-server
+    ripgrep
+    neovim
+  ];
+}
diff --git a/common/users/cameron/home-manager/other-files/nvim b/common/users/cameron/home-manager/other-files/nvim
new file mode 160000
index 0000000..4b08142
--- /dev/null
+++ b/common/users/cameron/home-manager/other-files/nvim
@@ -0,0 +1 @@
+Subproject commit 4b08142700cc6ae9555248b4049478912d2ab3fd
diff --git a/common/users/cameron/home-manager/wallpapers/lake.jpg b/common/users/cameron/home-manager/other-files/wallpapers/lake.jpg
similarity index 100%
rename from common/users/cameron/home-manager/wallpapers/lake.jpg
rename to common/users/cameron/home-manager/other-files/wallpapers/lake.jpg
diff --git a/common/users/cameron/home-manager/sway.nix b/common/users/cameron/home-manager/sway.nix
index f4a8f88..7e5aa81 100644
--- a/common/users/cameron/home-manager/sway.nix
+++ b/common/users/cameron/home-manager/sway.nix
@@ -19,7 +19,7 @@
 
       output = {
         "*" = {
-          bg = "~/Pictures/background.jpg fill";
+          bg = "${./other-files/wallpapers/lake.jpg} fill";
         };
 
         eDP-1 = {
diff --git a/common/users/cameron/home-manager/swaylock.nix b/common/users/cameron/home-manager/swaylock.nix
index 9a9e825..84f9fdf 100644
--- a/common/users/cameron/home-manager/swaylock.nix
+++ b/common/users/cameron/home-manager/swaylock.nix
@@ -7,7 +7,7 @@
     settings = {
       ignore-empty-password = true;
       color = "333333";
-      image = "${./wallpapers/lake.jpg}";
+      image = "${./other-files/wallpapers/lake.jpg}";
     };
   };
   };
diff --git a/common/users/cameron/home.nix b/common/users/cameron/home.nix
index 059d22d..9d3c162 100644
--- a/common/users/cameron/home.nix
+++ b/common/users/cameron/home.nix
@@ -2,6 +2,8 @@
 
 {
   imports = [
+    inputs.nix-colors.homeManagerModules.default
+
     ./home-manager/options.nix
 
     ./home-manager/sway.nix
@@ -12,7 +14,7 @@
     ./home-manager/waybar.nix
 
     ./home-manager/zsh.nix
-
+    ./home-manager/nvim.nix
     ./home-manager/lf.nix
   ];
 
diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix
index b63db35..bd318f1 100644
--- a/hosts/nixos/configuration.nix
+++ b/hosts/nixos/configuration.nix
@@ -96,11 +96,11 @@
     curl
     wget
     kitty
-    ranger
     lf
     tmux
     firefox
     pulsemixer
+    gcc
   ]);
 
   environment.shells = with pkgs; [ bash zsh ];