diff --git a/Makefile b/Makefile
index a1d1b4b..9e5c39d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,15 +3,6 @@ workspace := $(HOME)
 
 .PHONY: all
 
-# NIX
-$(workspace)/.config/nixpkgs:
-	mkdir -p $@
-
-nix/%: $(workspace)/.config/nixpkgs
-	ln -fs $(dotfiles)/$@ $</$*
-
-nix: $(shell find nix -type f)
-
 # SHELLS
 inputrc:
 	ln -fs $(dotfiles)/shells/inputrc $(workspace)/.inputrc
@@ -28,65 +19,69 @@ tmux:
 
 shells: bash zsh tmux
 
-# NVIM
-$(workspace)/.config/nvim:
-	mkdir -p $@
+# NIX
+nixfiles := $(shell find nix -type f -printf "$(workspace)/.config/%P\n")
 
-$(workspace)/.config/nvim/vsnip: $(workspace)/.config/nvim
-	mkdir -p $@
+nix: $(nixfiles)
 
-nvim/%: $(workspace)/.config/nvim/vsnip
-	ln -fs $(dotfiles)/$@ $(workspace)/.config/$@
+$(nixfiles): $(workspace)/.config/%: nix/%
+	mkdir -p $(dir $@)
+	ln -fs $(dotfiles)/$^ $@
 
-nvim: $(shell find nvim -type f)
+# NVIM
+nvimfiles := $(shell find nvim -type f -printf "$(workspace)/.config/%p\n")
 
+nvim: $(nvimfiles)
 
-# EMACS
-$(workspace)/.emacs.d:
-	mkdir -p $@
+$(nvimfiles): $(workspace)/.config/%: %
+	mkdir -p $(dir $@)
+	ln -fs $(dotfiles)/$^ $@
 
-emacs/%: $(workspace)/.emacs.d
-	ln -fs $(dotfiles)/$@ $</$*
+# EMACS
+emacsfiles := $(shell find emacs -type f -printf "$(workspace)/.emacs.d/%p\n")
 
-emacs: $(shell find emacs -type f)
+emacs: $(emacsfiles)
 
+$(emacsfiles): $(workspace)/.emacs.d/%: %
+	mkdir -p $(dir $@)
+	ln -fs $(dotfiles)/$^ $@
 
 # KITTY
-$(workspace)/.config/kitty/themes:
-	mkdir -p $@
+kittyfiles := $(shell find kitty -type f -printf "$(workspace)/.config/%p\n")
 
-kitty/%: $(workspace)/.config/kitty/themes
-	ln -fs $(dotfiles)/$@ $(workspace)/.config/$@
-
-kitty: $(shell find kitty -type f)
+kitty: $(kittyfiles)
 
+$(kittyfiles): $(workspace)/.config/%: %
+	mkdir -p $(dir $@)
+	ln -fs $(dotfiles)/$^ $@
 
 # ROFI
-$(workspace)/.config/rofi:
-	mkdir -p $@
+rofifiles := $(shell find rofi -type f -printf "$(workspace)/.config/%p\n")
 
-rofi/%: $(workspace)/.config/rofi
-	ln -fs $(dotfiles)/$@ $</$*
+rofi: $(rofifiles)
 
-rofi: $(shell find rofi -type f)
+$(rofifiles): $(workspace)/.config/%: %
+	mkdir -p $(dir $@)
+	ln -fs $(dotfiles)/$^ $@
 
 # NNN
-$(workspace)/.config/nnn/plugins:
-	mkdir -p $@
+nnnfiles := $(shell find nnn -type f -printf "$(workspace)/.config/%p\n")
 
-nnn/%: $(workspace)/.config/nnn/plugins
-	ln -fs $(dotfiles)/$@ $(workspace)/.config/$@
+nnn: $(nnnfiles)
 
-nnn: $(shell find nnn -type f)
+$(nnnfiles): $(workspace)/.config/%: %
+	mkdir -p $(dir $@)
+	ln -fs $(dotfiles)/$^ $@
 
 # BINARIES
-$(workspace)/.local/bin:
-	mkdir -p $@
+binfiles := $(shell find bin -type f -printf "$(workspace)/.local/%p\n")
+
+bin: $(binfiles)
 
-bin/%: $(workspace)/.local/bin
-	ln -fs $(dotfiles)/$@ $(workspace)/.local/$@
+$(binfiles): $(workspace)/.local/%: %
+	mkdir -p $(dir $@)
+	ln -fs $(dotfiles)/$^ $@
 
-bin: $(wildcard bin/*)
 
 # SINGLE FILE CONFIGS
 alacritty:
diff --git a/nix/config.nix b/nix/nixpkgs/config.nix
similarity index 100%
rename from nix/config.nix
rename to nix/nixpkgs/config.nix
diff --git a/nix/home.nix b/nix/nixpkgs/home.nix
similarity index 100%
rename from nix/home.nix
rename to nix/nixpkgs/home.nix