Merge main

flake.nix

@@ -151,7 +151,7 @@
                     "homebrew/bundle" = homebrew-bundle;
                     "nikitabobko/tap" = homebrew-nikitabobko;
                   };
-                  mutableTaps = true;
+                  mutableTaps = false;
                 };
               }
             ];

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";
+    username = "martin.larsson";
-    homeDirectory = "/home/nixos";
+    homeDirectory = "/Users/martin.larsson";
   };
 }

nix/local_system.nix

@@ -3,6 +3,8 @@
 }:
 {
   system = {
-    stateVersion = "24.11";
+    stateVersion = 5;
   };
+  
+  nix-homebrew.user = "martin.larsson";
 }

nix/pkgs/darwin_work.nix

@@ -8,6 +8,10 @@
       ]))
       pcre
       ccache
+      mkdocs
+      # jdk
+      # jdk21
     ];
   };
+
 }

nix/pkgs/home.nix

@@ -112,8 +112,8 @@ in
       ninja
       tldr
       nerd-fonts.caskaydia-mono
-      clang
+      # clang
-      clang-tools
+      # clang-tools
       lldb
       nodejs
       tree-sitter

nix/system/darwin.nix

@@ -65,7 +65,7 @@
       enableKeyMapping = true;
       nonUS.remapTilde = true;
       remapCapsLockToEscape = true;
-      swapLeftCtrlAndFn = true;
+      swapLeftCtrlAndFn = false;
     };
     activationScripts.applications.text =
       let

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 }
     },
 }