diff --git a/home-manager/home.nix b/home-manager/home.nix
index ac5aed3..e1acdaf 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -14,7 +14,6 @@
   home.packages = [
   ];
   home.sessionVariables = {
-    ZSH_CUSTOM = "/home/biscuit/Nixos/packages/zsh/custom/plugins"; 
   };
 
   programs.git.enable = true;
diff --git a/packages/nvim/default.nix b/packages/nvim/default.nix
index 79f90ed..7fa65fa 100644
--- a/packages/nvim/default.nix
+++ b/packages/nvim/default.nix
@@ -1,14 +1,26 @@
-{ pkgs, ... }: {
+{ pkgs, ... }: 
 
+let
+  nvimSource = pkgs.fetchFromGitea {
+    domain = "git.sakamoto.dev";
+    owner = "kenji";
+    repo = "nvim";
+    rev = "5fc3341ac43b35fd4032c07925927d7f1e82886c";
+    sha256 = "sha256-YbP814fKOFuCWBRwlccd4nx/h8sdMgiJQu54thRLsK8=";
+  };
+in {
   home.packages = [
     pkgs.lazygit
     pkgs.ripgrep
   ];
-
   home.file.".config/nvim" = {
     # BUG requires --impure
-    source = /home/biscuit/Nixos/packages/nvim/nvchad;
+    # source = /home/biscuit/Nixos/packages/nvim/nvchad;
+    source = nvimSource;
     recursive = true;
     force = true;	
   };	
+  # Example use: provide it as a source
+  # You could pass `nvimSource` to a program, or maybe use it in home.file, etc.
 }
+
diff --git a/packages/zsh/default.nix b/packages/zsh/default.nix
index 55aa0d8..e0bf31e 100644
--- a/packages/zsh/default.nix
+++ b/packages/zsh/default.nix
@@ -8,7 +8,7 @@
   programs.oh-my-posh.enable = true;
 
   home.file.".config/oh-my-posh/config.omp.json" = {
-    source = /home/biscuit/Nixos/packages/zsh/custom/config.omp.json;
+    source = ./custom/config.omp.json;
     force = true;
   };
 
@@ -39,8 +39,8 @@
     syntaxHighlighting.enable = true;
     shellAliases = {
       ll = "ls -l";
-      upd = "sudo nixos-rebuild switch --flake /home/biscuit/Nixos/#biscuit";
-      hupd = "home-manager switch --flake /home/biscuit/Nixos/#biscuit --impure";
+      upd = "sudo nixos-rebuild switch --flake ~/Nixos/#biscuit";
+      hupd = "home-manager switch --flake ~/Nixos/#biscuit --impure";
     };
     history.size = 10000;
     oh-my-zsh = {