diff --git a/configuration.nix b/configuration.nix
index 129d2a6..67509c0 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -58,6 +58,7 @@
 		mlocate
   	];
 	variables = {
+		EDITOR = "nvim";
 	};
 	shells = with pkgs; [ zsh ];
   };
@@ -112,6 +113,11 @@
 		home-manager = {
 			enable = true;
 		};
+		git = {
+			enable = true;
+			userName = "Ivan Dimitrov";
+			userEmail = "ivan@idimitrov.dev";
+		};
 		kitty = {
 			enable = true;
 			settings = {