diff --git a/users/blank/README.md b/users/i/README.md
similarity index 100%
rename from users/blank/README.md
rename to users/i/README.md
diff --git a/users/i/home-manager/home-manager b/users/i/home-manager/home-manager
new file mode 120000
index 0000000..95e61c2
--- /dev/null
+++ b/users/i/home-manager/home-manager
@@ -0,0 +1 @@
+/home/i/Projects/nixos-system-config/users/i/home-manager
\ No newline at end of file
diff --git a/users/blank/home-manager/home.nix b/users/i/home-manager/home.nix
similarity index 58%
rename from users/blank/home-manager/home.nix
rename to users/i/home-manager/home.nix
index 0501acf..aaacdfa 100644
--- a/users/blank/home-manager/home.nix
+++ b/users/i/home-manager/home.nix
@@ -1,16 +1,10 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
-  home.username = "blank";
-  home.homeDirectory = "/home/blank";
+  home.username = "i";
+  home.homeDirectory = "/home/i";
   home.stateVersion = "24.05";
 
-  /*
-  home.packages = with pkgs; [
-    nvim
-  ];
-  */
-
   home.file.".zshenv" = {
     text = "source ~/.nix-profile/etc/profile.d/hm-session-vars.sh";
   };
@@ -21,8 +15,9 @@
   };
 
   imports = [
-    ./packages/nvim/neovim.nix 
-    ./packages/zsh/zsh-home.nix
+    ./shared_packages/nvim/neovim.nix 
+    ./shared_packages/zsh/zsh-home.nix
+    ./packages/neovim.nix
   ];
 
   programs.home-manager.enable = true;
diff --git a/users/i/home-manager/packages/neovim.nix b/users/i/home-manager/packages/neovim.nix
new file mode 100644
index 0000000..88ed483
--- /dev/null
+++ b/users/i/home-manager/packages/neovim.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+{
+  /* Because programs.neovim.extraPackages doesn't work */
+  home.packages = with pkgs; [
+    lua-language-server
+    nodePackages.intelephense
+    nodePackages.typescript-language-server
+    clang-tools
+    ripgrep
+    nil
+    gcc
+  ];
+}
+
diff --git a/users/blank/home-manager/packages/nvim b/users/i/home-manager/shared_packages/nvim
similarity index 100%
rename from users/blank/home-manager/packages/nvim
rename to users/i/home-manager/shared_packages/nvim
diff --git a/users/blank/home-manager/packages/zsh b/users/i/home-manager/shared_packages/zsh
similarity index 100%
rename from users/blank/home-manager/packages/zsh
rename to users/i/home-manager/shared_packages/zsh
diff --git a/users/i/nix/nix b/users/i/nix/nix
new file mode 120000
index 0000000..5539dcc
--- /dev/null
+++ b/users/i/nix/nix
@@ -0,0 +1 @@
+/home/i/Projects/nixos-system-config/users/i/nix
\ No newline at end of file
diff --git a/users/blank/nix/nix.conf b/users/i/nix/nix.conf
similarity index 100%
rename from users/blank/nix/nix.conf
rename to users/i/nix/nix.conf
diff --git a/users/blank/nixpkgs/config.nix b/users/i/nixpkgs/config.nix
similarity index 100%
rename from users/blank/nixpkgs/config.nix
rename to users/i/nixpkgs/config.nix
diff --git a/users/i/nixpkgs/nixpkgs b/users/i/nixpkgs/nixpkgs
new file mode 120000
index 0000000..d7c5f99
--- /dev/null
+++ b/users/i/nixpkgs/nixpkgs
@@ -0,0 +1 @@
+/home/i/Projects/nixos-system-config/users/i/nixpkgs
\ No newline at end of file