diff --git a/flake.nix b/flake.nix
index 5b46e25..61d31e5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,11 +5,11 @@
     # Nixpkgs
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    # Home manager
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/archlaptop-vm/home.nix b/hosts/archlaptop-vm/home.nix
index 8067937..68572ec 100644
--- a/hosts/archlaptop-vm/home.nix
+++ b/hosts/archlaptop-vm/home.nix
@@ -22,11 +22,12 @@
   };
 
   home.username = "gabe";
-  home.homeDirectory = "/home/gabe";
+  home.homeDirectory = /home/gabe;
   imports = [
     ../../modules/home-manager/terminal
+    ../../modules/home-manager/nvim
     ../../modules/home-manager
-    ../../modules/home-manager/kittty
+    ../../modules/home-manager/kittty.nix
     inputs.nixvim.homeManagerModules.nixvim
   ];
 }
diff --git a/hosts/gabe-archlaptop.nix b/hosts/gabe-archlaptop.nix
index 9712f25..4b517cf 100644
--- a/hosts/gabe-archlaptop.nix
+++ b/hosts/gabe-archlaptop.nix
@@ -22,9 +22,11 @@
 
   targets.genericLinux.enable = true;
   home.username = "gabe";
-  home.homeDirectory = "/home/gabe";
+  home.homeDirectory = /home/gabe;
   imports = [
     ../modules/home-manager/terminal
+    ../modules/home-manager/nvim
     ../modules/home-manager
+    ../modules/home-manager/syncthing.nix
   ];
 }
diff --git a/hosts/gabe-gv-workstation.nix b/hosts/gabe-gv-workstation.nix
index d85725b..d53bd10 100644
--- a/hosts/gabe-gv-workstation.nix
+++ b/hosts/gabe-gv-workstation.nix
@@ -25,9 +25,10 @@
 
   targets.genericLinux.enable = true;
   home.username = "gabe";
-  home.homeDirectory = "/home/gabe";
+  home.homeDirectory = /home/gabe;
   imports = [
     ../modules/home-manager/terminal
+    ../modules/home-manager/nvim
     ../modules/home-manager
   ];
 }
diff --git a/hosts/workstation-vm/home.nix b/hosts/workstation-vm/home.nix
index 8067937..68572ec 100644
--- a/hosts/workstation-vm/home.nix
+++ b/hosts/workstation-vm/home.nix
@@ -22,11 +22,12 @@
   };
 
   home.username = "gabe";
-  home.homeDirectory = "/home/gabe";
+  home.homeDirectory = /home/gabe;
   imports = [
     ../../modules/home-manager/terminal
+    ../../modules/home-manager/nvim
     ../../modules/home-manager
-    ../../modules/home-manager/kittty
+    ../../modules/home-manager/kittty.nix
     inputs.nixvim.homeManagerModules.nixvim
   ];
 }
diff --git a/modules/home-manager/kittty/default.nix b/modules/home-manager/kitty.nix
similarity index 100%
rename from modules/home-manager/kittty/default.nix
rename to modules/home-manager/kitty.nix
diff --git a/modules/home-manager/terminal/nvim/cmp/default.nix b/modules/home-manager/nvim/cmp/default.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/cmp/default.nix
rename to modules/home-manager/nvim/cmp/default.nix
diff --git a/modules/home-manager/terminal/nvim/default.nix b/modules/home-manager/nvim/default.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/default.nix
rename to modules/home-manager/nvim/default.nix
diff --git a/modules/home-manager/terminal/nvim/gitsigns.nix b/modules/home-manager/nvim/gitsigns.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/gitsigns.nix
rename to modules/home-manager/nvim/gitsigns.nix
diff --git a/modules/home-manager/terminal/nvim/keybinds.nix b/modules/home-manager/nvim/keybinds.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/keybinds.nix
rename to modules/home-manager/nvim/keybinds.nix
diff --git a/modules/home-manager/terminal/nvim/lsp/clangd.nix b/modules/home-manager/nvim/lsp/clangd.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/lsp/clangd.nix
rename to modules/home-manager/nvim/lsp/clangd.nix
diff --git a/modules/home-manager/terminal/nvim/lsp/default.nix b/modules/home-manager/nvim/lsp/default.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/lsp/default.nix
rename to modules/home-manager/nvim/lsp/default.nix
diff --git a/modules/home-manager/terminal/nvim/lsp/rust-tools.nix b/modules/home-manager/nvim/lsp/rust-tools.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/lsp/rust-tools.nix
rename to modules/home-manager/nvim/lsp/rust-tools.nix
diff --git a/modules/home-manager/terminal/nvim/lualine.nix b/modules/home-manager/nvim/lualine.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/lualine.nix
rename to modules/home-manager/nvim/lualine.nix
diff --git a/modules/home-manager/terminal/nvim/nvim-tree.nix b/modules/home-manager/nvim/nvim-tree.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/nvim-tree.nix
rename to modules/home-manager/nvim/nvim-tree.nix
diff --git a/modules/home-manager/terminal/nvim/options.nix b/modules/home-manager/nvim/options.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/options.nix
rename to modules/home-manager/nvim/options.nix
diff --git a/modules/home-manager/terminal/nvim/simpleplugins.nix b/modules/home-manager/nvim/simpleplugins.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/simpleplugins.nix
rename to modules/home-manager/nvim/simpleplugins.nix
diff --git a/modules/home-manager/terminal/nvim/spell/en.utf-8.add b/modules/home-manager/nvim/spell/en.utf-8.add
similarity index 100%
rename from modules/home-manager/terminal/nvim/spell/en.utf-8.add
rename to modules/home-manager/nvim/spell/en.utf-8.add
diff --git a/modules/home-manager/terminal/nvim/telescope.nix b/modules/home-manager/nvim/telescope.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/telescope.nix
rename to modules/home-manager/nvim/telescope.nix
diff --git a/modules/home-manager/terminal/nvim/toggleterm.nix b/modules/home-manager/nvim/toggleterm.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/toggleterm.nix
rename to modules/home-manager/nvim/toggleterm.nix
diff --git a/modules/home-manager/terminal/nvim/treesitter/arial.nix b/modules/home-manager/nvim/treesitter/arial.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/treesitter/arial.nix
rename to modules/home-manager/nvim/treesitter/arial.nix
diff --git a/modules/home-manager/terminal/nvim/treesitter/default.nix b/modules/home-manager/nvim/treesitter/default.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/treesitter/default.nix
rename to modules/home-manager/nvim/treesitter/default.nix
diff --git a/modules/home-manager/terminal/nvim/treesitter/rainbow-delimiters.nix b/modules/home-manager/nvim/treesitter/rainbow-delimiters.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/treesitter/rainbow-delimiters.nix
rename to modules/home-manager/nvim/treesitter/rainbow-delimiters.nix
diff --git a/modules/home-manager/terminal/nvim/treesitter/tree-sitter-nu.nix b/modules/home-manager/nvim/treesitter/tree-sitter-nu.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/treesitter/tree-sitter-nu.nix
rename to modules/home-manager/nvim/treesitter/tree-sitter-nu.nix
diff --git a/modules/home-manager/terminal/nvim/which-key.nix b/modules/home-manager/nvim/which-key.nix
similarity index 100%
rename from modules/home-manager/terminal/nvim/which-key.nix
rename to modules/home-manager/nvim/which-key.nix
diff --git a/modules/home-manager/syncthing.nix b/modules/home-manager/syncthing.nix
new file mode 100644
index 0000000..ce7b461
--- /dev/null
+++ b/modules/home-manager/syncthing.nix
@@ -0,0 +1,8 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  services.syncthing.enable = true;
+}
diff --git a/modules/home-manager/terminal/default.nix b/modules/home-manager/terminal/default.nix
index b0e0182..da158af 100644
--- a/modules/home-manager/terminal/default.nix
+++ b/modules/home-manager/terminal/default.nix
@@ -44,7 +44,6 @@
     ./git.nix
     ./starship.nix
     ./voice.nix
-    ./nvim
     ./zellij
     ./tiny-irc.nix
     ./pass.nix
@@ -64,6 +63,4 @@
       nix-direnv.enable = true;
     };
   };
-
-  services.syncthing.enable = true;
 }
diff --git a/modules/home-manager/terminal/pass.nix b/modules/home-manager/terminal/pass.nix
index 6791cab..4f86bcf 100644
--- a/modules/home-manager/terminal/pass.nix
+++ b/modules/home-manager/terminal/pass.nix
@@ -6,6 +6,9 @@
 }: {
   programs.password-store = {
     enable = true;
+    settings={
+      PASSWORD_STORE_DIR = "$HOME/keys/password-store";
+    };
   };
 
   home.packages = with pkgs; [
@@ -13,6 +16,6 @@
   ];
 
   programs.nushell.extraEnv = ''
-    $env.PASSWORD_STORE_DIR = ($env.XDG_DATA_HOME | path join "password-store")
+    $env.PASSWORD_STORE_DIR = ($env.HOME | path join "keys" "password-store")
   '';
 }