diff --git a/home/terminal/default.nix b/home/terminal/default.nix
index 711dbe1..d1cfa89 100644
--- a/home/terminal/default.nix
+++ b/home/terminal/default.nix
@@ -48,6 +48,7 @@
       fish_add_path ~/go/bin/
       export DEBFULLNAME="Johannes Rothe"
       export DEBEMAIL="${mail}"
+      export GIT_EDITOR="nvim"
       export GIT_AUTHOR_NAME="Johannes Rothe"
       export GIT_AUTHOR_EMAIL="${mail}"
       export GIT_COMMITTER_NAME="Johannes Rothe"
diff --git a/home/terminal/nixvim/default.nix b/home/terminal/nixvim/default.nix
index 80ee5c9..228144a 100644
--- a/home/terminal/nixvim/default.nix
+++ b/home/terminal/nixvim/default.nix
@@ -55,9 +55,9 @@
           "<CR>" = "cmp.mapping.confirm({ select = false, behavior = cmp.ConfirmBehavior.Replace })";
         };
       };
-      committia.enable = true;
-      gitgutter.enable = true;
-      guess-indent.enable = true;
+      committia.enable = true;  # Enhanced git commits
+      gitgutter.enable = true;  # Show git change in first line
+      guess-indent.enable = true;  # Guess indent of the file
       lsp.enable = true;
       lsp.servers.pylsp = {
         enable = true;
@@ -65,9 +65,13 @@
           black.enabled = true;
           isort.enabled = true;
           ruff.enabled = true;
+          ruff.formatEnabled = false;
         };
       };
-      lualine.enable = true;
+      lsp-format.enable = true;  # Automatically format on save
+      lsp-lines.enable = true;  # Display lsp hints in lines
+      lsp-signature.enable = true;  # Show function signature when typing
+      lualine.enable = true;  # Statusline
       treesitter.enable = true;
       web-devicons.enable = true;
     };