From f15bbc57e21cf12ab490ea0c4635161285087964 Mon Sep 17 00:00:00 2001
From: Martin Larsson <martin.larsson@king.com>
Date: Wed, 16 Apr 2025 16:38:27 +0200
Subject: [PATCH] Merge main

---
 flake.nix                 | 2 +-
 nix/local_home.nix        | 4 ++--
 nix/local_system.nix      | 4 +++-
 nix/pkgs/darwin_work.nix  | 4 ++++
 nix/pkgs/home.nix         | 4 ++--
 nix/system/darwin.nix     | 2 +-
 nvim/lua/plugs/neogit.lua | 2 +-
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4839c0a..63ebd23 100644
--- a/flake.nix
+++ b/flake.nix
@@ -151,7 +151,7 @@
                     "homebrew/bundle" = homebrew-bundle;
                     "nikitabobko/tap" = homebrew-nikitabobko;
                   };
-                  mutableTaps = true;
+                  mutableTaps = false;
                 };
               }
             ];
diff --git a/nix/local_home.nix b/nix/local_home.nix
index cad7a94..da758ab 100644
--- a/nix/local_home.nix
+++ b/nix/local_home.nix
@@ -6,7 +6,7 @@
   # accordingly, and then commit it.
   home = {
     # Stub values for demonstration. Override these in local branch.
-    username = "nixos";
-    homeDirectory = "/home/nixos";
+    username = "martin.larsson";
+    homeDirectory = "/Users/martin.larsson";
   };
 }
diff --git a/nix/local_system.nix b/nix/local_system.nix
index 6bdfb5f..e916e9c 100644
--- a/nix/local_system.nix
+++ b/nix/local_system.nix
@@ -3,6 +3,8 @@
 }:
 {
   system = {
-    stateVersion = "24.11";
+    stateVersion = 5;
   };
+  
+  nix-homebrew.user = "martin.larsson";
 }
diff --git a/nix/pkgs/darwin_work.nix b/nix/pkgs/darwin_work.nix
index 02947f4..a1fc7ac 100644
--- a/nix/pkgs/darwin_work.nix
+++ b/nix/pkgs/darwin_work.nix
@@ -8,6 +8,10 @@
       ]))
       pcre
       ccache
+      mkdocs
+      # jdk
+      # jdk21
     ];
   };
+
 }
diff --git a/nix/pkgs/home.nix b/nix/pkgs/home.nix
index 2053ed0..7edc009 100644
--- a/nix/pkgs/home.nix
+++ b/nix/pkgs/home.nix
@@ -112,8 +112,8 @@ in
       ninja
       tldr
       nerd-fonts.caskaydia-mono
-      clang
-      clang-tools
+      # clang
+      # clang-tools
       lldb
       nodejs
       tree-sitter
diff --git a/nix/system/darwin.nix b/nix/system/darwin.nix
index 6a8eed8..35fd1dd 100644
--- a/nix/system/darwin.nix
+++ b/nix/system/darwin.nix
@@ -65,7 +65,7 @@
       enableKeyMapping = true;
       nonUS.remapTilde = true;
       remapCapsLockToEscape = true;
-      swapLeftCtrlAndFn = true;
+      swapLeftCtrlAndFn = false;
     };
     activationScripts.applications.text =
       let
diff --git a/nvim/lua/plugs/neogit.lua b/nvim/lua/plugs/neogit.lua
index e510511..8f171d5 100644
--- a/nvim/lua/plugs/neogit.lua
+++ b/nvim/lua/plugs/neogit.lua
@@ -16,6 +16,6 @@ return {
     lazy = true,
     opts = {},
     keys = {
-        { "<leader>g", function() require("neogit").open({ kind = "vsplit" }) end }
+        { "<leader>g", function() require("neogit").open() end }
     },
 }