feat: more settings

modules/git.nix

@@ -22,7 +22,7 @@
       commit.gpgsign = true;
       commit.verbose = true;
 
-      merge.conflictstyle = "zdiff3";
+      # merge.conflictstyle = "zdiff2";
       diff.colorMoved = true;
       diff.algorithm = "histogram";
       feature.experimental = true;

modules/neovim.nix

@@ -7,6 +7,9 @@
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
   ];
+  home.packages = [
+    pkgs.nodejs_23
+  ];
   programs.nixvim = {
     nixpkgs.pkgs = pkgs;
     performance.combinePlugins.enable = false;

modules/zsh.nix

@@ -13,6 +13,11 @@
   programs.bat = {
     enable = true;
   };
+  programs.dircolors = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+
   programs.zsh = {
     enable = true;
     prezto = {
@@ -55,7 +60,6 @@
       nodejs.disabled = true;
       package.disabled = true;
       aws.disabled = true;
-      elixir.disabled = true;
     };
   };
 }