From c1f7b3e5225681cb18dff8a6459ded02ae92a314 Mon Sep 17 00:00:00 2001
From: Yadunand Prem <yadunand@yadunut.com>
Date: Tue, 15 Apr 2025 20:30:52 -0400
Subject: [PATCH] feat: more settings

---
 modules/git.nix      |  2 +-
 modules/neovim.nix   |  3 +++
 modules/zsh.nix      |  6 +++++-
 yadunut-mbp/home.nix | 11 ++++++++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/modules/git.nix b/modules/git.nix
index 63484f3..b9e74ee 100644
--- a/modules/git.nix
+++ b/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;
diff --git a/modules/neovim.nix b/modules/neovim.nix
index 792fb62..e0ee53f 100644
--- a/modules/neovim.nix
+++ b/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;
diff --git a/modules/zsh.nix b/modules/zsh.nix
index 91eed4b..3fce742 100644
--- a/modules/zsh.nix
+++ b/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;
     };
   };
 }
diff --git a/yadunut-mbp/home.nix b/yadunut-mbp/home.nix
index cb5b8ec..0eb0326 100644
--- a/yadunut-mbp/home.nix
+++ b/yadunut-mbp/home.nix
@@ -46,6 +46,7 @@
     pkgs.rust-analyzer
     pkgs.claude-code
     pkgs.httpie
+    pkgs.emacs
 
     # (inputs.ziggy.outputs.packages.aarch64-darwin.ziggy)
     # (inputs.superhtml.outputs.packages.aarch64-darwin.superhtml)
@@ -101,7 +102,6 @@
   };
 
   programs.kitty.shellIntegration.enableZshIntegration = true;
-  programs.emacs.enable = true;
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
@@ -115,4 +115,13 @@
   programs.gh = {
     enable = true;
   };
+
+  targets.darwin = {
+    defaults."com.apple.dock".autohide = true;
+    defaults."com.apple.finder".AppleShowAllFiles = true;
+    defaults.NSGlobalDomain.AppleShowAllExtensions = true;
+    defaults.NSGlobalDomain.KeyRepeat = 2;
+    defaults.NSGlobalDomain.ApplePressAndHoldEnabled = false;
+  };
+
 }