gross

user/dingbox/home.nix

@@ -2,8 +2,9 @@
 
 {
 	imports = [
-		../common/i3
-		../common/polybar
+		../i3
+		../neovim
+		../polybar
 	];
 
 	# Let Home Manager install and manage itself.
@@ -17,9 +18,12 @@
 	xsession.enable = true;
 	services.dunst.enable = true;
 
-	home.packages = with pkgs; 
+	home.packages =let
+	
+		i3utils = pkgs.lib.callPackageWith (pkgs) ../i3utils {};
+	in
+	with pkgs; 
 	[
-		(import ../common/i3utils)
 		alacritty
 		chezmoi
 		element-desktop
@@ -28,6 +32,7 @@
 		go_1_17
 		i3
 		i3lock
+		i3utils
 		lazygit
 		nerdfonts
 		oh-my-zsh
@@ -64,9 +69,6 @@
 	
 	programs.starship.enable = true;
 
-	programs.neovim.enable = true;
-	programs.neovim.viAlias = true;
-	programs.neovim.vimAlias = true;
 
 	home.stateVersion = "21.05";
 }